From 652bd37a75e1bdd8eb519b9136653327dad2e4f1 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 9 Apr 2022 11:39:05 +0300
Subject: [PATCH 001/221] integrating nestjs

---
 common/dto.ts                                 |   21 +
 frontend/src/ts/message_handlers/Api.ts       |    6 +-
 frontend/src/ts/types/dto.ts                  |   12 +-
 frontend/src/ts/types/types.ts                |    5 -
 frontend/src/vue/singup/Login.vue             |    9 +-
 newback/.gitignore                            |    3 +
 newback/.nvmrc                                |    1 +
 newback/config/Config.d.ts                    |   61 +
 newback/config/default.json                   |   49 +
 newback/nest-cli.json                         |    4 +
 newback/package.json                          |   64 +
 newback/sequelize-cli.config.js               |   13 +
 newback/src/common/decorators/validators.ts   |    0
 .../src/data/database/model/channel.model.ts  |   38 +
 .../database/model/message.history.model.ts   |   47 +
 .../data/database/model/message.mention.ts    |   68 +
 .../src/data/database/model/message.model.ts  |   89 +
 newback/src/data/database/model/room.model.ts |   87 +
 .../data/database/model/user.auth.model.ts    |   67 +
 newback/src/data/database/model/user.model.ts |   52 +
 .../data/database/model/user.profile.model.ts |   63 +
 .../database/model/user.settings.model.ts     |   95 +
 .../data/database/model/verification.model.ts |   74 +
 newback/src/data/types/model/db.ts            |    6 +
 newback/src/main.ts                           |   17 +
 newback/src/modules/app/app.module.ts         |    9 +
 newback/src/modules/app/app.service.ts        |    8 +
 newback/src/modules/auth/auth.controller.ts   |   18 +
 newback/src/modules/auth/auth.module.ts       |   13 +
 newback/src/modules/auth/auth.service.ts      |    8 +
 newback/src/modules/auth/interfaces.ts        |   27 +
 newback/src/templates/change_email.html       |    7 +
 newback/src/templates/change_password.html    |    7 +
 newback/src/templates/sign_up_email.html      |   37 +
 newback/src/templates/token_email.html        |    9 +
 newback/tsconfig.build.json                   |    4 +
 newback/tsconfig.json                         |   24 +
 newback/yarn.lock                             | 5191 +++++++++++++++++
 38 files changed, 6302 insertions(+), 11 deletions(-)
 create mode 100644 common/dto.ts
 create mode 100644 newback/.gitignore
 create mode 100644 newback/.nvmrc
 create mode 100644 newback/config/Config.d.ts
 create mode 100644 newback/config/default.json
 create mode 100644 newback/nest-cli.json
 create mode 100644 newback/package.json
 create mode 100644 newback/sequelize-cli.config.js
 create mode 100644 newback/src/common/decorators/validators.ts
 create mode 100644 newback/src/data/database/model/channel.model.ts
 create mode 100644 newback/src/data/database/model/message.history.model.ts
 create mode 100644 newback/src/data/database/model/message.mention.ts
 create mode 100644 newback/src/data/database/model/message.model.ts
 create mode 100644 newback/src/data/database/model/room.model.ts
 create mode 100644 newback/src/data/database/model/user.auth.model.ts
 create mode 100644 newback/src/data/database/model/user.model.ts
 create mode 100644 newback/src/data/database/model/user.profile.model.ts
 create mode 100644 newback/src/data/database/model/user.settings.model.ts
 create mode 100644 newback/src/data/database/model/verification.model.ts
 create mode 100644 newback/src/data/types/model/db.ts
 create mode 100644 newback/src/main.ts
 create mode 100644 newback/src/modules/app/app.module.ts
 create mode 100644 newback/src/modules/app/app.service.ts
 create mode 100644 newback/src/modules/auth/auth.controller.ts
 create mode 100644 newback/src/modules/auth/auth.module.ts
 create mode 100644 newback/src/modules/auth/auth.service.ts
 create mode 100644 newback/src/modules/auth/interfaces.ts
 create mode 100644 newback/src/templates/change_email.html
 create mode 100644 newback/src/templates/change_password.html
 create mode 100644 newback/src/templates/sign_up_email.html
 create mode 100644 newback/src/templates/token_email.html
 create mode 100644 newback/tsconfig.build.json
 create mode 100644 newback/tsconfig.json
 create mode 100644 newback/yarn.lock

diff --git a/common/dto.ts b/common/dto.ts
new file mode 100644
index 000000000..64352c8f8
--- /dev/null
+++ b/common/dto.ts
@@ -0,0 +1,21 @@
+export interface LoginRequest {
+  username: string;
+  password: string;
+}
+
+export enum Gender {
+  MALE = 'MALE',
+  FEMALE = 'FEMALE',
+  OTHER = 'OTHER',
+}
+
+export enum MessageStatus {
+  ON_SERVER = 'ON_SERVER',
+  READ = 'READ',
+  RECEIVED = 'RECEIVED', //received
+}
+export enum Theme {
+  COLOR_LOR = 'color-lor',
+  COLOR_REG = 'color-reg',
+  COLOR_WHITE = 'color-white'
+}
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 02975a441..29e36ac60 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -23,6 +23,7 @@ import type {
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
+import {LoginRequest} from '@/ts/types/dto';
 
 export default class Api extends MessageHandler {
   protected readonly handlers: HandlerTypes<keyof Api, "*"> = {
@@ -42,11 +43,12 @@ export default class Api extends MessageHandler {
     this.xhr = xhr;
   }
 
-  public async login(form: HTMLFormElement): Promise<SessionResponse> {
+  public async login(body: LoginRequest): Promise<SessionResponse> {
     return this.xhr.doPost<SessionResponse>({
       url: "/auth",
       isJsonDecoded: true,
-      formData: new FormData(form),
+      isJsonEncoded: true,
+      params: {...body}
     });
   }
 
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 86ad58cde..92c2b0466 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -8,6 +8,14 @@ import type {
   SexModelString,
   UserModel,
 } from "@/ts/types/model";
+
+export * from './backend/dto';
+
+export interface SessionResponse {
+  session: string;
+}
+
+
 import type {LogLevel} from "lines-logger";
 
 export type SexModelDto =
@@ -27,9 +35,7 @@ export interface RoomNoUsersDto {
   roomCreatorId: number;
 }
 
-export interface SessionResponse {
-  session: string;
-}
+
 
 export interface OauthSessionResponse extends SessionResponse {
   isNewAccount: boolean;
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 63822905b..aa0da90d3 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -32,11 +32,6 @@ export type ValueFilterForKey<T extends object, U> = {
 
 type StuctureMappedType<K extends string> = Record<K, K>;
 
-const sample: StuctureMappedType<string> = {
-  any3: "andy3",
-};
-
-
 export interface UserIdConn {
   connectionId: string;
   userId: number;
diff --git a/frontend/src/vue/singup/Login.vue b/frontend/src/vue/singup/Login.vue
index 5683fdd4b..952b40679 100644
--- a/frontend/src/vue/singup/Login.vue
+++ b/frontend/src/vue/singup/Login.vue
@@ -8,6 +8,7 @@
       <input
         autocomplete="username"
         class="input"
+        v-model="username"
         maxlength="254"
         name="username"
         placeholder="Username/Email"
@@ -20,6 +21,7 @@
       <input
         autocomplete="password"
         class="input"
+        v-model="password"
         name="password"
         placeholder="Password"
         required
@@ -69,6 +71,8 @@ export default class Login extends Vue {
   @Ref()
   public form!: HTMLFormElement;
 
+  public username: string = '';
+  public password: string = '';
   public running: boolean = false;
 
   public created() {
@@ -80,7 +84,10 @@ export default class Login extends Vue {
     message: "Can't log in",
   })
   public async login() {
-    const {session} = await this.$api.login(this.form);
+    const {session} = await this.$api.login({
+      username: this.username,
+      password: this.password,
+    });
     const message: LoginMessage = {
       action: "login",
       handler: "router",
diff --git a/newback/.gitignore b/newback/.gitignore
new file mode 100644
index 000000000..14ec4464c
--- /dev/null
+++ b/newback/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+yarn-error.log
+dist
diff --git a/newback/.nvmrc b/newback/.nvmrc
new file mode 100644
index 000000000..89eb257ef
--- /dev/null
+++ b/newback/.nvmrc
@@ -0,0 +1 @@
+v16.14
diff --git a/newback/config/Config.d.ts b/newback/config/Config.d.ts
new file mode 100644
index 000000000..59f8a250c
--- /dev/null
+++ b/newback/config/Config.d.ts
@@ -0,0 +1,61 @@
+/* tslint:disable */
+/* eslint-disable */
+declare module "node-config-ts" {
+  interface IConfig {
+    name: string
+    application: Application
+    settings: Settings
+    redis: Redis
+    frontend: Frontend
+    mysql: Mysql
+  }
+  interface Mysql {
+    synchronize: boolean
+    logging: boolean
+    dialect: string
+    host: string
+    "default-character-set": string
+    port: number
+    username: string
+    password: string
+    database: string
+  }
+  interface Frontend {
+    address: string
+    maxUserNameLength: number
+    jsConsoleLogs: string
+    maxMessageSize: number
+    issueReportLink: string
+    chromeExtension: ChromeExtension
+  }
+  interface ChromeExtension {
+    id: string
+    url: string
+  }
+  interface Redis {
+    host: string
+    port: number
+    database: number
+  }
+  interface Settings {
+    wsIdCharLength: number
+    allRedisRoom: string
+    allRoomId: number
+    showCountryCode: boolean
+    firebaseUrl: string
+    ipApiUrl: string
+    pingCloseJsDelay: number
+    pingInterval: number
+    clientNoServerPingCloseTimeout: number
+  }
+  interface Application {
+    env: string
+    port: number
+    logLevel: string
+    logOutput: string
+    crtPath: string
+    keyPath: string
+  }
+  export const config: Config
+  export type Config = IConfig
+}
diff --git a/newback/config/default.json b/newback/config/default.json
new file mode 100644
index 000000000..f38bc0ea5
--- /dev/null
+++ b/newback/config/default.json
@@ -0,0 +1,49 @@
+{
+  "name": "pychat",
+  "application": {
+    "env": "default",
+    "port": 8889,
+    "logLevel": "log",
+    "logOutput": "text",
+    "crtPath": "../frontend/build/certs/server.crt.pem",
+    "keyPath": "../frontend/build/certs/private.key.pem"
+  },
+  "settings": {
+    "wsIdCharLength": 4,
+    "allRedisRoom": "all",
+    "allRoomId": 1,
+    "showCountryCode": false,
+    "firebaseUrl": "https://fcm.googleapis.com/fcm/send",
+    "ipApiUrl": "http://ip-api.com/json/%s",
+    "pingCloseJsDelay": 10000,
+    "pingInterval": 300000,
+    "clientNoServerPingCloseTimeout": 320000
+  },
+  "redis": {
+    "host": "localhos",
+    "port": 6379,
+    "database": 0
+  },
+  "frontend": {
+    "address": "https://localhost:8080",
+    "maxUserNameLength": 16,
+    "jsConsoleLogs": "debug",
+    "maxMessageSize": 100000,
+    "issueReportLink": "https://github.com/akoidan/pychat/issues/new",
+    "chromeExtension": {
+      "id" : "cnlplcfdldebgdlcmpkafcialnbopedn",
+      "url" : "https://chrome.google.com/webstore/detail/pychat-screensharing-exte/cnlplcfdldebgdlcmpkafcialnbopedn"
+    }
+  },
+  "mysql": {
+    "synchronize": false,
+    "logging": true,
+    "dialect": "mysql",
+    "host": "localhost",
+    "default-character-set": "utf8mb4",
+    "port": 3306,
+    "username": "pychat",
+    "password": "pypass",
+    "database": "pychat"
+  }
+}
diff --git a/newback/nest-cli.json b/newback/nest-cli.json
new file mode 100644
index 000000000..56167b36a
--- /dev/null
+++ b/newback/nest-cli.json
@@ -0,0 +1,4 @@
+{
+  "collection": "@nestjs/schematics",
+  "sourceRoot": "src"
+}
diff --git a/newback/package.json b/newback/package.json
new file mode 100644
index 000000000..b92f6b19f
--- /dev/null
+++ b/newback/package.json
@@ -0,0 +1,64 @@
+{
+  "name": "pycht",
+  "version": "0.1",
+  "description": "Backend for pychat",
+  "repository": "https://github.com/akoidan/pychat",
+  "license": "MIT",
+  "scripts": {
+    "generate-configs": "node-config-ts",
+    "prebuild": "rimraf dist",
+    "build": "nest build",
+    "start": "nest start",
+    "start:dev": "node --inspect=0.0.0.0 dist/src/main",
+    "start:debug": "nest start --debug --watch",
+    "start:local": "yarn generate-configs && yarn db:run:migrate && nest start --debug --watch",
+    "start:prod": "node dist/src/main",
+    "start:prod:migrate": "yarn db:run:migrate && node dist/src/main",
+    "db:run:seeds": "npx sequelize-cli db:seed:all",
+    "db:run:single": "npx sequelize-cli db:seed",
+    "db:run:migrate": "npx sequelize-cli db:migrate",
+    "db:run:revert": "npx sequelize-cli db:migrate:undo",
+    "lint": "eslint '{src,apps,libs,test}/**/*.ts' --fix",
+    "lint:check": "eslint '{src,apps,libs,test}/**/*.ts'",
+    "test": "jest --coverage --runInBand --detectOpenHandles --testTimeout=10000 --passWithNoTests",
+    "gstorage:upload": "node ./src/data/database/migration.helpers/00014-upload-files-to-bucket.js upload",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "elastic:run:migration": "node elastic-migration.js migration up",
+    "elastic:run:seed": "node elastic-migration.js seed up"
+  },
+  "dependencies": {
+    "@nestjs/common": "^8.4.4",
+    "@nestjs/core": "^8.4.4",
+    "@nestjs/platform-express": "^8.4.4",
+    "@nestjs/sequelize": "^8.0.0",
+    "@nestjs/swagger": "^5.2.1",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.13.2",
+    "csv-parse": "^5.0.4",
+    "i": "^0.3.7",
+    "lines-logger": "^2.1.2",
+    "node-config-ts": "npm:node-config-ts-2",
+    "npm": "^8.6.0",
+    "pg": "^8.7.3",
+    "redis": "^4.0.6",
+    "reflect-metadata": "^0.1.13",
+    "sequelize": "^6.18.0",
+    "sequelize-typescript": "^2.1.3",
+    "swagger-ui-express": "^4.3.0"
+  },
+  "devDependencies": {
+    "@nestjs/cli": "^8.2.5",
+    "@nestjs/schematics": "^8.0.10",
+    "@nestjs/testing": "^8.4.4",
+    "@types/express": "^4.17.13",
+    "@types/node": "^17.0.23",
+    "@types/sequelize": "^4.28.11",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
+    "@typescript-eslint/parser": "^5.18.0",
+    "eslint": "^8.12.0",
+    "sequelize-cli": "^6.4.1",
+    "ts-loader": "^9.2.8",
+    "ts-node": "^10.7.0",
+    "typescript": "^4.6.3"
+  }
+}
diff --git a/newback/sequelize-cli.config.js b/newback/sequelize-cli.config.js
new file mode 100644
index 000000000..ef327c97f
--- /dev/null
+++ b/newback/sequelize-cli.config.js
@@ -0,0 +1,13 @@
+const { config: sequelizeCliConfig } = require('node-config-ts');
+
+const { postgres } = sequelizeCliConfig.db;
+
+postgres.password = postgres.password.replace(/\n/g, '');
+
+// fucking sequelize-cli hack
+module.exports = {
+  local: postgres,
+  development: postgres,
+  staging: postgres,
+  production: postgres,
+};
diff --git a/newback/src/common/decorators/validators.ts b/newback/src/common/decorators/validators.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/newback/src/data/database/model/channel.model.ts b/newback/src/data/database/model/channel.model.ts
new file mode 100644
index 000000000..a0d1de5a5
--- /dev/null
+++ b/newback/src/data/database/model/channel.model.ts
@@ -0,0 +1,38 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {UserModel} from '@/data/database/model/user.model';
+
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'channel', timestamps: true })
+export class ChannelModel extends Model<ChannelModel> {
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    autoIncrement: true,
+    unique: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.STRING(16),
+    allowNull: false,
+  })
+  public name: string;
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    allowNull: true, // main room no id
+    type: DataType.INTEGER,
+  })
+  public creatorId: number;
+}
diff --git a/newback/src/data/database/model/message.history.model.ts b/newback/src/data/database/model/message.history.model.ts
new file mode 100644
index 000000000..1c5a8011c
--- /dev/null
+++ b/newback/src/data/database/model/message.history.model.ts
@@ -0,0 +1,47 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {UserModel} from '@/data/database/model/user.model';
+import {config} from 'node-config-ts';
+import {MessageModel} from '@/data/database/model/message.model';
+
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'message_history', timestamps: true })
+export class MessageHistoryModel extends Model<MessageHistoryModel> {
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    autoIncrement: true,
+    unique: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+
+  @ForeignKey(() => MessageModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public messageId: number;
+
+  @Column({
+    allowNull: false,
+    type: DataType.DATE,
+  })
+  public time: Date;
+
+  @Column({
+    type: DataType.STRING(config.frontend.maxMessageSize),
+    allowNull: false,
+  })
+  public content: string;
+}
diff --git a/newback/src/data/database/model/message.mention.ts b/newback/src/data/database/model/message.mention.ts
new file mode 100644
index 000000000..fe580956d
--- /dev/null
+++ b/newback/src/data/database/model/message.mention.ts
@@ -0,0 +1,68 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+
+@Injectable()
+@Table({
+  paranoid: true,
+  tableName: 'message_mention',
+  timestamps: true,
+  co
+})
+export class MessageMention extends Model<MessageMention> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false
+  })
+  public userId: string;
+
+  @Column({
+    type: DataType.STRING(1),
+    allowNull: false
+  })
+  public symbol: string;
+
+  @Column({
+    type: DataType.STRING(30),
+    allowNull: true
+  })
+  public surname: string;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: false,
+  })
+  public birthday: Date;
+
+  @Column({
+    type: DataType.STRING(100),
+    allowNull: true
+  })
+  public contacts: string;
+}
diff --git a/newback/src/data/database/model/message.model.ts b/newback/src/data/database/model/message.model.ts
new file mode 100644
index 000000000..732f5c231
--- /dev/null
+++ b/newback/src/data/database/model/message.model.ts
@@ -0,0 +1,89 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  MessageStatus,
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {RoomModel} from '@/data/database/model/room.model';
+import {config} from 'node-config-ts';
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'message', timestamps: true })
+export class MessageModel extends Model<MessageModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    autoIncrement: true,
+    unique: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public senderId: number;
+
+  @ForeignKey(() => RoomModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public roomId: number;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: false,
+  })
+  public time: Date;
+
+  @Column({
+    type: DataType.STRING(config.frontend.maxMessageSize),
+    allowNull: true,
+  })
+  public content: string;
+
+  @Column({
+    type: DataType.STRING(1),
+    allowNull: true,
+  })
+  public symbol: string;
+
+  @Column({
+    type: DataType.ENUM(...Object.keys(MessageStatus)),
+    allowNull: false,
+  })
+  public messageStatus: MessageStatus;
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    defaultValue: 0
+  })
+  public threadMessageCount: number;
+
+
+  @ForeignKey(() => MessageModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: true,
+  })
+  public parentMessageId: number;
+}
diff --git a/newback/src/data/database/model/room.model.ts b/newback/src/data/database/model/room.model.ts
new file mode 100644
index 000000000..0148a8aea
--- /dev/null
+++ b/newback/src/data/database/model/room.model.ts
@@ -0,0 +1,87 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {VerificationType} from '@/data/types/model/db';
+import {ChannelModel} from '@/data/database/model/channel.model';
+
+
+// constraints = [
+// 	CheckConstraint(
+// 		check=Q(Q(channel__isnull=True) & Q(name__isnull=True)) | Q(channel__isnull=False) & Q(name__isnull=False),
+// 		name='channel_should_exist_for_public_room_and_not_exist_for_private'
+// 	),
+// 	CheckConstraint(
+// 		check=Q(creator__isnull=True) | Q(name__isnull=False),
+// 		name='admin_should_not_be_define_for_private_rooms'
+// 	),
+// 	CheckConstraint(
+// 		check=Q(p2p=False) | Q(name__isnull=True),
+// 		name='p2p_only_if_private'
+// 	)
+// ]
+@Injectable()
+@Table({ paranoid: true, tableName: 'room', timestamps: true })
+export class RoomModel extends Model<RoomModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+
+  @Column({
+    type: DataType.STRING(16),
+    allowNull: false,
+  })
+  public name: string;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+  })
+  public isMainInChannel: boolean;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+  })
+  public p2p: boolean;
+
+  @ForeignKey(() => ChannelModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: true,
+    defaultValue: null,
+  })
+  public channelId: number;
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: true,
+    defaultValue: null,
+  })
+  public creatorId: number;
+}
diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/database/model/user.auth.model.ts
new file mode 100644
index 000000000..17c04c984
--- /dev/null
+++ b/newback/src/data/database/model/user.auth.model.ts
@@ -0,0 +1,67 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'user_auth', timestamps: true })
+export class UserAuthModel extends Model<UserAuthModel> {
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: false
+  })
+  public password: string;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: true,
+    unique: true,
+  })
+  public email: string;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: true,
+    unique: true,
+  })
+  public facebookId: string;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: true,
+    unique: true,
+  })
+  public googleId: string;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: true,
+  })
+  public emailVerificationId: string;
+
+}
diff --git a/newback/src/data/database/model/user.model.ts b/newback/src/data/database/model/user.model.ts
new file mode 100644
index 000000000..4e97932db
--- /dev/null
+++ b/newback/src/data/database/model/user.model.ts
@@ -0,0 +1,52 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {Gender} from '@/data/types/dto/dto';
+import {config} from 'node-config-ts';
+
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'user', timestamps: true })
+export class UserModel extends Model<UserModel> {
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    autoIncrement: true,
+    unique: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: false,
+  })
+  public lastLogin: Date;
+
+  @Column({
+    allowNull: false,
+    unique: true,
+    type: DataType.STRING(config.frontend.maxUserNameLength),
+  })
+  public username: string;
+
+  @Column({
+    type: DataType.ENUM(...Object.keys(Gender)),
+    allowNull: false,
+    defaultValue: Gender.OTHER,
+  })
+  public sex: Gender;
+
+  @Column({
+    allowNull: true,
+    defaultValue: null,
+  })
+  public thumbnail: string;
+}
diff --git a/newback/src/data/database/model/user.profile.model.ts b/newback/src/data/database/model/user.profile.model.ts
new file mode 100644
index 000000000..e53da66a8
--- /dev/null
+++ b/newback/src/data/database/model/user.profile.model.ts
@@ -0,0 +1,63 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'user_profile', timestamps: true })
+export class UserProfileModel extends Model<UserProfileModel> {
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.STRING(30),
+    allowNull: true
+  })
+  public name: string;
+
+  @Column({
+    type: DataType.STRING(50),
+    allowNull: true
+  })
+  public city: string;
+
+  @Column({
+    type: DataType.STRING(30),
+    allowNull: true
+  })
+  public surname: string;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: false,
+  })
+  public birthday: Date;
+
+  @Column({
+    type: DataType.STRING(100),
+    allowNull: true
+  })
+  public contacts: string;
+}
diff --git a/newback/src/data/database/model/user.settings.model.ts b/newback/src/data/database/model/user.settings.model.ts
new file mode 100644
index 000000000..ff82be7eb
--- /dev/null
+++ b/newback/src/data/database/model/user.settings.model.ts
@@ -0,0 +1,95 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Theme,
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'user_settings', timestamps: true })
+export class UserSettingsModel extends Model<UserSettingsModel> {
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: true,
+  })
+  public suggestions: boolean;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: true,
+  })
+  public showWhenImTyping: boolean;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: true,
+  })
+  public embeddedYoutube: boolean;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: true,
+  })
+  public highlightCode: boolean;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+  })
+  public messageSound: boolean;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+  })
+  public incomingFileCallSound: boolean;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+  })
+  public onlineChangeMessages: boolean;
+
+  @Column({
+    type: DataType.ENUM(...Object.keys(logLevels)),
+    allowNull: false,
+    defaultValue: 'error',
+  })
+  public devtoolsLogs: LogLevel;
+
+  @Column({
+    type: DataType.ENUM(...Object.keys(Theme)),
+    allowNull: false,
+    defaultValue: true,
+  })
+  public theme: boolean;
+}
diff --git a/newback/src/data/database/model/verification.model.ts b/newback/src/data/database/model/verification.model.ts
new file mode 100644
index 000000000..c744c87b5
--- /dev/null
+++ b/newback/src/data/database/model/verification.model.ts
@@ -0,0 +1,74 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {VerificationType} from '@/data/types/model/db';
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'verification', timestamps: true })
+export class VerificationModel extends Model<VerificationModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.ENUM(...Object.keys(VerificationType)),
+    allowNull: false,
+  })
+  public type: VerificationType;
+
+  @Column({
+    type: DataType.STRING(17),
+    allowNull: false,
+  })
+  public token: string;
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public userId: number;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: false,
+  })
+  public time: Date;
+
+  @Column({
+    type: DataType.BOOLEAN,
+    allowNull: false,
+    defaultValue: false,
+  })
+  public verified: Date;
+
+  @Column({
+    type: DataType.STRING(190),
+    allowNull: true,
+    unique: false,
+    defaultValue: false,
+  })
+  public email: string;
+}
diff --git a/newback/src/data/types/model/db.ts b/newback/src/data/types/model/db.ts
new file mode 100644
index 000000000..fb21dfe9f
--- /dev/null
+++ b/newback/src/data/types/model/db.ts
@@ -0,0 +1,6 @@
+export enum VerificationType {
+  REGISTER = 'REGISTER',
+  PASSWORD = 'PASSWORD',
+  EMAIL = 'EMAIL',
+  CONFIRM_EMAIL = 'CONFIRM_EMAIL',
+}
diff --git a/newback/src/main.ts b/newback/src/main.ts
new file mode 100644
index 000000000..8280df3ce
--- /dev/null
+++ b/newback/src/main.ts
@@ -0,0 +1,17 @@
+import { NestFactory } from '@nestjs/core';
+import { AppModule } from '@/modules/app/app.module';
+import { config } from 'node-config-ts';
+import {
+  ConsoleLogger,
+  ValidationPipe
+} from '@nestjs/common';
+
+
+async function bootstrap() {
+  const app = await NestFactory.create(AppModule, {
+    logger: new ConsoleLogger(),
+  });
+  app.useGlobalPipes(new ValidationPipe())
+  await app.listen(config.application.port);
+}
+bootstrap();
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
new file mode 100644
index 000000000..e3ecbd4f7
--- /dev/null
+++ b/newback/src/modules/app/app.module.ts
@@ -0,0 +1,9 @@
+import {
+  Module
+} from '@nestjs/common';
+import {AuthModule} from '@/modules/auth/auth.module';
+
+@Module({
+  imports: [AuthModule],
+})
+export class AppModule {}
diff --git a/newback/src/modules/app/app.service.ts b/newback/src/modules/app/app.service.ts
new file mode 100644
index 000000000..927d7cca0
--- /dev/null
+++ b/newback/src/modules/app/app.service.ts
@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class AppService {
+  getHello(): string {
+    return 'Hello World!';
+  }
+}
diff --git a/newback/src/modules/auth/auth.controller.ts b/newback/src/modules/auth/auth.controller.ts
new file mode 100644
index 000000000..6eb75d1c1
--- /dev/null
+++ b/newback/src/modules/auth/auth.controller.ts
@@ -0,0 +1,18 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Post
+} from '@nestjs/common';
+import { AuthService } from '@/modules/auth/auth.service';
+import LoginRequestValidator from '@/modules/auth/interfaces';
+
+@Controller()
+export class AuthController {
+  constructor(private readonly appService: AuthService) {}
+
+  @Post('/auth')
+  public auth(@Body() body: LoginRequestValidator): string {
+    return 'asd';
+  }
+}
diff --git a/newback/src/modules/auth/auth.module.ts b/newback/src/modules/auth/auth.module.ts
new file mode 100644
index 000000000..cb7a2acb5
--- /dev/null
+++ b/newback/src/modules/auth/auth.module.ts
@@ -0,0 +1,13 @@
+import {
+  Logger,
+  Module
+} from '@nestjs/common';
+import { AuthController } from '@/modules/auth/auth.controller';
+import { AuthService } from '@/modules/auth/auth.service';
+
+@Module({
+  imports: [],
+  controllers: [AuthController],
+  providers: [AuthService],
+})
+export class AuthModule {}
diff --git a/newback/src/modules/auth/auth.service.ts b/newback/src/modules/auth/auth.service.ts
new file mode 100644
index 000000000..53400c8b7
--- /dev/null
+++ b/newback/src/modules/auth/auth.service.ts
@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class AuthService {
+  getHello(): string {
+    return 'Hello World!';
+  }
+}
diff --git a/newback/src/modules/auth/interfaces.ts b/newback/src/modules/auth/interfaces.ts
new file mode 100644
index 000000000..074e4b59b
--- /dev/null
+++ b/newback/src/modules/auth/interfaces.ts
@@ -0,0 +1,27 @@
+import {
+  IsString,
+  Length,
+  Matches,
+} from 'class-validator';
+import {LoginRequest} from '@/types/frontend/dto';
+import {config} from 'node-config-ts';
+
+export default class LoginRequestValidator implements LoginRequest {
+  @IsString()
+  @Length(1, config.frontend.maxUserNameLength, {
+    message: `Username should be 1-${config.frontend.maxUserNameLength} characters`
+  })
+  @Matches(/[a-zA-Z-_0-9]+/, {
+    message: `Username can only contain latin characters, numbers and symbols '-' '_'`
+  })
+  public username: string;
+
+  @IsString()
+  @Length(3, 128, {
+    message: "Passwords should contain 3-64 symbols"
+  })
+  @Matches(/^[^\S].*[^\S]$/, {
+    message: `Password can't contain whitespaces`
+  })
+  public password: string;
+}
diff --git a/newback/src/templates/change_email.html b/newback/src/templates/change_email.html
new file mode 100644
index 000000000..e29393540
--- /dev/null
+++ b/newback/src/templates/change_email.html
@@ -0,0 +1,7 @@
+<h2 style="color: #102a80">Hello, {{ username }}!</h2>
+<p>You just changed your email to {{ email }}</p>
+<p>
+    on {{ timeCreated }} <br/>
+    IP: {{ ip }}<br/>
+    {{ ipInfo }}
+</p>
\ No newline at end of file
diff --git a/newback/src/templates/change_password.html b/newback/src/templates/change_password.html
new file mode 100644
index 000000000..a2b546148
--- /dev/null
+++ b/newback/src/templates/change_password.html
@@ -0,0 +1,7 @@
+<h2 style="color: #102a80">Hello, {{ username }}!</h2>
+<p>You just changed your password, if it wasn't you we recommend to restore your account via email</p>
+<p>
+    on {{ timeCreated }} <br/>
+    IP: {{ ip }}<br/>
+    {{ ipInfo }}
+</p>
\ No newline at end of file
diff --git a/newback/src/templates/sign_up_email.html b/newback/src/templates/sign_up_email.html
new file mode 100644
index 000000000..2d75d6399
--- /dev/null
+++ b/newback/src/templates/sign_up_email.html
@@ -0,0 +1,37 @@
+<h2 style="color: #102a80">Hello, {{ username }}!</h2>
+<p>{{ greetings }}</p>
+<div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
+    <a href="{{ magicLink }}" style="font-size: 20px;
+    line-height: 26px;
+    border-top: 14px solid;
+    border-bottom: 14px solid;
+    border-right: 32px solid;
+    border-left: 32px solid;
+    background-color: #3c8f3b;
+    border-color: #3c8f3b;
+    display: inline-block;
+    letter-spacing: 1px;
+    min-width: 80px;
+    text-align: center;
+    color: white;
+    margin: auto;
+    font-weight: normal;
+    text-decoration: none;
+    border-radius: 4px">
+       {{ btnText }}
+    </a>
+</div>
+<div style="width: 100%; text-align: center">
+    <p style="font-size: 0.9rem;
+    line-height: 20px;
+    margin: 0 auto 5px;
+    color: #aaa;
+    text-align: center;
+    max-width: 320px;
+    word-break: break-word">You may copy/paste this link into your browser:</p>
+    <a href="{{ magicLink }}"
+        style="color: #439fe0;
+        font-weight: normal;
+        text-decoration: none;
+        word-break: break-word">{{ magicLink }}</a>
+</div>
\ No newline at end of file
diff --git a/newback/src/templates/token_email.html b/newback/src/templates/token_email.html
new file mode 100644
index 000000000..72273e51f
--- /dev/null
+++ b/newback/src/templates/token_email.html
@@ -0,0 +1,9 @@
+{% include "sign_up_email.html" %}
+<p>
+    <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
+</p>
+<p>
+    Link was generated {{ timeCreated }} <br/>
+    IP: {{ ip }}<br/>
+    {{ ipInfo }}
+</p>
\ No newline at end of file
diff --git a/newback/tsconfig.build.json b/newback/tsconfig.build.json
new file mode 100644
index 000000000..79548c6dc
--- /dev/null
+++ b/newback/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules", "dist", "**/*spec.ts"]
+}
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
new file mode 100644
index 000000000..b153e066c
--- /dev/null
+++ b/newback/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+     "paths": {
+      "@/*": ["src/*"]
+    },
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "target": "es2017",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "strictNullChecks": false,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false
+  }
+}
diff --git a/newback/yarn.lock b/newback/yarn.lock
new file mode 100644
index 000000000..c5d0166ae
--- /dev/null
+++ b/newback/yarn.lock
@@ -0,0 +1,5191 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@angular-devkit/core@13.3.2":
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-13.3.2.tgz#b2e7a9a6457d587a59d5f6df799bebb6930a5ddc"
+  integrity sha512-wav5plcnlxQAfZ+0EUt3dvVTJnJ1au2TlKVQ0jSQJdR1LA6N7QUI49N2Ua6ZnDMwruQaQkoynitMW2l1it3qYQ==
+  dependencies:
+    ajv "8.9.0"
+    ajv-formats "2.1.1"
+    fast-json-stable-stringify "2.1.0"
+    magic-string "0.25.7"
+    rxjs "6.6.7"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics-cli@13.3.2":
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics-cli/-/schematics-cli-13.3.2.tgz#50607314ee19828d9bd3fb7cb1e3ab2b480ae934"
+  integrity sha512-cUHZFNq2kaCaReJAU28MSu2D+WDFTqt2v03U79TryOutYdF8BV4FyfvKqCSW6WXna219GXSXPepVqDYcjvn7/w==
+  dependencies:
+    "@angular-devkit/core" "13.3.2"
+    "@angular-devkit/schematics" "13.3.2"
+    ansi-colors "4.1.1"
+    inquirer "8.2.0"
+    minimist "1.2.6"
+    symbol-observable "4.0.0"
+
+"@angular-devkit/schematics@13.3.2":
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-13.3.2.tgz#ae5f4f68af852d56b9ceda4e878cceb1b4558dec"
+  integrity sha512-XCLb23jmqHN0gJg9ZlICaFgfpfnCufIQp5SOsRKMKRkhjKycvDmKnfBTKDlkzb1IaUl6wQwP5k7Z69b9EX+CQw==
+  dependencies:
+    "@angular-devkit/core" "13.3.2"
+    jsonc-parser "3.0.0"
+    magic-string "0.25.7"
+    ora "5.4.1"
+    rxjs "6.6.7"
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
+"@babel/highlight@^7.16.7":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
+  integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@cspotcode/source-map-consumer@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
+  integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
+
+"@cspotcode/source-map-support@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5"
+  integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==
+  dependencies:
+    "@cspotcode/source-map-consumer" "0.8.0"
+
+"@eslint/eslintrc@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6"
+  integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.3.1"
+    globals "^13.9.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
+"@gar/promisify@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
+  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
+
+"@humanwhocodes/config-array@^0.9.2":
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
+  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.1"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
+"@isaacs/string-locale-compare@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
+  integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
+
+"@nestjs/cli@^8.2.5":
+  version "8.2.5"
+  resolved "https://registry.yarnpkg.com/@nestjs/cli/-/cli-8.2.5.tgz#02094177f4eac576d1a559b259d541393e49e0bb"
+  integrity sha512-b5DzZ08q/6iWvLz+n2DhEyZ3rsOurN1ec1jYQaWC5DCVQoZCwyOew48bVf01kevTK4eZyQxPwuErf7HnFAc0oQ==
+  dependencies:
+    "@angular-devkit/core" "13.3.2"
+    "@angular-devkit/schematics" "13.3.2"
+    "@angular-devkit/schematics-cli" "13.3.2"
+    "@nestjs/schematics" "^8.0.3"
+    chalk "3.0.0"
+    chokidar "3.5.3"
+    cli-table3 "0.6.1"
+    commander "4.1.1"
+    fork-ts-checker-webpack-plugin "7.2.3"
+    inquirer "7.3.3"
+    node-emoji "1.11.0"
+    ora "5.4.1"
+    os-name "4.0.1"
+    rimraf "3.0.2"
+    shelljs "0.8.5"
+    source-map-support "0.5.21"
+    tree-kill "1.2.2"
+    tsconfig-paths "3.14.1"
+    tsconfig-paths-webpack-plugin "3.5.2"
+    typescript "4.6.2"
+    webpack "5.71.0"
+    webpack-node-externals "3.0.0"
+
+"@nestjs/common@^8.4.4":
+  version "8.4.4"
+  resolved "https://registry.yarnpkg.com/@nestjs/common/-/common-8.4.4.tgz#0914c6c0540b5a344c7c8fd6072faa1a49af1158"
+  integrity sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==
+  dependencies:
+    axios "0.26.1"
+    iterare "1.2.1"
+    tslib "2.3.1"
+    uuid "8.3.2"
+
+"@nestjs/core@^8.4.4":
+  version "8.4.4"
+  resolved "https://registry.yarnpkg.com/@nestjs/core/-/core-8.4.4.tgz#94fd2d63fd77791f616fbecafb79faa2235eeeff"
+  integrity sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==
+  dependencies:
+    "@nuxtjs/opencollective" "0.3.2"
+    fast-safe-stringify "2.1.1"
+    iterare "1.2.1"
+    object-hash "3.0.0"
+    path-to-regexp "3.2.0"
+    tslib "2.3.1"
+    uuid "8.3.2"
+
+"@nestjs/mapped-types@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/mapped-types/-/mapped-types-1.0.1.tgz#78b62041c7a407db4a90eb140567321602bed18e"
+  integrity sha512-NFvofzSinp00j5rzUd4tf+xi9od6383iY0JP7o0Bnu1fuItAUkWBgc4EKuIQ3D+c2QI3i9pG1kDWAeY27EMGtg==
+
+"@nestjs/platform-express@^8.4.4":
+  version "8.4.4"
+  resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-8.4.4.tgz#c01de14ddc9ba6f26e3290cc165c784a64071d98"
+  integrity sha512-n/H83uzw154v6NVVSg6mniZIvYWtYp0dtNpU9O1qdEmDO030p0tBkeIRoDtpeOVvL2fW5PsHiUYS7HY4tNfykQ==
+  dependencies:
+    body-parser "1.20.0"
+    cors "2.8.5"
+    express "4.17.3"
+    multer "1.4.4"
+    tslib "2.3.1"
+
+"@nestjs/schematics@^8.0.10", "@nestjs/schematics@^8.0.3":
+  version "8.0.10"
+  resolved "https://registry.yarnpkg.com/@nestjs/schematics/-/schematics-8.0.10.tgz#4f951ea1ac94721ba6a6ccfae6461f8b22949573"
+  integrity sha512-gQq/8TYjtgum+5+QuPfHHKgKxDgNLGh8mH+EJ1skOKX+GTxgt5jmg1GFmwEfiOXZUcF9thT6GsOVNKWrdO3YMg==
+  dependencies:
+    "@angular-devkit/core" "13.3.2"
+    "@angular-devkit/schematics" "13.3.2"
+    fs-extra "10.0.1"
+    jsonc-parser "3.0.0"
+    pluralize "8.0.0"
+
+"@nestjs/sequelize@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@nestjs/sequelize/-/sequelize-8.0.0.tgz#850aa1260dd77e1a8d1860f6408e504060215ea3"
+  integrity sha512-+hCs/uO1b+Vjt9EmKc31Srr5j9k8MI6eDg+NtSkym/u18hC8eW2RjcxxK+62yn5maxMLyp5fTtAEg3YmicYL4Q==
+  dependencies:
+    uuid "8.3.2"
+
+"@nestjs/swagger@^5.2.1":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/swagger/-/swagger-5.2.1.tgz#0fbd5dbc84aeebc2912009cce1309d4bebe9a52c"
+  integrity sha512-7dNa08WCnTsW/oAk3Ujde+z64JMfNm19DhpXasFR8oJp/9pggYAbYU927HpA+GJsSFJX6adjIRZsCKUqaGWznw==
+  dependencies:
+    "@nestjs/mapped-types" "1.0.1"
+    lodash "4.17.21"
+    path-to-regexp "3.2.0"
+
+"@nestjs/testing@^8.4.4":
+  version "8.4.4"
+  resolved "https://registry.yarnpkg.com/@nestjs/testing/-/testing-8.4.4.tgz#ac58e1f4be2344823b14243072179ce13a1ebd40"
+  integrity sha512-eGj0Lbi0ONMkjDKbKQHoGX+ecGdrGRZ81I8i6fH4dx9jIR0p4MsBlW964f6Swn1MGkPm/xxomJmBWLPqZEjF7g==
+  dependencies:
+    optional "0.1.4"
+    tslib "2.3.1"
+
+"@node-redis/bloom@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@node-redis/bloom/-/bloom-1.0.1.tgz#144474a0b7dc4a4b91badea2cfa9538ce0a1854e"
+  integrity sha512-mXEBvEIgF4tUzdIN89LiYsbi6//EdpFA7L8M+DHCvePXg+bfHWi+ct5VI6nHUFQE5+ohm/9wmgihCH3HSkeKsw==
+
+"@node-redis/client@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@node-redis/client/-/client-1.0.5.tgz#ebac5e2bbf12214042a37621604973a954ede755"
+  integrity sha512-ESZ3bd1f+od62h4MaBLKum+klVJfA4wAeLHcVQBkoXa1l0viFesOWnakLQqKg+UyrlJhZmXJWtu0Y9v7iTMrig==
+  dependencies:
+    cluster-key-slot "1.1.0"
+    generic-pool "3.8.2"
+    redis-parser "3.0.0"
+    yallist "4.0.0"
+
+"@node-redis/graph@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@node-redis/graph/-/graph-1.0.0.tgz#baf8eaac4a400f86ea04d65ec3d65715fd7951ab"
+  integrity sha512-mRSo8jEGC0cf+Rm7q8mWMKKKqkn6EAnA9IA2S3JvUv/gaWW/73vil7GLNwion2ihTptAm05I9LkepzfIXUKX5g==
+
+"@node-redis/json@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@node-redis/json/-/json-1.0.2.tgz#8ad2d0f026698dc1a4238cc3d1eb099a3bee5ab8"
+  integrity sha512-qVRgn8WfG46QQ08CghSbY4VhHFgaTY71WjpwRBGEuqGPfWwfRcIf3OqSpR7Q/45X+v3xd8mvYjywqh0wqJ8T+g==
+
+"@node-redis/search@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@node-redis/search/-/search-1.0.5.tgz#96050007eb7c50a7e47080320b4f12aca8cf94c4"
+  integrity sha512-MCOL8iCKq4v+3HgEQv8zGlSkZyXSXtERgrAJ4TSryIG/eLFy84b57KmNNa/V7M1Q2Wd2hgn2nPCGNcQtk1R1OQ==
+
+"@node-redis/time-series@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@node-redis/time-series/-/time-series-1.0.2.tgz#5dd3638374edd85ebe0aa6b0e87addc88fb9df69"
+  integrity sha512-HGQ8YooJ8Mx7l28tD7XjtB3ImLEjlUxG1wC1PAjxu6hPJqjPshUZxAICzDqDjtIbhDTf48WXXUcx8TQJB1XTKA==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+"@npmcli/arborist@^5.0.0", "@npmcli/arborist@^5.0.4":
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.0.5.tgz#e38b63cabc496840bb329182fe6bee18ad9f3ee2"
+  integrity sha512-96UwbW4ASOMg/ltORxx36njDiIy5HYdWR5HOvroYeVhoSOLYKwlixALowNK7ZBt49MOaJVCfLMyu9on71gQC/g==
+  dependencies:
+    "@isaacs/string-locale-compare" "^1.1.0"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/map-workspaces" "^2.0.0"
+    "@npmcli/metavuln-calculator" "^3.0.1"
+    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/name-from-folder" "^1.0.1"
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/package-json" "^2.0.0"
+    "@npmcli/run-script" "^3.0.0"
+    bin-links "^3.0.0"
+    cacache "^16.0.0"
+    common-ancestor-path "^1.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    json-stringify-nice "^1.1.4"
+    mkdirp "^1.0.4"
+    mkdirp-infer-owner "^2.0.0"
+    nopt "^5.0.0"
+    npm-install-checks "^5.0.0"
+    npm-package-arg "^9.0.0"
+    npm-pick-manifest "^7.0.0"
+    npm-registry-fetch "^13.0.0"
+    npmlog "^6.0.1"
+    pacote "^13.0.5"
+    parse-conflict-json "^2.0.1"
+    proc-log "^2.0.0"
+    promise-all-reject-late "^1.0.0"
+    promise-call-limit "^1.0.1"
+    read-package-json-fast "^2.0.2"
+    readdir-scoped-modules "^1.1.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    ssri "^9.0.0"
+    treeverse "^2.0.0"
+    walk-up-path "^1.0.0"
+
+"@npmcli/ci-detect@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
+  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
+
+"@npmcli/config@^4.0.1":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.0.2.tgz#cecb171225d8325cee30ee45893eebd9503bb203"
+  integrity sha512-UqD4h4LgyNOb7xRmAK7QXiMu0/k2x7wEzrEqXZ1wGIQVmCl3vamsAprDjAhi7IKlgRulg09hpwYs2/57OP22xw==
+  dependencies:
+    "@npmcli/map-workspaces" "^2.0.2"
+    ini "^3.0.0"
+    mkdirp-infer-owner "^2.0.0"
+    nopt "^5.0.0"
+    proc-log "^2.0.0"
+    read-package-json-fast "^2.0.3"
+    semver "^7.3.5"
+    walk-up-path "^1.0.0"
+
+"@npmcli/disparity-colors@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-2.0.0.tgz#cb518166ee21573b96241a3613fef70acb2a60ba"
+  integrity sha512-FFXGrIjhvd2qSZ8iS0yDvbI7nbjdyT2VNO7wotosjYZM2p2r8PN3B7Om3M5NO9KqW/OVzfzLB3L0V5Vo5QXC7A==
+  dependencies:
+    ansi-styles "^4.3.0"
+
+"@npmcli/fs@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
+  integrity sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==
+  dependencies:
+    "@gar/promisify" "^1.1.3"
+    semver "^7.3.5"
+
+"@npmcli/git@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.1.tgz#049b99b1381a2ddf7dc56ba3e91eaf76ca803a8d"
+  integrity sha512-UU85F/T+F1oVn3IsB/L6k9zXIMpXBuUBE25QDH0SsURwT6IOBqkC7M16uqo2vVZIyji3X1K4XH9luip7YekH1A==
+  dependencies:
+    "@npmcli/promise-spawn" "^3.0.0"
+    lru-cache "^7.4.4"
+    mkdirp "^1.0.4"
+    npm-pick-manifest "^7.0.0"
+    proc-log "^2.0.0"
+    promise-inflight "^1.0.1"
+    promise-retry "^2.0.1"
+    semver "^7.3.5"
+    which "^2.0.2"
+
+"@npmcli/installed-package-contents@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
+  integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
+  dependencies:
+    npm-bundled "^1.1.1"
+    npm-normalize-package-bin "^1.0.1"
+
+"@npmcli/map-workspaces@^2.0.0", "@npmcli/map-workspaces@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.2.tgz#dfc87ced615afeb98a081da2aa9bba072bf6712d"
+  integrity sha512-ED54EslGsHFWBPN5x8JAOszuWywuoXYSi9E3HQRsgVkWnqsdTBJDSM4IFMRwmmBUbCHAxmP3wGLu1WMm4fhrOw==
+  dependencies:
+    "@npmcli/name-from-folder" "^1.0.1"
+    glob "^7.2.0"
+    minimatch "^5.0.1"
+    read-package-json-fast "^2.0.3"
+
+"@npmcli/metavuln-calculator@^3.0.1":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.0.tgz#b1c2f0991c4f2d992b1615a54d4358c05efc3702"
+  integrity sha512-Q5fbQqGDlYqk7kWrbg6E2j/mtqQjZop0ZE6735wYA1tYNHguIDjAuWs+kFb5rJCkLIlXllfapvsyotYKiZOTBA==
+  dependencies:
+    cacache "^16.0.0"
+    json-parse-even-better-errors "^2.3.1"
+    pacote "^13.0.3"
+    semver "^7.3.5"
+
+"@npmcli/move-file@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02"
+  integrity sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
+
+"@npmcli/name-from-folder@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
+  integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
+
+"@npmcli/node-gyp@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
+  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+
+"@npmcli/package-json@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
+  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
+  dependencies:
+    json-parse-even-better-errors "^2.3.1"
+
+"@npmcli/package-json@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
+  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
+  dependencies:
+    json-parse-even-better-errors "^2.3.1"
+
+"@npmcli/promise-spawn@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
+  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
+  dependencies:
+    infer-owner "^1.0.4"
+
+"@npmcli/run-script@^3.0.0", "@npmcli/run-script@^3.0.1":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-3.0.2.tgz#3e9116d831f4539bf292d18b015977a6118997ee"
+  integrity sha512-vdjD/PMBl+OX9j9C9irx5sCCIKfp2PWkpPNH9zxvlJAfSZ3Qp5aU412v+O3PFJl3R1PFNwuyChCqHg4ma6ci2Q==
+  dependencies:
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/promise-spawn" "^3.0.0"
+    node-gyp "^9.0.0"
+    read-package-json-fast "^2.0.3"
+
+"@nuxtjs/opencollective@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz#620ce1044f7ac77185e825e1936115bb38e2681c"
+  integrity sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==
+  dependencies:
+    chalk "^4.1.0"
+    consola "^2.15.0"
+    node-fetch "^2.6.1"
+
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
+"@tsconfig/node10@^1.0.7":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
+  integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
+  integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
+  integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
+  integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
+
+"@types/bluebird@*":
+  version "3.5.36"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.36.tgz#00d9301d4dc35c2f6465a8aec634bb533674c652"
+  integrity sha512-HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q==
+
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/continuation-local-storage@*":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@types/continuation-local-storage/-/continuation-local-storage-3.2.4.tgz#655c8ffd9327aa60fb8ae773a5f2efbc973a7cbb"
+  integrity sha512-OT32vCVMymU1JMPKDeY0lX3cduAr0Pm/VwIbxygMeDS4lRcv57qYXn9bMwBRcRnEpXKBb/r4xYaZCARTZllP0A==
+  dependencies:
+    "@types/node" "*"
+
+"@types/debug@^4.1.7":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
+"@types/eslint-scope@^3.7.3":
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
+  integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
+  integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@^0.0.51":
+  version "0.0.51"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.28"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
+  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@^4.17.13":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
+"@types/lodash@*":
+  version "4.14.181"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.181.tgz#d1d3740c379fda17ab175165ba04e2d03389385d"
+  integrity sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==
+
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
+"@types/node@*", "@types/node@^17.0.23":
+  version "17.0.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
+  integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
+
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
+"@types/qs@*":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
+"@types/sequelize@^4.28.11":
+  version "4.28.11"
+  resolved "https://registry.yarnpkg.com/@types/sequelize/-/sequelize-4.28.11.tgz#8b0c530bac4e6d73a0416a94db0de820cc4d47c3"
+  integrity sha512-2zeMcB5ZI+u1UwxM4sa3gLu8eSp0Gk+emTKPWXuNk3ePFo4EUYLgmIhGV6b+kYoshXpZHG3nJVMK00tuh5vEQA==
+  dependencies:
+    "@types/bluebird" "*"
+    "@types/continuation-local-storage" "*"
+    "@types/lodash" "*"
+    "@types/validator" "*"
+
+"@types/serve-static@*":
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/validator@*", "@types/validator@^13.7.1":
+  version "13.7.2"
+  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.2.tgz#a2114225d9be743fb154b06c29b8257aaca42922"
+  integrity sha512-KFcchQ3h0OPQgFirBRPZr5F/sVjxZsOrQHedj3zi8AH3Zv/hOLx2OLR4hxR5HcfoU+33n69ZuOfzthKVdMoTiw==
+
+"@typescript-eslint/eslint-plugin@^5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d"
+  integrity sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.18.0"
+    "@typescript-eslint/type-utils" "5.18.0"
+    "@typescript-eslint/utils" "5.18.0"
+    debug "^4.3.2"
+    functional-red-black-tree "^1.0.1"
+    ignore "^5.1.8"
+    regexpp "^3.2.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/parser@^5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.18.0.tgz#2bcd4ff21df33621df33e942ccb21cb897f004c6"
+  integrity sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.18.0"
+    "@typescript-eslint/types" "5.18.0"
+    "@typescript-eslint/typescript-estree" "5.18.0"
+    debug "^4.3.2"
+
+"@typescript-eslint/scope-manager@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz#a7d7b49b973ba8cebf2a3710eefd457ef2fb5505"
+  integrity sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==
+  dependencies:
+    "@typescript-eslint/types" "5.18.0"
+    "@typescript-eslint/visitor-keys" "5.18.0"
+
+"@typescript-eslint/type-utils@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz#62dbfc8478abf36ba94a90ddf10be3cc8e471c74"
+  integrity sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==
+  dependencies:
+    "@typescript-eslint/utils" "5.18.0"
+    debug "^4.3.2"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.18.0.tgz#4f0425d85fdb863071680983853c59a62ce9566e"
+  integrity sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==
+
+"@typescript-eslint/typescript-estree@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz#6498e5ee69a32e82b6e18689e2f72e4060986474"
+  integrity sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==
+  dependencies:
+    "@typescript-eslint/types" "5.18.0"
+    "@typescript-eslint/visitor-keys" "5.18.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855"
+  integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.18.0"
+    "@typescript-eslint/types" "5.18.0"
+    "@typescript-eslint/typescript-estree" "5.18.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/visitor-keys@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz#c7c07709823804171d569017f3b031ced7253e60"
+  integrity sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==
+  dependencies:
+    "@typescript-eslint/types" "5.18.0"
+    eslint-visitor-keys "^3.0.0"
+
+"@webassemblyjs/ast@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+
+"@webassemblyjs/helper-api-error@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+
+"@webassemblyjs/helper-buffer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+
+"@webassemblyjs/helper-numbers@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+
+"@webassemblyjs/helper-wasm-section@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+
+"@webassemblyjs/ieee754@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+
+"@webassemblyjs/wasm-edit@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-wasm-section" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-opt" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/wast-printer" "1.11.1"
+
+"@webassemblyjs/wasm-gen@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wasm-opt@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+
+"@webassemblyjs/wasm-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wast-printer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@xtuc/long" "4.2.2"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+abbrev@1, abbrev@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+accepts@~1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
+  dependencies:
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
+
+acorn-import-assertions@^1.7.6:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
+  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+
+acorn-jsx@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+acorn-walk@^8.1.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
+acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
+  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+
+agent-base@6, agent-base@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+agentkeepalive@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
+  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+  dependencies:
+    debug "^4.1.0"
+    depd "^1.1.2"
+    humanize-ms "^1.2.1"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
+ajv-formats@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@8.9.0:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
+  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^8.0.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-escapes@^4.2.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0, ansi-styles@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
+
+ansistyles@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
+  integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk=
+
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+append-field@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
+  integrity sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY=
+
+"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
+archy@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
+
+are-we-there-yet@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
+  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-includes@^3.0.2:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
+  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    is-string "^1.0.7"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+asap@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
+axios@0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
+  integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
+  dependencies:
+    follow-redirects "^1.14.8"
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+bin-links@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.1.tgz#cc70ffb481988b22c527d3e6e454787876987a49"
+  integrity sha512-9vx+ypzVhASvHTS6K+YSGf7nwQdANoz7v6MTC0aCtYnOEZ87YvMf81aY737EZnGZdpbRM3sfWjO9oWkKmuIvyQ==
+  dependencies:
+    cmd-shim "^5.0.0"
+    mkdirp-infer-owner "^2.0.0"
+    npm-normalize-package-bin "^1.0.0"
+    read-cmd-shim "^3.0.0"
+    rimraf "^3.0.0"
+    write-file-atomic "^4.0.0"
+
+binary-extensions@^2.0.0, binary-extensions@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+body-parser@1.19.2:
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
+  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.8.1"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.9.7"
+    raw-body "2.4.3"
+    type-is "~1.6.18"
+
+body-parser@1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
+  integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.10.3"
+    raw-body "2.5.1"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
+braces@^3.0.2, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+browserslist@^4.14.5:
+  version "4.20.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
+  integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
+  dependencies:
+    caniuse-lite "^1.0.30001317"
+    electron-to-chromium "^1.4.84"
+    escalade "^3.1.1"
+    node-releases "^2.0.2"
+    picocolors "^1.0.0"
+
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+buffer-writer@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
+  integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==
+
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+builtins@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.0.tgz#20d87e7f95d46481b1abe4adc616a9cb6b492cba"
+  integrity sha512-aizhtbxgT1Udg0Fj6GssXshAVK+nxbtCV+1OtTrMNy67jffDFBY6CUBAkhO4owbleAx6fdbnWdpsmmcXydbzNw==
+  dependencies:
+    semver "^7.0.0"
+
+busboy@^0.2.11:
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"
+  integrity sha1-bCpiLvz0fFe7vh4qnDetNseSVFM=
+  dependencies:
+    dicer "0.2.5"
+    readable-stream "1.1.x"
+
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
+
+cacache@^16.0.0, cacache@^16.0.2, cacache@^16.0.3:
+  version "16.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.0.4.tgz#66877ae82717ade4d1416d5b3caa3a870f2c6d0c"
+  integrity sha512-U0D4wF3/W8ZgK4qDA5fTtOVSr0gaDfd5aa7tUdAV0uukVWKsAIn6SzXQCoVlg7RWZiJa+bcsM3/pXLumGaL2Ug==
+  dependencies:
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^7.2.0"
+    infer-owner "^1.0.4"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^1.1.1"
+
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+caniuse-lite@^1.0.30001317:
+  version "1.0.30001327"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz#c1546d7d7bb66506f0ccdad6a7d07fc6d668c858"
+  integrity sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==
+
+chalk@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^2.0.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+chokidar@3.5.3, chokidar@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
+chrome-trace-event@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
+
+cidr-regex@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-3.1.1.tgz#ba1972c57c66f61875f18fd7dd487469770b571d"
+  integrity sha512-RBqYd32aDwbCMFJRL6wHOlDNYJsPNTt8vC82ErHF5vKt8QQzxm1FrkW8s/R5pVrXMf17sba09Uoy91PKiddAsw==
+  dependencies:
+    ip-regex "^4.1.0"
+
+class-transformer@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/class-transformer/-/class-transformer-0.5.1.tgz#24147d5dffd2a6cea930a3250a677addf96ab336"
+  integrity sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==
+
+class-validator@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.13.2.tgz#64b031e9f3f81a1e1dcd04a5d604734608b24143"
+  integrity sha512-yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw==
+  dependencies:
+    libphonenumber-js "^1.9.43"
+    validator "^13.7.0"
+
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
+cli-color@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.2.tgz#e295addbae470800def0254183c648531cdf4e3f"
+  integrity sha512-g4JYjrTW9MGtCziFNjkqp3IMpGhnJyeB0lOtRPjQkYhXzKYr6tYnXKyEVnMzITxhpbahsEW9KsxOYIDKwcsIBw==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.59"
+    es6-iterator "^2.0.3"
+    memoizee "^0.4.15"
+    timers-ext "^0.1.7"
+
+cli-columns@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
+  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
+  dependencies:
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
+  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
+
+cli-table3@0.6.1, cli-table3@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
+  integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
+  dependencies:
+    string-width "^4.2.0"
+  optionalDependencies:
+    colors "1.4.0"
+
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+cluster-key-slot@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
+  integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
+
+cmd-shim@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
+  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
+  dependencies:
+    mkdirp-infer-owner "^2.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
+colors@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+columnify@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
+  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+  dependencies:
+    strip-ansi "^6.0.1"
+    wcwidth "^1.0.0"
+
+commander@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
+commander@^2.19.0, commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+common-ancestor-path@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
+  integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+config-chain@^1.1.12:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
+consola@^2.15.0:
+  version "2.15.3"
+  resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
+  integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
+
+console-control-strings@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+content-disposition@0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
+  dependencies:
+    safe-buffer "5.2.1"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
+cors@2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
+cosmiconfig@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
+cross-spawn@^7.0.0, cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+csv-parse@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.0.4.tgz#97e5e654413bcf95f2714ce09bcb2be6de0eb8e3"
+  integrity sha512-5AIdl8l6n3iYQYxan5djB5eKDa+vBnhfWZtRpJTcrETWfVLYN0WSj3L9RwvgYt+psoO77juUr8TG8qpfGZifVQ==
+
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+  dependencies:
+    es5-ext "^0.10.50"
+    type "^1.0.1"
+
+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+depd@^1.1.2, depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+dezalgo@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
+  integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
+dicer@0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f"
+  integrity sha1-WZbAhrszIYyBLAkL3cCc0S+stw8=
+  dependencies:
+    readable-stream "1.1.x"
+    streamsearch "0.1.2"
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+diff@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+dottie@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154"
+  integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==
+
+editorconfig@^0.15.3:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
+  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
+  dependencies:
+    commander "^2.19.0"
+    lru-cache "^4.1.5"
+    semver "^5.6.0"
+    sigmund "^1.0.1"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.4.84:
+  version "1.4.106"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a"
+  integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+encoding@^0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
+end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.2:
+  version "5.9.2"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
+  integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
+env-paths@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
+err-code@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-abstract@^1.17.0-next.1, es-abstract@^1.19.1:
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
+  integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
+es-module-lexer@^0.9.0:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@^0.10.59, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.60"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.60.tgz#e8060a86472842b93019c31c34865012449883f4"
+  integrity sha512-jpKNXIt60htYG59/9FGf2PYT3pwMpnEbNKysU+k/4FGwyGtMotOvcZOuW+EmXXYASRqYSXQfGL5cVIthOTgbkg==
+  dependencies:
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.3"
+    next-tick "^1.1.0"
+
+es6-iterator@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-symbol@^3.1.1, es6-symbol@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  dependencies:
+    d "^1.0.1"
+    ext "^1.1.2"
+
+es6-weak-map@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
+  dependencies:
+    d "1"
+    es5-ext "^0.10.46"
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.1"
+
+es7-shim@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/es7-shim/-/es7-shim-6.0.0.tgz#0c430b40b8505ad15570721a8d8dd4eb0c553155"
+  integrity sha1-DEMLQLhQWtFVcHIajY3U6wxVMVU=
+  dependencies:
+    array-includes "^3.0.2"
+    object.entries "^1.0.3"
+    object.getownpropertydescriptors "^2.0.2"
+    object.values "^1.0.3"
+    string-at "^1.0.1"
+    string.prototype.padend "^3.0.0"
+    string.prototype.padstart "^3.0.0"
+    string.prototype.trimleft "^2.0.0"
+    string.prototype.trimright "^2.0.0"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+  dependencies:
+    eslint-visitor-keys "^2.0.0"
+
+eslint-visitor-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
+eslint@^8.12.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e"
+  integrity sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==
+  dependencies:
+    "@eslint/eslintrc" "^1.2.1"
+    "@humanwhocodes/config-array" "^0.9.2"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.1.1"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.1"
+    esquery "^1.4.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^6.0.1"
+    globals "^13.6.0"
+    ignore "^5.2.0"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.0.4"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
+    strip-json-comments "^3.1.0"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+espree@^9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
+  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^3.3.0"
+
+esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+event-emitter@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+events@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+execa@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+express@4.17.3:
+  version "4.17.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
+  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+  dependencies:
+    accepts "~1.3.8"
+    array-flatten "1.1.1"
+    body-parser "1.19.2"
+    content-disposition "0.5.4"
+    content-type "~1.0.4"
+    cookie "0.4.2"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.7"
+    qs "6.9.7"
+    range-parser "~1.2.1"
+    safe-buffer "5.2.1"
+    send "0.17.2"
+    serve-static "1.14.2"
+    setprototypeof "1.2.0"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+ext@^1.1.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
+  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
+  dependencies:
+    type "^2.5.0"
+
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.2.9:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fast-safe-stringify@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
+  integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
+
+fastest-levenshtein@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
+  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
+
+fastq@^1.6.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  dependencies:
+    reusify "^1.0.4"
+
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
+flatted@^3.1.0:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
+  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+
+follow-redirects@^1.14.8:
+  version "1.14.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
+  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+
+fork-ts-checker-webpack-plugin@7.2.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.3.tgz#978dbc0b601556552a5a274a8984ec5dd8de56a3"
+  integrity sha512-9v308zIFTIFkWJBN/4N1A5oqm/ed9hWG6GH+KYTCBjYCEJOmHoVtDIWpfrJ0eD6cPB7V53HEVoJ6bL2In8QRaw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    chalk "^4.1.2"
+    chokidar "^3.5.3"
+    cosmiconfig "^7.0.1"
+    deepmerge "^4.2.2"
+    fs-extra "^10.0.0"
+    memfs "^3.4.1"
+    minimatch "^3.0.4"
+    schema-utils "^3.1.1"
+    semver "^7.3.5"
+    tapable "^2.2.1"
+
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+fs-extra@10.0.1, fs-extra@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
+  integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-extra@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
+fs-monkey@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
+  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
+gauge@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
+generic-pool@3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
+  integrity sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+get-stream@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
+glob-parent@^5.1.2, glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-parent@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
+glob@7.2.0, glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^13.6.0, globals@^13.9.0:
+  version "13.13.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
+  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+  dependencies:
+    type-fest "^0.20.2"
+
+globby@^11.0.4:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
+has-unicode@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+hosted-git-info@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.0.0.tgz#df7a06678b4ebd722139786303db80fdf302ea56"
+  integrity sha512-rRnjWu0Bxj+nIfUOkz0695C0H6tRrN5iYIzYejb0tDEefe2AekHu/U5Kn9pEie5vsJqpNQU02az7TGSH3qpz4Q==
+  dependencies:
+    lru-cache "^7.5.1"
+
+http-cache-semantics@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
+http-errors@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.1"
+
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+  dependencies:
+    depd "2.0.0"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    toidentifier "1.0.1"
+
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
+i@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/i/-/i-0.3.7.tgz#2a7437a923d59c14b17243dc63a549af24d85799"
+  integrity sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==
+
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+ignore-walk@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
+  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
+  dependencies:
+    minimatch "^5.0.1"
+
+ignore@^5.1.8, ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
+import-fresh@^3.0.0, import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
+inflection@^1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.2.tgz#15e8c797c6c3dadf31aa658f8df8a4ea024798b0"
+  integrity sha512-cmZlljCRTBFouT8UzMzrGcVEvkv6D/wBdcdKG7J1QH5cXjtU75Dm+P27v9EKu/Y43UYyCJd1WC4zLebRrC8NBw==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+ini@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
+
+ini@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1"
+  integrity sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==
+
+init-package-json@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
+  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
+  dependencies:
+    npm-package-arg "^9.0.1"
+    promzard "^0.3.0"
+    read "^1.0.7"
+    read-package-json "^5.0.0"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+    validate-npm-package-name "^4.0.0"
+
+inquirer@7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
+inquirer@8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.0.tgz#f44f008dd344bbfc4b30031f45d984e034a3ac3a"
+  integrity sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.1"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.21"
+    mute-stream "0.0.8"
+    ora "^5.4.1"
+    run-async "^2.4.0"
+    rxjs "^7.2.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+  dependencies:
+    get-intrinsic "^1.1.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
+interpret@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
+
+ip-regex@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
+  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
+
+ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-bigint@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-boolean-object@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-callable@^1.1.4, is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+
+is-cidr@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
+  integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
+  dependencies:
+    cidr-regex "^3.1.1"
+
+is-core-module@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  dependencies:
+    has "^1.0.3"
+
+is-date-object@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
+
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+
+is-number-object@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-promise@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
+
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-shared-array-buffer@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+is-string@^1.0.5, is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  dependencies:
+    has-symbols "^1.0.2"
+
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+  dependencies:
+    call-bind "^1.0.2"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+iterare@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/iterare/-/iterare-1.2.1.tgz#139c400ff7363690e33abffa33cbba8920f00042"
+  integrity sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==
+
+jest-worker@^27.4.5:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+js-beautify@^1.14.0:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.2.tgz#8180514fd4c7789c4ac4bcc327b6dda634c55666"
+  integrity sha512-H85kX95a53os+q1OCqtYe8AXAmgy3BvtysA/V83S3fdhznm6WlUpGi14DqSPbKFsL3dXZFXYl7YQwW9U1+76ng==
+  dependencies:
+    config-chain "^1.1.12"
+    editorconfig "^0.15.3"
+    glob "^7.1.3"
+    nopt "^5.0.0"
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
+json-stringify-nice@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
+  integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
+
+json-to-ts@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/json-to-ts/-/json-to-ts-1.7.0.tgz#896a4eaa3d1ed3fef0c9e73ba98b3e8b25c1e02d"
+  integrity sha512-uVhcw4SLnf9ucMwFpom/G1/IT+lnoILOyHbFE6xqxvw67oCvHl6iDZzmjyn2lPCRPsAOMSQgG/ZxvbCPySMi1Q==
+  dependencies:
+    es7-shim "^6.0.0"
+    hash.js "^1.0.3"
+    pluralize "^3.1.0"
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+jsonc-parser@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
+  integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonparse@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
+
+just-diff-apply@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.2.0.tgz#15da3888ab3acecc14ce9a067f2d7589c653cb89"
+  integrity sha512-unjtin7rnng0KUpE4RPWwTl8iwWiZuyZqOQ+vm8orV6aIXX8mHN8zlKCPPbOycfDNuLh2PBazbFhNoDJv4S/FA==
+
+just-diff@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.0.1.tgz#db8fe1cfeea1156f2374bfb289826dca28e7e390"
+  integrity sha512-X00TokkRIDotUIf3EV4xUm6ELc/IkqhS/vPSHdWnsM5y0HoNMfEqrazizI7g78lpHvnRSRt/PFfKtRqJCOGIuQ==
+
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+libnpmaccess@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.3.tgz#473cc3e4aadb2bc713419d92e45d23b070d8cded"
+  integrity sha512-4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg==
+  dependencies:
+    aproba "^2.0.0"
+    minipass "^3.1.1"
+    npm-package-arg "^9.0.1"
+    npm-registry-fetch "^13.0.0"
+
+libnpmdiff@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.3.tgz#ad3997330c887c1098ac42682f1e5ad014d49cec"
+  integrity sha512-AiwBtXtH7HjfmT7FbTf9LFzJB347RrIA4I+IewMfhq8vYXaUveHwJMVNgMM2H/o2J+7Hf12JCBoOF5bTwlmGyw==
+  dependencies:
+    "@npmcli/disparity-colors" "^2.0.0"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    binary-extensions "^2.2.0"
+    diff "^5.0.0"
+    minimatch "^5.0.1"
+    npm-package-arg "^9.0.1"
+    pacote "^13.0.5"
+    tar "^6.1.0"
+
+libnpmexec@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.3.tgz#8f1af808d228766d046b24632304137d64630e1c"
+  integrity sha512-71QeTdmiR/nUyNhaSdVuquD65cDrEY2lKHyewlZSmQGX5k4ApimbLnpQkAjeEB7Y9/AVPNAM7F9nrHyb/aExjQ==
+  dependencies:
+    "@npmcli/arborist" "^5.0.0"
+    "@npmcli/ci-detect" "^2.0.0"
+    "@npmcli/run-script" "^3.0.0"
+    chalk "^4.1.0"
+    mkdirp-infer-owner "^2.0.0"
+    npm-package-arg "^9.0.1"
+    npmlog "^6.0.1"
+    pacote "^13.0.5"
+    proc-log "^2.0.0"
+    read "^1.0.7"
+    read-package-json-fast "^2.0.2"
+    walk-up-path "^1.0.0"
+
+libnpmfund@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.2.tgz#7da0827950f0db2cce0acb0dc7652d1834a8b239"
+  integrity sha512-wmFMP/93Wjy+jDg5LaSldDgAhSgCyA64JUUmp806Kae7y3YP9Qv5m1vUhPxT4yebxgB2v/I6G1/RUcNb1y0kVg==
+  dependencies:
+    "@npmcli/arborist" "^5.0.0"
+
+libnpmhook@^8.0.2:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.3.tgz#9628518a63455d21dafda312ee46175275707ff5"
+  integrity sha512-TEdNI1mC5zS+w/juCgxrwwQnpbq9lY76NDOS0N37pn6pWIUxB1Yq8mwy6MUEXR1TgH4HurSQyKT6I6Kp9Wjm4A==
+  dependencies:
+    aproba "^2.0.0"
+    npm-registry-fetch "^13.0.0"
+
+libnpmorg@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.3.tgz#a85cbdb3665ad4f7c7279d239a4581ec2eeef5a6"
+  integrity sha512-r4CpmCEF+e5PbFMBi64xSXmqn0uGgV4T7NWpGL4/A6KT/DTtIxALILQZq+l0ZdN1xm4RjOvqSDR22oT4il8rAQ==
+  dependencies:
+    aproba "^2.0.0"
+    npm-registry-fetch "^13.0.0"
+
+libnpmpack@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.0.3.tgz#0de60120a2456524b0cdb25bac58f454a1441c2e"
+  integrity sha512-/H4XXJp5S74palJfVhM5za/4dw8/1DRfU5g+t2taAojjr5+cSKyEoxxnHOnSRWu7zqqMeT8e4jX6Cz8lNUsbAw==
+  dependencies:
+    "@npmcli/run-script" "^3.0.0"
+    npm-package-arg "^9.0.1"
+    pacote "^13.0.5"
+
+libnpmpublish@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.3.tgz#b10cd9c8b2ebeccadc05aea78f11acb28fe606c4"
+  integrity sha512-slJ5XuTR3DIF669K7MLVSdhvkatoM3/D+wvryKxVtquKnEbfFORESI1w0lYD4tvrPEy6AU9y/qEMDqhUW712HQ==
+  dependencies:
+    normalize-package-data "^4.0.0"
+    npm-package-arg "^9.0.1"
+    npm-registry-fetch "^13.0.0"
+    semver "^7.1.3"
+    ssri "^9.0.0"
+
+libnpmsearch@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.3.tgz#ed502a4c2c70ea36723180455fae1357546b2184"
+  integrity sha512-Ofq76qKAPhxbiyzPf/5LPjJln26VTKwU9hIU0ACxQ6tNtBJ1CHmI7iITrdp7vNezhZc0FlkXwrIpqXjhBJZgLQ==
+  dependencies:
+    npm-registry-fetch "^13.0.0"
+
+libnpmteam@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.3.tgz#9335fbbd032b3770f5c9b7ffc6203f47d1ed144a"
+  integrity sha512-LsYYLz4TlTpcqkusInY5MhKjiHFaCx1GV0LmydXJ/QMh+3IWBJpUhes4ynTZuFoJKkDIFjxyMU09ul+RZixgdg==
+  dependencies:
+    aproba "^2.0.0"
+    npm-registry-fetch "^13.0.0"
+
+libnpmversion@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.2.tgz#02e517ee2a6454010ab81fd47d26fa1e328f356d"
+  integrity sha512-W76aMbL6NWkvOCoBpbWEoypCBsaXU95vhYY2eqBg0Ev11lwpjLIGC78ZCzT/M2hI00ena+yoCpGXGnAk949KOQ==
+  dependencies:
+    "@npmcli/git" "^3.0.0"
+    "@npmcli/run-script" "^3.0.0"
+    json-parse-even-better-errors "^2.3.1"
+    proc-log "^2.0.0"
+    semver "^7.3.5"
+    stringify-package "^1.0.1"
+
+libphonenumber-js@^1.9.43:
+  version "1.9.50"
+  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.50.tgz#f5028a2c4cc47a69d69a0de3629afad97a613712"
+  integrity sha512-cCzQPChw2XbordcO2LKiw5Htx5leHVfFk/EXkxNHqJfFo7Fndcb1kF5wPJpc316vCJhhikedYnVysMh3Sc7Ocw==
+
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
+lines-logger@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/lines-logger/-/lines-logger-2.1.2.tgz#85b619ee849938323615e40fa8cee76d24532de7"
+  integrity sha512-pSn6qr2K0tf28TgrVMMQxinADrZP3xObxxUBlhTNWWRZToRtrjHihzW7UOKlOypKDDiP3uk/DRjd6dqQsg1coA==
+
+loader-runner@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
+  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
+
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash@4.17.21, lodash@^4.17.19, lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
+lru-cache@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+lru-cache@^7.4.0, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.8.0.tgz#649aaeb294a56297b5cbc5d70f198dcc5ebe5747"
+  integrity sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg==
+
+lru-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
+  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
+  dependencies:
+    es5-ext "~0.10.2"
+
+macos-release@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.5.0.tgz#067c2c88b5f3fb3c56a375b2ec93826220fa1ff2"
+  integrity sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==
+
+magic-string@0.25.7:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
+make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.1.1:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.1.2.tgz#acffef43f86250602b932eecc0ad3acc992ae233"
+  integrity sha512-GWMGiZsKVeJACQGJ1P3Z+iNec7pLsU6YW1q11eaPn3RR8nRXHppFWfP7Eu0//55JK3hSjrAQRl8sDa5uXpq1Ew==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^16.0.2"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^2.0.3"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^6.1.1"
+    ssri "^9.0.0"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+memfs@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
+  integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
+  dependencies:
+    fs-monkey "1.0.3"
+
+memoizee@^0.4.15:
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
+  integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.53"
+    es6-weak-map "^2.0.3"
+    event-emitter "^0.3.5"
+    is-promise "^2.2.2"
+    lru-queue "^0.1.0"
+    next-tick "^1.1.0"
+    timers-ext "^0.1.7"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^4.0.0, micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  dependencies:
+    braces "^3.0.2"
+    picomatch "^2.3.1"
+
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimatch@^3.0.4:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimatch@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
+  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimist@1.2.6, minimist@^1.2.0, minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-fetch@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
+  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
+  dependencies:
+    minipass "^3.1.6"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-json-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
+  integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
+  dependencies:
+    jsonparse "^1.3.1"
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
+  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+  dependencies:
+    yallist "^4.0.0"
+
+minizlib@^2.1.1, minizlib@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
+mkdirp-infer-owner@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
+  integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
+  dependencies:
+    chownr "^2.0.0"
+    infer-owner "^1.0.4"
+    mkdirp "^1.0.3"
+
+mkdirp@^0.5.4:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+moment-timezone@^0.5.34:
+  version "0.5.34"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c"
+  integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==
+  dependencies:
+    moment ">= 2.9.0"
+
+"moment@>= 2.9.0", moment@^2.29.1:
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@2.1.3, ms@^2.0.0, ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+multer@1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.4.tgz#e2bc6cac0df57a8832b858d7418ccaa8ebaf7d8c"
+  integrity sha512-2wY2+xD4udX612aMqMcB8Ws2Voq6NIUPEtD1be6m411T4uDH/VtL9i//xvcyFlTVfRdaBsk7hV5tgrGQqhuBiw==
+  dependencies:
+    append-field "^1.0.0"
+    busboy "^0.2.11"
+    concat-stream "^1.5.2"
+    mkdirp "^0.5.4"
+    object-assign "^4.1.1"
+    on-finished "^2.3.0"
+    type-is "^1.6.4"
+    xtend "^4.0.0"
+
+mute-stream@0.0.8, mute-stream@~0.0.4:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
+negotiator@0.6.3, negotiator@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
+neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+next-tick@1, next-tick@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
+
+"node-config-ts@npm:node-config-ts-2":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-config-ts-2/-/node-config-ts-2-1.0.0.tgz#349f5dd10e8de8d75f279e2a1e1148f782e77fbe"
+  integrity sha512-hnszqz2O74wrICiMsm+lIP8xVEeKrp48xebD6A8K7e5dEEOTa9HpUI5fvuXHLwiBwud3HeFGTuSutsKX4fTGKA==
+  dependencies:
+    json-to-ts "^1.6.0"
+    minimist "^1.2.0"
+    prettier "^1.19.1"
+    ramda "^0.27.0"
+
+node-emoji@1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c"
+  integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==
+  dependencies:
+    lodash "^4.17.21"
+
+node-fetch@^2.6.1:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-gyp@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.0.0.tgz#e1da2067427f3eb5bb56820cb62bc6b1e4bd2089"
+  integrity sha512-Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
+    nopt "^5.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
+node-releases@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
+  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+  dependencies:
+    abbrev "1"
+
+normalize-package-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.0.tgz#1122d5359af21d4cd08718b92b058a658594177c"
+  integrity sha512-m+GL22VXJKkKbw62ZaBBjv8u6IE3UI4Mh5QakIqs3fWiKe0Xyi6L97hakwZK41/LD4R/2ly71Bayx0NLMwLA/g==
+  dependencies:
+    hosted-git-info "^5.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+npm-audit-report@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
+  integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
+  dependencies:
+    chalk "^4.0.0"
+
+npm-bundled@^1.1.1, npm-bundled@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-install-checks@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
+  dependencies:
+    semver "^7.1.1"
+
+npm-install-checks@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
+  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
+  dependencies:
+    semver "^7.1.1"
+
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-package-arg@^9.0.0, npm-package-arg@^9.0.1:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.0.2.tgz#f3ef7b1b3b02e82564af2d5228b4c36567dcd389"
+  integrity sha512-v/miORuX8cndiOheW8p2moNuPJ7QhcFh9WGlTorruG8hXSA23vMTEp5hTCmDxic0nD8KHhj/NQgFuySD3GYY3g==
+  dependencies:
+    hosted-git-info "^5.0.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^4.0.0"
+
+npm-packlist@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.0.0.tgz#74795ebbbf91bd5a2db6ecff4d6fe1f1c1a07e11"
+  integrity sha512-uU20UwM4Hogfab1Q7htJbhcyafM9lGHxOrDjkKvR2S3z7Ds0uRaESk0cXctczk+ABT4DZWNwjB10xlurFdEwZg==
+  dependencies:
+    glob "^7.2.0"
+    ignore-walk "^5.0.1"
+    npm-bundled "^1.1.2"
+    npm-normalize-package-bin "^1.0.1"
+
+npm-pick-manifest@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
+  integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
+  dependencies:
+    npm-install-checks "^5.0.0"
+    npm-normalize-package-bin "^1.0.1"
+    npm-package-arg "^9.0.0"
+    semver "^7.3.5"
+
+npm-profile@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.0.2.tgz#b2da9887d16d1f0d1ce8a9c3b37a48454a372919"
+  integrity sha512-0Fq8l+A10YXnnS63E3HThWjOb7+19Wsh1nOVutC2fKuowar8t/5PpINsbcm5xQ2dA28uAu+wjFfUyiEVSMz4Jw==
+  dependencies:
+    npm-registry-fetch "^13.0.0"
+    proc-log "^2.0.0"
+
+npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1, npm-registry-fetch@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.1.0.tgz#71bed52e30a4b27441604bbba79c7db8e0e34cb5"
+  integrity sha512-TIYL5X8CcwDhbFMXFDShNcpG6OMCYK6VzvSr6MUWP20tCU2DJ4ao2qQg3DT+3Pet8mO6/cgbZpon4LMh3duYLg==
+  dependencies:
+    make-fetch-happen "^10.0.6"
+    minipass "^3.1.6"
+    minipass-fetch "^2.0.3"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.1.2"
+    npm-package-arg "^9.0.1"
+    proc-log "^2.0.0"
+
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
+npm-user-validate@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
+  integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
+
+npm@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/npm/-/npm-8.6.0.tgz#46a601fdffa80b018e1dcf08e10d5efb625e5c9e"
+  integrity sha512-icekvN8FJFESIFkLaFEVl05Nocl5Id5HnoVhJzhCUvtNY8tj9kfUlH/J527fZq/8ltsAUqpettfutwRjQYS2fA==
+  dependencies:
+    "@isaacs/string-locale-compare" "^1.1.0"
+    "@npmcli/arborist" "^5.0.4"
+    "@npmcli/ci-detect" "^2.0.0"
+    "@npmcli/config" "^4.0.1"
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/map-workspaces" "^2.0.2"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^3.0.1"
+    abbrev "~1.1.1"
+    ansicolors "~0.3.2"
+    ansistyles "~0.1.3"
+    archy "~1.0.0"
+    cacache "^16.0.3"
+    chalk "^4.1.2"
+    chownr "^2.0.0"
+    cli-columns "^4.0.0"
+    cli-table3 "^0.6.1"
+    columnify "^1.6.0"
+    fastest-levenshtein "^1.0.12"
+    glob "^7.2.0"
+    graceful-fs "^4.2.9"
+    hosted-git-info "^5.0.0"
+    ini "^2.0.0"
+    init-package-json "^3.0.2"
+    is-cidr "^4.0.2"
+    json-parse-even-better-errors "^2.3.1"
+    libnpmaccess "^6.0.2"
+    libnpmdiff "^4.0.2"
+    libnpmexec "^4.0.2"
+    libnpmfund "^3.0.1"
+    libnpmhook "^8.0.2"
+    libnpmorg "^4.0.2"
+    libnpmpack "^4.0.2"
+    libnpmpublish "^6.0.2"
+    libnpmsearch "^5.0.2"
+    libnpmteam "^4.0.2"
+    libnpmversion "^3.0.1"
+    make-fetch-happen "^10.1.1"
+    minipass "^3.1.6"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    mkdirp-infer-owner "^2.0.0"
+    ms "^2.1.2"
+    node-gyp "^9.0.0"
+    nopt "^5.0.0"
+    npm-audit-report "^3.0.0"
+    npm-install-checks "^4.0.0"
+    npm-package-arg "^9.0.1"
+    npm-pick-manifest "^7.0.0"
+    npm-profile "^6.0.2"
+    npm-registry-fetch "^13.1.0"
+    npm-user-validate "^1.0.1"
+    npmlog "^6.0.1"
+    opener "^1.5.2"
+    pacote "^13.0.5"
+    parse-conflict-json "^2.0.2"
+    proc-log "^2.0.1"
+    qrcode-terminal "^0.12.0"
+    read "~1.0.7"
+    read-package-json "^5.0.0"
+    read-package-json-fast "^2.0.3"
+    readdir-scoped-modules "^1.1.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    ssri "^8.0.1"
+    tar "^6.1.11"
+    text-table "~0.2.0"
+    tiny-relative-date "^1.3.0"
+    treeverse "^1.0.4"
+    validate-npm-package-name "^4.0.0"
+    which "^2.0.2"
+    write-file-atomic "^4.0.1"
+
+npmlog@^6.0.0, npmlog@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.1.tgz#06f1344a174c06e8de9c6c70834cfba2964bba17"
+  integrity sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.0"
+    set-blocking "^2.0.0"
+
+object-assign@^4, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-hash@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
+  integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
+
+object-inspect@^1.12.0, object-inspect@^1.9.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
+  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.entries@^1.0.3:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
+  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
+object.getownpropertydescriptors@^2.0.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
+  integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
+object.values@^1.0.3:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
+  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
+on-finished@2.4.1, on-finished@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
+  dependencies:
+    ee-first "1.1.1"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+opener@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
+
+optional@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/optional/-/optional-0.1.4.tgz#cdb1a9bedc737d2025f690ceeb50e049444fd5b3"
+  integrity sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw==
+
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
+ora@5.4.1, ora@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+  dependencies:
+    bl "^4.1.0"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
+os-name@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-4.0.1.tgz#32cee7823de85a8897647ba4d76db46bf845e555"
+  integrity sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==
+  dependencies:
+    macos-release "^2.5.0"
+    windows-release "^4.0.0"
+
+os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+packet-reader@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74"
+  integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==
+
+pacote@^13.0.3, pacote@^13.0.5:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.1.1.tgz#d3e6e27ffc5137d2a07233ed6fba2a209ecb2b7b"
+  integrity sha512-MTT3k1OhUo+IpvoHGp25OwsRU0L+kJQM236OCywxvY4OIJ/YfloNW2/Yc3HMASH10BkfZaGMVK/pxybB7fWcLw==
+  dependencies:
+    "@npmcli/git" "^3.0.0"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/promise-spawn" "^3.0.0"
+    "@npmcli/run-script" "^3.0.1"
+    cacache "^16.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    infer-owner "^1.0.4"
+    minipass "^3.1.6"
+    mkdirp "^1.0.4"
+    npm-package-arg "^9.0.0"
+    npm-packlist "^5.0.0"
+    npm-pick-manifest "^7.0.0"
+    npm-registry-fetch "^13.0.1"
+    proc-log "^2.0.0"
+    promise-retry "^2.0.1"
+    read-package-json "^5.0.0"
+    read-package-json-fast "^2.0.3"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-conflict-json@^2.0.1, parse-conflict-json@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
+  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
+  dependencies:
+    json-parse-even-better-errors "^2.3.1"
+    just-diff "^5.0.1"
+    just-diff-apply "^5.2.0"
+
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+path-to-regexp@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.2.0.tgz#fa7877ecbc495c601907562222453c43cc204a5f"
+  integrity sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pg-connection-string@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
+  integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
+
+pg-int8@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
+  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
+
+pg-pool@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905"
+  integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==
+
+pg-protocol@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0"
+  integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==
+
+pg-types@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
+  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
+  dependencies:
+    pg-int8 "1.0.1"
+    postgres-array "~2.0.0"
+    postgres-bytea "~1.0.0"
+    postgres-date "~1.0.4"
+    postgres-interval "^1.1.0"
+
+pg@^8.7.3:
+  version "8.7.3"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz#8a5bdd664ca4fda4db7997ec634c6e5455b27c44"
+  integrity sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==
+  dependencies:
+    buffer-writer "2.0.0"
+    packet-reader "1.0.0"
+    pg-connection-string "^2.5.0"
+    pg-pool "^3.5.1"
+    pg-protocol "^1.5.0"
+    pg-types "^2.1.0"
+    pgpass "1.x"
+
+pgpass@1.x:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
+  integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
+  dependencies:
+    split2 "^4.1.0"
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+pluralize@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
+  integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
+
+pluralize@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-3.1.0.tgz#84213d0a12356069daa84060c559242633161368"
+  integrity sha1-hCE9ChI1YGnaqEBgxVkkJjMWE2g=
+
+postgres-array@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
+  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
+
+postgres-bytea@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
+  integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
+
+postgres-date@~1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
+  integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
+
+postgres-interval@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695"
+  integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==
+  dependencies:
+    xtend "^4.0.0"
+
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+prettier@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+
+proc-log@^2.0.0, proc-log@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
+  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+promise-all-reject-late@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2"
+  integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==
+
+promise-call-limit@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24"
+  integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q==
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+promise-retry@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+  dependencies:
+    err-code "^2.0.2"
+    retry "^0.12.0"
+
+promzard@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=
+  dependencies:
+    read "1"
+
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
+proxy-addr@~2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
+  dependencies:
+    forwarded "0.2.0"
+    ipaddr.js "1.9.1"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qrcode-terminal@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
+  integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
+
+qs@6.10.3:
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+  dependencies:
+    side-channel "^1.0.4"
+
+qs@6.9.7:
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
+  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+ramda@^0.27.0:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.2.tgz#84463226f7f36dc33592f6f4ed6374c48306c3f1"
+  integrity sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==
+
+randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
+  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "1.8.1"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+read-cmd-shim@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz#62b8c638225c61e6cc607f8f4b779f3b8238f155"
+  integrity sha512-KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog==
+
+read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
+  integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
+  dependencies:
+    json-parse-even-better-errors "^2.3.0"
+    npm-normalize-package-bin "^1.0.1"
+
+read-package-json@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.0.tgz#d62602755547e152a3923c220238d9a7f0b60745"
+  integrity sha512-1cjk2MV5ONDMn34uxSID3X8NY7VKsXfJnjbcVdFMvHEnJOBzU6MJ7/3yg6QFVZDq5/1yFNrKBUK9kGnonyGP2Q==
+  dependencies:
+    glob "^7.2.0"
+    json-parse-even-better-errors "^2.3.1"
+    normalize-package-data "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
+
+read@1, read@^1.0.7, read@~1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
+  dependencies:
+    mute-stream "~0.0.4"
+
+readable-stream@1.1.x:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@^2.2.2:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.4.0, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readdir-scoped-modules@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
+  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
+  dependencies:
+    resolve "^1.1.6"
+
+redis-errors@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
+
+redis-parser@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
+  dependencies:
+    redis-errors "^1.0.0"
+
+redis@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-4.0.6.tgz#a2ded4d9f4f4bad148e54781051618fc684cd858"
+  integrity sha512-IaPAxgF5dV0jx+A9l6yd6R9/PAChZIoAskDVRzUODeLDNhsMlq7OLLTmu0AwAr0xjrJ1bibW5xdpRwqIQ8Q0Xg==
+  dependencies:
+    "@node-redis/bloom" "1.0.1"
+    "@node-redis/client" "1.0.5"
+    "@node-redis/graph" "1.0.0"
+    "@node-redis/json" "1.0.2"
+    "@node-redis/search" "1.0.5"
+    "@node-redis/time-series" "1.0.2"
+
+reflect-metadata@^0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
+
+regexpp@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve@^1.1.6, resolve@^1.20.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+  dependencies:
+    is-core-module "^2.8.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+retry-as-promised@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-5.0.0.tgz#f4ecc25133603a2d2a7aff4a128691d7bc506d54"
+  integrity sha512-6S+5LvtTl2ggBumk04hBo/4Uf6fRJUwIgunGZ7CYEBCeufGFW1Pu6ucUf/UskHeWOIsUcLOGLFXPig5tR5V1nA==
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+rxjs@6.6.7, rxjs@^6.6.0:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^7.2.0:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
+  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
+  dependencies:
+    tslib "^2.1.0"
+
+safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+schema-utils@^3.1.0, schema-utils@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.6"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b"
+  integrity sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==
+  dependencies:
+    lru-cache "^7.4.0"
+
+send@0.17.2:
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
+  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "1.8.1"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+sequelize-cli@^6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.4.1.tgz#fb9fbbde733ae887970316a700d264fcf0683770"
+  integrity sha512-gIzzFitUGUErq6DYd1JDnsmx7z7XcxzRNe4Py3AqeaxcyjpCAZU2BQnsNPGPMKAaXfMtKi/d9Tu4MtLrehVzIQ==
+  dependencies:
+    cli-color "^2.0.1"
+    fs-extra "^9.1.0"
+    js-beautify "^1.14.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    umzug "^2.3.0"
+    yargs "^16.2.0"
+
+sequelize-pool@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-7.1.0.tgz#210b391af4002762f823188fd6ecfc7413020768"
+  integrity sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==
+
+sequelize-typescript@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/sequelize-typescript/-/sequelize-typescript-2.1.3.tgz#94a8d0a4b5739fc917c8d8fa66e1acb5aadc1274"
+  integrity sha512-0mejGAaLywuCoOOLSXCQs2sMBNudU/QtWZkGY5VT2dfTHToXZi5bOxCa3/CukNNk7wJwXnLuIdeHdlqjvVoj1g==
+  dependencies:
+    glob "7.2.0"
+
+sequelize@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.18.0.tgz#0e99e0c07ee144eb456374a56e2bd501634c3d16"
+  integrity sha512-x8TW8ovqG8ljZq0Uow1mtMq44hSKPefWEC590R9IWgF2dajEHvKJJpXo1FiRPfj6spOHWOnmOs1Xbb1JPG3Ifg==
+  dependencies:
+    "@types/debug" "^4.1.7"
+    "@types/validator" "^13.7.1"
+    debug "^4.3.3"
+    dottie "^2.0.2"
+    inflection "^1.13.2"
+    lodash "^4.17.21"
+    moment "^2.29.1"
+    moment-timezone "^0.5.34"
+    pg-connection-string "^2.5.0"
+    retry-as-promised "^5.0.0"
+    semver "^7.3.5"
+    sequelize-pool "^7.1.0"
+    toposort-class "^1.0.1"
+    uuid "^8.3.2"
+    validator "^13.7.0"
+    wkx "^0.5.0"
+
+serialize-javascript@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+  dependencies:
+    randombytes "^2.1.0"
+
+serve-static@1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
+  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.2"
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+shelljs@0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
+  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
+
+signal-exit@^3.0.2, signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+smart-buffer@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
+socks-proxy-agent@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
+  integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.1"
+    socks "^2.6.1"
+
+socks@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
+  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.2.0"
+
+source-map-support@0.5.21, source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@0.7.3, source-map@~0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+source-map@^0.6.0, source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+sourcemap-codec@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
+  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
+
+split2@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809"
+  integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==
+
+ssri@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+  dependencies:
+    minipass "^3.1.1"
+
+ssri@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.0.tgz#70ad90e339eb910f1a7ff1dcf4afc268326c4547"
+  integrity sha512-Y1Z6J8UYnexKFN1R/hxUaYoY2LVdKEzziPmVAFKiKX8fiwvCJTVzn/xYE9TEWod5OVyNfIHHuVfIEuBClL/uJQ==
+  dependencies:
+    minipass "^3.1.1"
+
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
+"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+streamsearch@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
+  integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
+
+string-at@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/string-at/-/string-at-1.1.0.tgz#332e090c5724418266a27a09394924b9fad41275"
+  integrity sha512-jCpPowWKBn0NFdvtmK2qxK40Ol4jPcgCt8qYnKpPx6B5eDwHMDhRvq9MCsDEgsOTNtbXY6beAMHMRT2qPJXllA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string.prototype.padend@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz#997a6de12c92c7cb34dc8a201a6c53d9bd88a5f1"
+  integrity sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
+string.prototype.padstart@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.padstart/-/string.prototype.padstart-3.1.3.tgz#4551d0117d9501692ec6000b15056ac3f816cfa5"
+  integrity sha512-NZydyOMtYxpTjGqp0VN5PYUF/tsU15yDMZnUdj16qRUIUiMJkHHSDElYyQFrMu+/WloTpA7MQSiADhBicDfaoA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
+string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string.prototype.trimleft@^2.0.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.3.tgz#dee305118117d0a1843c1fc0d38d5d0754d83c60"
+  integrity sha512-699Ibssmj/awVzvdNk4g83/Iu8U9vDohzmA/ly2BrQWGhamuY4Tlvs5XKmKliDt3ky6SKbE1bzPhASKCFlx9Sg==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    string.prototype.trimstart "^1.0.3"
+
+string.prototype.trimright@^2.0.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.3.tgz#dc16a21d7456cbc8b2c54d47fe01f06d9efe94eb"
+  integrity sha512-hoOq56oRFnnfDuXNy2lGHiwT77MehHv9d0zGfRZ8QdC+4zjrkFB9vd5i/zYTd/ymFBd4YxtbdgHt3U6ksGeuBw==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    string.prototype.trimend "^1.0.3"
+
+string.prototype.trimstart@^1.0.3, string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
+  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+swagger-ui-dist@>=4.1.3:
+  version "4.10.3"
+  resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-4.10.3.tgz#d67066716ce20cb6afb23474c9ca2727633a9eb3"
+  integrity sha512-eR4vsd7sYo0Sx7ZKRP5Z04yij7JkNmIlUQfrDQgC+xO5ABYx+waabzN+nDsQTLAJ4Z04bjkRd8xqkJtbxr3G7w==
+
+swagger-ui-express@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/swagger-ui-express/-/swagger-ui-express-4.3.0.tgz#226238ab231f7718f9109d63a66efc3a795618dd"
+  integrity sha512-jN46SEEe9EoXa3ZgZoKgnSF6z0w3tnM1yqhO4Y+Q4iZVc8JOQB960EZpIAz6rNROrDApVDwcMHR0mhlnc/5Omw==
+  dependencies:
+    swagger-ui-dist ">=4.1.3"
+
+symbol-observable@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
+  integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
+
+tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
+tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+terser-webpack-plugin@^5.1.3:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
+  integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==
+  dependencies:
+    jest-worker "^27.4.5"
+    schema-utils "^3.1.1"
+    serialize-javascript "^6.0.0"
+    source-map "^0.6.1"
+    terser "^5.7.2"
+
+terser@^5.7.2:
+  version "5.12.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c"
+  integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==
+  dependencies:
+    acorn "^8.5.0"
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.20"
+
+text-table@^0.2.0, text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+timers-ext@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
+  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
+  dependencies:
+    es5-ext "~0.10.46"
+    next-tick "1"
+
+tiny-relative-date@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
+  integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+
+toposort-class@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988"
+  integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
+tree-kill@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
+treeverse@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
+  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
+
+treeverse@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
+  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+
+ts-loader@^9.2.8:
+  version "9.2.8"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.8.tgz#e89aa32fa829c5cad0a1d023d6b3adecd51d5a48"
+  integrity sha512-gxSak7IHUuRtwKf3FIPSW1VpZcqF9+MBrHOvBp9cjHh+525SjtCIJKVGjRKIAfxBwDGDGCFF00rTfzB1quxdSw==
+  dependencies:
+    chalk "^4.1.0"
+    enhanced-resolve "^5.0.0"
+    micromatch "^4.0.0"
+    semver "^7.3.4"
+
+ts-node@^10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"
+  integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==
+  dependencies:
+    "@cspotcode/source-map-support" "0.7.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.0"
+    yn "3.1.1"
+
+tsconfig-paths-webpack-plugin@3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz#01aafff59130c04a8c4ebc96a3045c43c376449a"
+  integrity sha512-EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw==
+  dependencies:
+    chalk "^4.1.0"
+    enhanced-resolve "^5.7.0"
+    tsconfig-paths "^3.9.0"
+
+tsconfig-paths@3.14.1, tsconfig-paths@^3.9.0:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
+tslib@2.3.1, tslib@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+
+tslib@^1.8.1, tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+type-is@^1.6.4, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+
+type@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.6.0.tgz#3ca6099af5981d36ca86b78442973694278a219f"
+  integrity sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typescript@4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
+  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
+
+typescript@^4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
+  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
+
+umzug@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184"
+  integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw==
+  dependencies:
+    bluebird "^3.7.2"
+
+unbox-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@8.3.2, uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+v8-compile-cache-lib@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8"
+  integrity sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==
+
+v8-compile-cache@^2.0.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
+validate-npm-package-license@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+validate-npm-package-name@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
+  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+  dependencies:
+    builtins "^5.0.0"
+
+validator@^13.7.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.7.0.tgz#4f9658ba13ba8f3d82ee881d3516489ea85c0857"
+  integrity sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==
+
+vary@^1, vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+walk-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e"
+  integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg==
+
+watchpack@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
+  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
+wcwidth@^1.0.0, wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
+webpack-node-externals@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917"
+  integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==
+
+webpack-sources@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+
+webpack@5.71.0:
+  version "5.71.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.71.0.tgz#b01fcf379570b8c5ee06ca06c829ca168c951884"
+  integrity sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==
+  dependencies:
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^0.0.51"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/wasm-edit" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    acorn "^8.4.1"
+    acorn-import-assertions "^1.7.6"
+    browserslist "^4.14.5"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.9.2"
+    es-module-lexer "^0.9.0"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.9"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.1.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.3.1"
+    webpack-sources "^3.2.3"
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+  dependencies:
+    string-width "^1.0.2 || 2 || 3 || 4"
+
+windows-release@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-4.0.0.tgz#4725ec70217d1bf6e02c7772413b29cdde9ec377"
+  integrity sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==
+  dependencies:
+    execa "^4.0.2"
+
+wkx@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz#c6c37019acf40e517cc6b94657a25a3d4aa33e8c"
+  integrity sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==
+  dependencies:
+    "@types/node" "*"
+
+word-wrap@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^4.0.0, write-file-atomic@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
+  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
+xtend@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@4.0.0, yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+yaml@^1.10.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==

From a819450af1dae1ae076e1ab7f4f3e275be242ba3 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 10 Apr 2022 11:16:43 +0300
Subject: [PATCH 002/221] Added more classes

---
 .../src/data/database/model/image.model.ts    | 62 ++++++++++++++
 .../data/database/model/ip.address.model.ts   | 83 +++++++++++++++++++
 .../data/database/model/room.users.model.ts   | 70 ++++++++++++++++
 .../model/subscription.message.model.ts       | 70 ++++++++++++++++
 .../data/database/model/subscription.model.ts | 72 ++++++++++++++++
 .../database/model/uploaded.file.model.ts     | 82 ++++++++++++++++++
 .../data/database/model/user.joined.info.ts   | 61 ++++++++++++++
 newback/src/data/types/model/db.ts            | 15 ++++
 8 files changed, 515 insertions(+)
 create mode 100644 newback/src/data/database/model/image.model.ts
 create mode 100644 newback/src/data/database/model/ip.address.model.ts
 create mode 100644 newback/src/data/database/model/room.users.model.ts
 create mode 100644 newback/src/data/database/model/subscription.message.model.ts
 create mode 100644 newback/src/data/database/model/subscription.model.ts
 create mode 100644 newback/src/data/database/model/uploaded.file.model.ts
 create mode 100644 newback/src/data/database/model/user.joined.info.ts

diff --git a/newback/src/data/database/model/image.model.ts b/newback/src/data/database/model/image.model.ts
new file mode 100644
index 000000000..02d0579c4
--- /dev/null
+++ b/newback/src/data/database/model/image.model.ts
@@ -0,0 +1,62 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {
+  UploadedFileChoices,
+  VerificationType
+} from '@/data/types/model/db';
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'uploaded_file', timestamps: true })
+export class UploadedFileModel extends Model<UploadedFileModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.ENUM(...Object.keys(UploadedFileChoices)),
+    allowNull: false,
+  })
+  public type: UploadedFileChoices;
+
+  @Column({
+    type: DataType.STRING(1),
+    allowNull: false,
+  })
+  public symbol: string;
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public userId: number;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: false,
+  })
+  public file: string;
+}
diff --git a/newback/src/data/database/model/ip.address.model.ts b/newback/src/data/database/model/ip.address.model.ts
new file mode 100644
index 000000000..5996a783d
--- /dev/null
+++ b/newback/src/data/database/model/ip.address.model.ts
@@ -0,0 +1,83 @@
+import {
+  Column,
+  DataType,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import {Injectable} from '@nestjs/common';
+
+@Injectable()
+@Table({paranoid: true, tableName: 'ip_address', timestamps: true})
+export class IpAddressModel extends Model<IpAddressModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.STRING(32),
+    unique: true,
+    allowNull: false,
+  })
+  public ip: string;
+
+  @Column({
+    type: DataType.STRING(255),
+    allowNull: true,
+  })
+  public isp: string;
+
+  @Column({
+    type: DataType.STRING(16),
+    allowNull: true,
+  })
+  public countryCode: string;
+
+  @Column({
+    type: DataType.STRING(64),
+    allowNull: true,
+  })
+  public country: string;
+
+  @Column({
+    type: DataType.STRING(64),
+    allowNull: true,
+  })
+  public region: string;
+
+  @Column({
+    type: DataType.STRING(64),
+    allowNull: true,
+  })
+  public city: string;
+
+  @Column({
+    type: DataType.FLOAT,
+    allowNull: true,
+  })
+  public lat: number;
+  @Column({
+    type: DataType.FLOAT,
+    allowNull: true,
+  })
+  public lon: number;
+
+  @Column({
+    type: DataType.STRING(32),
+    allowNull: true,
+  })
+  public zip: string;
+
+  @Column({
+    type: DataType.STRING(32),
+    allowNull: true,
+  })
+  public timezone: string;
+
+
+}
diff --git a/newback/src/data/database/model/room.users.model.ts b/newback/src/data/database/model/room.users.model.ts
new file mode 100644
index 000000000..026d45da6
--- /dev/null
+++ b/newback/src/data/database/model/room.users.model.ts
@@ -0,0 +1,70 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {
+  ImageType,
+  UploadedFileChoices,
+  VerificationType
+} from '@/data/types/model/db';
+import {MessageModel} from '@/data/database/model/message.model';
+import {RoomModel} from '@/data/database/model/room.model';
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'room_user', timestamps: true })
+export class UploadedFileModel extends Model<UploadedFileModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @ForeignKey(() => RoomModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public roomId: number;
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public userId: number;
+
+  @Column({
+    type: DataType.INTEGER,
+    defaultValue: 2,
+    allowNull: false,
+  })
+  public volume: number;
+
+
+  @Column({
+    type: DataType.BOOLEAN,
+    defaultValue: true,
+    allowNull: false,
+  })
+  public notifications: boolean;
+
+}
diff --git a/newback/src/data/database/model/subscription.message.model.ts b/newback/src/data/database/model/subscription.message.model.ts
new file mode 100644
index 000000000..8069a9dc7
--- /dev/null
+++ b/newback/src/data/database/model/subscription.message.model.ts
@@ -0,0 +1,70 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {
+  ImageType,
+  UploadedFileChoices,
+  VerificationType
+} from '@/data/types/model/db';
+import {MessageModel} from '@/data/database/model/message.model';
+import {RoomModel} from '@/data/database/model/room.model';
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'room_user', timestamps: true })
+export class UploadedFileModel extends Model<UploadedFileModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @ForeignKey(() => SubscritionModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public subscriptionId: number;
+
+  @ForeignKey(() => MessageModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public messageId: number;
+
+  @Column({
+    type: DataType.INTEGER,
+    defaultValue: 2,
+    allowNull: false,
+  })
+  public volume: number;
+
+
+  @Column({
+    type: DataType.BOOLEAN,
+    defaultValue: true,
+    allowNull: false,
+  })
+  public notifications: boolean;
+
+}
diff --git a/newback/src/data/database/model/subscription.model.ts b/newback/src/data/database/model/subscription.model.ts
new file mode 100644
index 000000000..e0aa75604
--- /dev/null
+++ b/newback/src/data/database/model/subscription.model.ts
@@ -0,0 +1,72 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {
+  UploadedFileChoices,
+  VerificationType
+} from '@/data/types/model/db';
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'subscription', timestamps: true })
+export class UploadedFileModel extends Model<UploadedFileModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public userId: number;
+
+  @Column({
+    type: DataType.STRING(255),
+    unique: true,
+    allowNull: false,
+  })
+  public registrationId: UploadedFileChoices;
+
+  @Column({
+    type: DataType.STRING(64),
+    allowNull: true,
+  })
+  public agent: string;
+
+
+  @Column({
+    type: DataType.BOOLEAN,
+    defaultValue: false,
+    allowNull: false,
+  })
+  public isMobile: boolean;
+
+  @ForeignKey(() => IpAdressModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: true,
+  })
+  public ipId: number;
+}
diff --git a/newback/src/data/database/model/uploaded.file.model.ts b/newback/src/data/database/model/uploaded.file.model.ts
new file mode 100644
index 000000000..39bce5114
--- /dev/null
+++ b/newback/src/data/database/model/uploaded.file.model.ts
@@ -0,0 +1,82 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {
+  ImageType,
+  UploadedFileChoices,
+  VerificationType
+} from '@/data/types/model/db';
+import {MessageModel} from '@/data/database/model/message.model';
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'uploaded_file', timestamps: true })
+export class UploadedFileModel extends Model<UploadedFileModel> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @Column({
+    type: DataType.ENUM(...Object.keys(ImageType)),
+    allowNull: false,
+  })
+  public type: ImageType;
+
+  @Column({
+    type: DataType.STRING(1),
+    allowNull: false,
+  })
+  public symbol: string;
+
+  @ForeignKey(() => MessageModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public messageId: number;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: true,
+  })
+  public img: string;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: true,
+  })
+  public preview: string;
+
+      @Column({
+    type: DataType.STRING,
+    allowNull: true,
+  })
+  public absoluteUrl: string;
+
+    @Column({
+    type: DataType.STRING,
+    allowNull: true,
+  })
+  public webpAsboluteUrl: string;
+}
diff --git a/newback/src/data/database/model/user.joined.info.ts b/newback/src/data/database/model/user.joined.info.ts
new file mode 100644
index 000000000..d44433e6a
--- /dev/null
+++ b/newback/src/data/database/model/user.joined.info.ts
@@ -0,0 +1,61 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasOne,
+  Model,
+  Table,
+} from 'sequelize-typescript';
+import { Injectable } from '@nestjs/common';
+import {
+  Gender,
+  ThemeValues
+} from '@/data/types/dto/dto';
+import {UserModel} from '@/data/database/model/user.model';
+import {
+  LogLevel,
+  logLevels
+} from 'lines-logger'
+import {
+  ImageType,
+  UploadedFileChoices,
+  VerificationType
+} from '@/data/types/model/db';
+import {MessageModel} from '@/data/database/model/message.model';
+import {IpAddressModel} from '@/data/database/model/ip.address.model';
+
+@Injectable()
+@Table({ paranoid: true, tableName: 'user_joined_info', timestamps: true })
+export class UserJoinedInfo extends Model<UserJoinedInfo> {
+
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+    unique: true,
+    autoIncrement: true,
+    primaryKey: true,
+  })
+  public id: number;
+
+  @ForeignKey(() => IpAddressModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public ipId: number;
+
+  @ForeignKey(() => UserModel)
+  @Column({
+    type: DataType.INTEGER,
+    allowNull: false,
+  })
+  public userId: number;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: false,
+  })
+  public time: Date;
+
+}
diff --git a/newback/src/data/types/model/db.ts b/newback/src/data/types/model/db.ts
index fb21dfe9f..027d880d7 100644
--- a/newback/src/data/types/model/db.ts
+++ b/newback/src/data/types/model/db.ts
@@ -4,3 +4,18 @@ export enum VerificationType {
   EMAIL = 'EMAIL',
   CONFIRM_EMAIL = 'CONFIRM_EMAIL',
 }
+
+export enum ImageType {
+  VIDEO = 'v',
+  IMAGE = 'i',
+  GIPHY=  'g'
+}
+export enum  UploadedFileChoices {
+  VIDEO = 'V',
+  FILE = 'F',
+  MEDIA_RECORD= 'M',
+  AUDIO_RECORD = 'A',
+  IMAGE = 'I',
+  PREVIEW = 'P',
+  ISSUE = 'S'
+}

From ed10876b55a753d6181d0a17bbfb1a125bd6be51 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 10 Apr 2022 13:11:06 +0300
Subject: [PATCH 003/221] Added more classes

---
 newback/.sequelizerc                          |  7 ++
 newback/config/default.json                   |  3 +-
 newback/config/sequelize.cli.config.js        | 13 ++++
 newback/package.json                          |  1 +
 newback/sequelize-cli.config.js               | 13 ----
 newback/src/data/database/database.module.ts  | 57 +++++++++++++++++
 .../src/data/database/model/channel.model.ts  |  6 +-
 .../src/data/database/model/image.model.ts    | 21 ++----
 .../database/model/message.history.model.ts   |  7 +-
 ...ge.mention.ts => message.mention.model.ts} | 15 +----
 .../src/data/database/model/message.model.ts  | 15 +----
 newback/src/data/database/model/room.model.ts | 15 +----
 .../data/database/model/room.users.model.ts   | 22 +------
 .../model/subscription.message.model.ts       | 26 ++------
 .../data/database/model/subscription.model.ts | 21 ++----
 .../database/model/uploaded.file.model.ts     | 25 ++------
 .../data/database/model/user.auth.model.ts    | 14 +---
 ...ined.info.ts => user.joined.info.model.ts} | 22 +------
 newback/src/data/database/model/user.model.ts |  7 +-
 .../data/database/model/user.profile.model.ts | 14 +---
 .../database/model/user.settings.model.ts     | 10 +--
 .../data/database/model/verification.model.ts | 14 +---
 newback/src/data/database/ormconfig.ts        | 21 ++++++
 newback/yarn.lock                             | 64 ++++++++++++++++++-
 24 files changed, 208 insertions(+), 225 deletions(-)
 create mode 100644 newback/.sequelizerc
 create mode 100644 newback/config/sequelize.cli.config.js
 delete mode 100644 newback/sequelize-cli.config.js
 create mode 100644 newback/src/data/database/database.module.ts
 rename newback/src/data/database/model/{message.mention.ts => message.mention.model.ts} (77%)
 rename newback/src/data/database/model/{user.joined.info.ts => user.joined.info.model.ts} (60%)
 create mode 100644 newback/src/data/database/ormconfig.ts

diff --git a/newback/.sequelizerc b/newback/.sequelizerc
new file mode 100644
index 000000000..01f56f0aa
--- /dev/null
+++ b/newback/.sequelizerc
@@ -0,0 +1,7 @@
+const path = require('path');
+
+module.exports = {
+  'config': './config/sequelize.cli.config.js',
+  'models-path': path.resolve('src', 'data', 'database', 'model'),
+  'migrations-path': path.resolve('src', 'data',  'database', 'migration'),
+};
diff --git a/newback/config/default.json b/newback/config/default.json
index f38bc0ea5..aabafbc8c 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -38,12 +38,11 @@
   "mysql": {
     "synchronize": false,
     "logging": true,
-    "dialect": "mysql",
     "host": "localhost",
     "default-character-set": "utf8mb4",
     "port": 3306,
     "username": "pychat",
     "password": "pypass",
-    "database": "pychat"
+    "database": "pychat2"
   }
 }
diff --git a/newback/config/sequelize.cli.config.js b/newback/config/sequelize.cli.config.js
new file mode 100644
index 000000000..b9308f07c
--- /dev/null
+++ b/newback/config/sequelize.cli.config.js
@@ -0,0 +1,13 @@
+const { config: sequelizeCliConfig } = require('node-config-ts');
+
+console.log('as')
+// fucking sequelize-cli hack
+const conf = {
+  ...sequelizeCliConfig.mysql,
+  dialect: 'mysql'
+}
+module.exports = {
+
+  development: conf
+};
+
diff --git a/newback/package.json b/newback/package.json
index b92f6b19f..af404a547 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -37,6 +37,7 @@
     "csv-parse": "^5.0.4",
     "i": "^0.3.7",
     "lines-logger": "^2.1.2",
+    "mysql2": "^2.3.3",
     "node-config-ts": "npm:node-config-ts-2",
     "npm": "^8.6.0",
     "pg": "^8.7.3",
diff --git a/newback/sequelize-cli.config.js b/newback/sequelize-cli.config.js
deleted file mode 100644
index ef327c97f..000000000
--- a/newback/sequelize-cli.config.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const { config: sequelizeCliConfig } = require('node-config-ts');
-
-const { postgres } = sequelizeCliConfig.db;
-
-postgres.password = postgres.password.replace(/\n/g, '');
-
-// fucking sequelize-cli hack
-module.exports = {
-  local: postgres,
-  development: postgres,
-  staging: postgres,
-  production: postgres,
-};
diff --git a/newback/src/data/database/database.module.ts b/newback/src/data/database/database.module.ts
new file mode 100644
index 000000000..b8aa80a39
--- /dev/null
+++ b/newback/src/data/database/database.module.ts
@@ -0,0 +1,57 @@
+import { Module } from '@nestjs/common';
+import { SequelizeModule } from '@nestjs/sequelize';
+
+import ormconfig from '@/data/database/ormconfig';
+import {ChannelModel} from '@/data/database/model/channel.model';
+import {ImageModel} from '@/data/database/model/image.model';
+import {IpAddressModel} from '@/data/database/model/ip.address.model';
+import {MessageHistoryModel} from '@/data/database/model/message.history.model';
+import {MessageModel} from '@/data/database/model/message.model';
+import {RoomModel} from '@/data/database/model/room.model';
+import {RoomUsersModel} from '@/data/database/model/room.users.model';
+import {MessageMentionModel} from '@/data/database/model/message.mention.model';
+import {SubscriptionMessageModel} from '@/data/database/model/subscription.message.model';
+import {SubscriptionModel} from '@/data/database/model/subscription.model';
+import {UploadedFileModel} from '@/data/database/model/uploaded.file.model';
+import {UserAuthModel} from '@/data/database/model/user.auth.model';
+import {UserJoinedInfoModel} from '@/data/database/model/user.joined.info.model';
+import {UserModel} from '@/data/database/model/user.model';
+import {UserProfileModel} from '@/data/database/model/user.profile.model';
+import {UserSettingsModel} from '@/data/database/model/user.settings.model';
+import {VerificationModel} from '@/data/database/model/verification.model';
+
+const repositories = [
+
+];
+
+@Module({
+  imports: [
+    SequelizeModule.forRoot(ormconfig),
+    SequelizeModule.forFeature([
+     ChannelModel,
+      ImageModel,
+      IpAddressModel,
+      MessageHistoryModel,
+      MessageMentionModel,
+      MessageModel,
+      RoomModel,
+      RoomUsersModel,
+      SubscriptionMessageModel,
+      SubscriptionModel,
+      UploadedFileModel,
+      UserAuthModel,
+      UserJoinedInfoModel,
+      UserModel,
+      UserProfileModel,
+      UserSettingsModel,
+      VerificationModel,
+    ]),
+  ],
+  providers: [...repositories],
+  exports: [
+    SequelizeModule,
+    ...repositories,
+  ],
+})
+export class DatabaseModule {
+}
diff --git a/newback/src/data/database/model/channel.model.ts b/newback/src/data/database/model/channel.model.ts
index a0d1de5a5..cc7b84da2 100644
--- a/newback/src/data/database/model/channel.model.ts
+++ b/newback/src/data/database/model/channel.model.ts
@@ -1,18 +1,16 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
 
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'channel', timestamps: true })
+@Table({paranoid: true, tableName: 'channel', timestamps: true})
 export class ChannelModel extends Model<ChannelModel> {
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/image.model.ts b/newback/src/data/database/model/image.model.ts
index 02d0579c4..bfa73fbd1 100644
--- a/newback/src/data/database/model/image.model.ts
+++ b/newback/src/data/database/model/image.model.ts
@@ -1,30 +1,17 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
-import {
-  UploadedFileChoices,
-  VerificationType
-} from '@/data/types/model/db';
+import {UploadedFileChoices} from '@/data/types/model/db';
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'uploaded_file', timestamps: true })
-export class UploadedFileModel extends Model<UploadedFileModel> {
+@Table({paranoid: true, tableName: 'image', timestamps: true})
+export class ImageModel extends Model<ImageModel> {
 
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/message.history.model.ts b/newback/src/data/database/model/message.history.model.ts
index 1c5a8011c..dd5258fe8 100644
--- a/newback/src/data/database/model/message.history.model.ts
+++ b/newback/src/data/database/model/message.history.model.ts
@@ -1,20 +1,17 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
+import {Injectable} from '@nestjs/common';
 import {config} from 'node-config-ts';
 import {MessageModel} from '@/data/database/model/message.model';
 
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'message_history', timestamps: true })
+@Table({paranoid: true, tableName: 'message_history', timestamps: true})
 export class MessageHistoryModel extends Model<MessageHistoryModel> {
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/message.mention.ts b/newback/src/data/database/model/message.mention.model.ts
similarity index 77%
rename from newback/src/data/database/model/message.mention.ts
rename to newback/src/data/database/model/message.mention.model.ts
index fe580956d..00deedd31 100644
--- a/newback/src/data/database/model/message.mention.ts
+++ b/newback/src/data/database/model/message.mention.model.ts
@@ -1,31 +1,20 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
 
 @Injectable()
 @Table({
   paranoid: true,
   tableName: 'message_mention',
   timestamps: true,
-  co
 })
-export class MessageMention extends Model<MessageMention> {
+export class MessageMentionModel extends Model<MessageMentionModel> {
 
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/message.model.ts b/newback/src/data/database/model/message.model.ts
index 732f5c231..ecc11bfc6 100644
--- a/newback/src/data/database/model/message.model.ts
+++ b/newback/src/data/database/model/message.model.ts
@@ -1,27 +1,18 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  MessageStatus,
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
+import {MessageStatus,} from '@/data/types/dto/dto';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
 import {RoomModel} from '@/data/database/model/room.model';
 import {config} from 'node-config-ts';
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'message', timestamps: true })
+@Table({paranoid: true, tableName: 'message', timestamps: true})
 export class MessageModel extends Model<MessageModel> {
 
   @Column({
diff --git a/newback/src/data/database/model/room.model.ts b/newback/src/data/database/model/room.model.ts
index 0148a8aea..4fac30bfb 100644
--- a/newback/src/data/database/model/room.model.ts
+++ b/newback/src/data/database/model/room.model.ts
@@ -1,23 +1,12 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
-import {VerificationType} from '@/data/types/model/db';
 import {ChannelModel} from '@/data/database/model/channel.model';
 
 
@@ -36,7 +25,7 @@ import {ChannelModel} from '@/data/database/model/channel.model';
 // 	)
 // ]
 @Injectable()
-@Table({ paranoid: true, tableName: 'room', timestamps: true })
+@Table({paranoid: true, tableName: 'room', timestamps: true})
 export class RoomModel extends Model<RoomModel> {
 
   @Column({
diff --git a/newback/src/data/database/model/room.users.model.ts b/newback/src/data/database/model/room.users.model.ts
index 026d45da6..e66b3c681 100644
--- a/newback/src/data/database/model/room.users.model.ts
+++ b/newback/src/data/database/model/room.users.model.ts
@@ -1,33 +1,17 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
-import {
-  ImageType,
-  UploadedFileChoices,
-  VerificationType
-} from '@/data/types/model/db';
-import {MessageModel} from '@/data/database/model/message.model';
 import {RoomModel} from '@/data/database/model/room.model';
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'room_user', timestamps: true })
-export class UploadedFileModel extends Model<UploadedFileModel> {
+@Table({paranoid: true, tableName: 'room_user', timestamps: true})
+export class RoomUsersModel extends Model<RoomUsersModel> {
 
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/subscription.message.model.ts b/newback/src/data/database/model/subscription.message.model.ts
index 8069a9dc7..8acf3ea57 100644
--- a/newback/src/data/database/model/subscription.message.model.ts
+++ b/newback/src/data/database/model/subscription.message.model.ts
@@ -1,33 +1,17 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
-import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
-import {
-  ImageType,
-  UploadedFileChoices,
-  VerificationType
-} from '@/data/types/model/db';
+import {Injectable} from '@nestjs/common';
 import {MessageModel} from '@/data/database/model/message.model';
-import {RoomModel} from '@/data/database/model/room.model';
+import {SubscriptionModel} from '@/data/database/model/subscription.model';
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'room_user', timestamps: true })
-export class UploadedFileModel extends Model<UploadedFileModel> {
+@Table({paranoid: true, tableName: 'room_user', timestamps: true})
+export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
 
   @Column({
     type: DataType.INTEGER,
@@ -38,7 +22,7 @@ export class UploadedFileModel extends Model<UploadedFileModel> {
   })
   public id: number;
 
-  @ForeignKey(() => SubscritionModel)
+  @ForeignKey(() => SubscriptionModel)
   @Column({
     type: DataType.INTEGER,
     allowNull: false,
diff --git a/newback/src/data/database/model/subscription.model.ts b/newback/src/data/database/model/subscription.model.ts
index e0aa75604..7b573d86c 100644
--- a/newback/src/data/database/model/subscription.model.ts
+++ b/newback/src/data/database/model/subscription.model.ts
@@ -1,30 +1,17 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
-import {
-  UploadedFileChoices,
-  VerificationType
-} from '@/data/types/model/db';
+import {UploadedFileChoices} from '@/data/types/model/db';
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'subscription', timestamps: true })
-export class UploadedFileModel extends Model<UploadedFileModel> {
+@Table({paranoid: true, tableName: 'subscription', timestamps: true})
+export class SubscriptionModel extends Model<SubscriptionModel> {
 
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/uploaded.file.model.ts b/newback/src/data/database/model/uploaded.file.model.ts
index 39bce5114..7e95f0804 100644
--- a/newback/src/data/database/model/uploaded.file.model.ts
+++ b/newback/src/data/database/model/uploaded.file.model.ts
@@ -1,31 +1,16 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
-import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
-import {
-  ImageType,
-  UploadedFileChoices,
-  VerificationType
-} from '@/data/types/model/db';
+import {Injectable} from '@nestjs/common';
+import {ImageType} from '@/data/types/model/db';
 import {MessageModel} from '@/data/database/model/message.model';
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'uploaded_file', timestamps: true })
+@Table({paranoid: true, tableName: 'uploaded_file', timestamps: true})
 export class UploadedFileModel extends Model<UploadedFileModel> {
 
   @Column({
@@ -68,13 +53,13 @@ export class UploadedFileModel extends Model<UploadedFileModel> {
   })
   public preview: string;
 
-      @Column({
+  @Column({
     type: DataType.STRING,
     allowNull: true,
   })
   public absoluteUrl: string;
 
-    @Column({
+  @Column({
     type: DataType.STRING,
     allowNull: true,
   })
diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/database/model/user.auth.model.ts
index 17c04c984..0db046427 100644
--- a/newback/src/data/database/model/user.auth.model.ts
+++ b/newback/src/data/database/model/user.auth.model.ts
@@ -1,25 +1,15 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'user_auth', timestamps: true })
+@Table({paranoid: true, tableName: 'user_auth', timestamps: true})
 export class UserAuthModel extends Model<UserAuthModel> {
 
   @ForeignKey(() => UserModel)
diff --git a/newback/src/data/database/model/user.joined.info.ts b/newback/src/data/database/model/user.joined.info.model.ts
similarity index 60%
rename from newback/src/data/database/model/user.joined.info.ts
rename to newback/src/data/database/model/user.joined.info.model.ts
index d44433e6a..d0028e479 100644
--- a/newback/src/data/database/model/user.joined.info.ts
+++ b/newback/src/data/database/model/user.joined.info.model.ts
@@ -1,33 +1,17 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
-import {
-  ImageType,
-  UploadedFileChoices,
-  VerificationType
-} from '@/data/types/model/db';
-import {MessageModel} from '@/data/database/model/message.model';
 import {IpAddressModel} from '@/data/database/model/ip.address.model';
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'user_joined_info', timestamps: true })
-export class UserJoinedInfo extends Model<UserJoinedInfo> {
+@Table({paranoid: true, tableName: 'user_joined_info', timestamps: true})
+export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
 
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/user.model.ts b/newback/src/data/database/model/user.model.ts
index 4e97932db..4457a416a 100644
--- a/newback/src/data/database/model/user.model.ts
+++ b/newback/src/data/database/model/user.model.ts
@@ -1,19 +1,16 @@
 import {
-  BelongsTo,
   Column,
   DataType,
-  ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
+import {Injectable} from '@nestjs/common';
 import {Gender} from '@/data/types/dto/dto';
 import {config} from 'node-config-ts';
 
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'user', timestamps: true })
+@Table({paranoid: true, tableName: 'user', timestamps: true})
 export class UserModel extends Model<UserModel> {
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/user.profile.model.ts b/newback/src/data/database/model/user.profile.model.ts
index e53da66a8..1306dbde4 100644
--- a/newback/src/data/database/model/user.profile.model.ts
+++ b/newback/src/data/database/model/user.profile.model.ts
@@ -1,25 +1,15 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'user_profile', timestamps: true })
+@Table({paranoid: true, tableName: 'user_profile', timestamps: true})
 export class UserProfileModel extends Model<UserProfileModel> {
 
   @ForeignKey(() => UserModel)
diff --git a/newback/src/data/database/model/user.settings.model.ts b/newback/src/data/database/model/user.settings.model.ts
index ff82be7eb..fde40e6ad 100644
--- a/newback/src/data/database/model/user.settings.model.ts
+++ b/newback/src/data/database/model/user.settings.model.ts
@@ -1,16 +1,12 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Theme,
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
+import {Theme,} from '@/data/types/dto/dto';
 import {UserModel} from '@/data/database/model/user.model';
 import {
   LogLevel,
@@ -18,7 +14,7 @@ import {
 } from 'lines-logger'
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'user_settings', timestamps: true })
+@Table({paranoid: true, tableName: 'user_settings', timestamps: true})
 export class UserSettingsModel extends Model<UserSettingsModel> {
 
   @ForeignKey(() => UserModel)
diff --git a/newback/src/data/database/model/verification.model.ts b/newback/src/data/database/model/verification.model.ts
index c744c87b5..d2a126824 100644
--- a/newback/src/data/database/model/verification.model.ts
+++ b/newback/src/data/database/model/verification.model.ts
@@ -1,26 +1,16 @@
 import {
-  BelongsTo,
   Column,
   DataType,
   ForeignKey,
-  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
-import { Injectable } from '@nestjs/common';
-import {
-  Gender,
-  ThemeValues
-} from '@/data/types/dto/dto';
+import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {
-  LogLevel,
-  logLevels
-} from 'lines-logger'
 import {VerificationType} from '@/data/types/model/db';
 
 @Injectable()
-@Table({ paranoid: true, tableName: 'verification', timestamps: true })
+@Table({paranoid: true, tableName: 'verification', timestamps: true})
 export class VerificationModel extends Model<VerificationModel> {
 
   @Column({
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/data/database/ormconfig.ts
new file mode 100644
index 000000000..bf9a29233
--- /dev/null
+++ b/newback/src/data/database/ormconfig.ts
@@ -0,0 +1,21 @@
+import { ConsoleLogger } from '@nestjs/common';
+import { SequelizeModuleOptions } from '@nestjs/sequelize';
+import { config } from 'node-config-ts';
+
+const {
+  host, port, username, password, database, logging, synchronize,
+} = config.mysql;
+
+const logger = new ConsoleLogger('sql');
+export const ormconfig: SequelizeModuleOptions = {
+  synchronize,
+  logging: logging ? (sql: string): void => logger.log(sql, 'sql') : false,
+  dialect: 'mysql',
+  host,
+  port,
+  username,
+  password,
+  database,
+  autoLoadModels: true,
+};
+
diff --git a/newback/yarn.lock b/newback/yarn.lock
index c5d0166ae..b3fffa7d9 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -1589,6 +1589,11 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
+denque@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a"
+  integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ==
+
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -2218,6 +2223,13 @@ gauge@^4.0.0:
     strip-ansi "^6.0.1"
     wide-align "^1.1.5"
 
+generate-function@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
+  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
+  dependencies:
+    is-property "^1.0.2"
+
 generic-pool@3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
@@ -2429,7 +2441,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.6.2:
+iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -2692,6 +2704,11 @@ is-promise@^2.2.2:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
+is-property@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
+
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -3022,7 +3039,12 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-lru-cache@^4.1.5:
+long@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+
+lru-cache@^4.1.3, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -3030,6 +3052,13 @@ lru-cache@^4.1.5:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 lru-cache@^7.4.0, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.8.0.tgz#649aaeb294a56297b5cbc5d70f198dcc5ebe5747"
@@ -3310,6 +3339,27 @@ mute-stream@0.0.8, mute-stream@~0.0.4:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+mysql2@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0"
+  integrity sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA==
+  dependencies:
+    denque "^2.0.1"
+    generate-function "^2.3.1"
+    iconv-lite "^0.6.3"
+    long "^4.0.0"
+    lru-cache "^6.0.0"
+    named-placeholders "^1.1.2"
+    seq-queue "^0.0.5"
+    sqlstring "^2.3.2"
+
+named-placeholders@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8"
+  integrity sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==
+  dependencies:
+    lru-cache "^4.1.3"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -4303,6 +4353,11 @@ send@0.17.2:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
+seq-queue@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
+  integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=
+
 sequelize-cli@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.4.1.tgz#fb9fbbde733ae887970316a700d264fcf0683770"
@@ -4498,6 +4553,11 @@ split2@^4.1.0:
   resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809"
   integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==
 
+sqlstring@^2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
+  integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
+
 ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"

From 3db3d77b00b33dccbab71dec44e34f5a6277f973 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 10 Apr 2022 18:36:28 +0300
Subject: [PATCH 004/221] Fixed db

---
 common/dto.ts                                 | 34 +++++++++++---
 newback/config/default.json                   |  3 +-
 newback/package.json                          |  1 +
 newback/src/data/database/database.module.ts  |  2 +-
 .../src/data/database/model/channel.model.ts  |  2 +-
 .../src/data/database/model/image.model.ts    | 45 +++++++++++++++----
 .../data/database/model/ip.address.model.ts   |  6 +--
 .../database/model/message.history.model.ts   |  4 +-
 .../database/model/message.mention.model.ts   | 32 ++++++-------
 .../src/data/database/model/message.model.ts  | 10 ++++-
 newback/src/data/database/model/room.model.ts |  4 +-
 .../data/database/model/room.users.model.ts   |  7 ++-
 .../model/subscription.message.model.ts       | 20 ++++-----
 .../data/database/model/subscription.model.ts |  7 +--
 .../database/model/uploaded.file.model.ts     | 40 ++++++-----------
 .../data/database/model/user.auth.model.ts    |  2 +-
 .../database/model/user.joined.info.model.ts  |  7 ++-
 newback/src/data/database/model/user.model.ts |  7 +--
 .../data/database/model/user.profile.model.ts |  2 +-
 .../database/model/user.settings.model.ts     |  6 +--
 .../data/database/model/verification.model.ts |  7 ++-
 newback/src/data/database/ormconfig.ts        | 12 ++++-
 newback/src/data/types/model/db.ts            | 21 ---------
 newback/src/modules/app/app.module.ts         |  4 +-
 newback/src/modules/auth/interfaces.ts        |  2 +-
 newback/yarn.lock                             |  2 +-
 26 files changed, 165 insertions(+), 124 deletions(-)
 delete mode 100644 newback/src/data/types/model/db.ts

diff --git a/common/dto.ts b/common/dto.ts
index 64352c8f8..9a73b2bfa 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -3,6 +3,7 @@ export interface LoginRequest {
   password: string;
 }
 
+// ISO/IEC 5218 1 male, 2 - female
 export enum Gender {
   MALE = 'MALE',
   FEMALE = 'FEMALE',
@@ -10,12 +11,35 @@ export enum Gender {
 }
 
 export enum MessageStatus {
-  ON_SERVER = 'ON_SERVER',
+  ON_SERVER = 'ON_SERVER',  // uploaded to server
   READ = 'READ',
-  RECEIVED = 'RECEIVED', //received
+  RECEIVED = 'RECEIVED', //sent
 }
 export enum Theme {
-  COLOR_LOR = 'color-lor',
-  COLOR_REG = 'color-reg',
-  COLOR_WHITE = 'color-white'
+  COLOR_LOR = 'COLOR_LOR',
+  COLOR_REG = 'COLOR_REG',
+  COLOR_WHITE = 'COLOR_WHITE'
+}
+
+
+export enum VerificationType {
+  REGISTER = 'REGISTER',
+  PASSWORD = '  PASSWORD = \'p\',\n',
+  EMAIL = 'EMAIL',
+  CONFIRM_EMAIL = 'CONFIRM_EMAIL',
+}
+
+export enum ImageType {
+  VIDEO = 'VIDEO',
+  IMAGE = 'IMAGE',
+  GIPHY=  'GIPHY'
+}
+export enum  UploadedFileChoices {
+  VIDEO = 'VIDEO',
+  FILE = 'FILE',
+  MEDIA_RECORD= 'MEDIA_RECORD',
+  AUDIO_RECORD = 'AUDIO_RECORD',
+  IMAGE = 'IMAGE',
+  PREVIEW = 'PREVIEW',
+  ISSUE = 'ISSUE'
 }
diff --git a/newback/config/default.json b/newback/config/default.json
index aabafbc8c..d26f6a301 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -36,10 +36,9 @@
     }
   },
   "mysql": {
-    "synchronize": false,
+    "synchronize": true,
     "logging": true,
     "host": "localhost",
-    "default-character-set": "utf8mb4",
     "port": 3306,
     "username": "pychat",
     "password": "pypass",
diff --git a/newback/package.json b/newback/package.json
index af404a547..af61780d0 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -43,6 +43,7 @@
     "pg": "^8.7.3",
     "redis": "^4.0.6",
     "reflect-metadata": "^0.1.13",
+    "rxjs": "^7",
     "sequelize": "^6.18.0",
     "sequelize-typescript": "^2.1.3",
     "swagger-ui-express": "^4.3.0"
diff --git a/newback/src/data/database/database.module.ts b/newback/src/data/database/database.module.ts
index b8aa80a39..3be0c8857 100644
--- a/newback/src/data/database/database.module.ts
+++ b/newback/src/data/database/database.module.ts
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { SequelizeModule } from '@nestjs/sequelize';
 
-import ormconfig from '@/data/database/ormconfig';
+import {ormconfig } from '@/data/database/ormconfig';
 import {ChannelModel} from '@/data/database/model/channel.model';
 import {ImageModel} from '@/data/database/model/image.model';
 import {IpAddressModel} from '@/data/database/model/ip.address.model';
diff --git a/newback/src/data/database/model/channel.model.ts b/newback/src/data/database/model/channel.model.ts
index cc7b84da2..a7738fd3d 100644
--- a/newback/src/data/database/model/channel.model.ts
+++ b/newback/src/data/database/model/channel.model.ts
@@ -10,7 +10,7 @@ import {UserModel} from '@/data/database/model/user.model';
 
 
 @Injectable()
-@Table({paranoid: true, tableName: 'channel', timestamps: true})
+@Table({tableName: 'channel'})
 export class ChannelModel extends Model<ChannelModel> {
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/image.model.ts b/newback/src/data/database/model/image.model.ts
index bfa73fbd1..c76e2751b 100644
--- a/newback/src/data/database/model/image.model.ts
+++ b/newback/src/data/database/model/image.model.ts
@@ -4,15 +4,24 @@ import {
   ForeignKey,
   Model,
   Table,
+  Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {UploadedFileChoices} from '@/data/types/model/db';
+import {
+  ImageType,
+  UploadedFileChoices
+} from '@/data/types/dto/dto';
+import {MessageModel} from '@/data/database/model/message.model';
+
+const uniqueUserIdSymbMess = 'unique_image_symbol_message';
+
 
 @Injectable()
-@Table({paranoid: true, tableName: 'image', timestamps: true})
+@Table({ tableName: 'image'})
 export class ImageModel extends Model<ImageModel> {
 
+
   @Column({
     type: DataType.INTEGER,
     allowNull: false,
@@ -23,27 +32,47 @@ export class ImageModel extends Model<ImageModel> {
   public id: number;
 
   @Column({
-    type: DataType.ENUM(...Object.keys(UploadedFileChoices)),
+    type: DataType.ENUM(...Object.keys(ImageType)),
     allowNull: false,
   })
-  public type: UploadedFileChoices;
+  public type: ImageType;
 
+  @Unique(uniqueUserIdSymbMess)
   @Column({
     type: DataType.STRING(1),
     allowNull: false,
   })
   public symbol: string;
 
-  @ForeignKey(() => UserModel)
+  @Unique(uniqueUserIdSymbMess)
+  @ForeignKey(() => MessageModel)
   @Column({
     type: DataType.INTEGER,
     allowNull: false,
   })
-  public userId: number;
+  public messageId: number;
 
   @Column({
     type: DataType.STRING,
-    allowNull: false,
+    allowNull: true,
+  })
+  public img: string;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: true,
+  })
+  public preview: string;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: true,
+  })
+  public absoluteUrl: string;
+
+  @Column({
+    type: DataType.STRING,
+    allowNull: true,
   })
-  public file: string;
+  public webpAsboluteUrl: string;
 }
diff --git a/newback/src/data/database/model/ip.address.model.ts b/newback/src/data/database/model/ip.address.model.ts
index 5996a783d..75297b8eb 100644
--- a/newback/src/data/database/model/ip.address.model.ts
+++ b/newback/src/data/database/model/ip.address.model.ts
@@ -7,7 +7,7 @@ import {
 import {Injectable} from '@nestjs/common';
 
 @Injectable()
-@Table({paranoid: true, tableName: 'ip_address', timestamps: true})
+@Table({tableName: 'ip_address'})
 export class IpAddressModel extends Model<IpAddressModel> {
 
   @Column({
@@ -57,12 +57,12 @@ export class IpAddressModel extends Model<IpAddressModel> {
   public city: string;
 
   @Column({
-    type: DataType.FLOAT,
+    type: DataType.DOUBLE,
     allowNull: true,
   })
   public lat: number;
   @Column({
-    type: DataType.FLOAT,
+    type: DataType.DOUBLE,
     allowNull: true,
   })
   public lon: number;
diff --git a/newback/src/data/database/model/message.history.model.ts b/newback/src/data/database/model/message.history.model.ts
index dd5258fe8..480fadf30 100644
--- a/newback/src/data/database/model/message.history.model.ts
+++ b/newback/src/data/database/model/message.history.model.ts
@@ -11,7 +11,7 @@ import {MessageModel} from '@/data/database/model/message.model';
 
 
 @Injectable()
-@Table({paranoid: true, tableName: 'message_history', timestamps: true})
+@Table({tableName: 'message_history'})
 export class MessageHistoryModel extends Model<MessageHistoryModel> {
   @Column({
     type: DataType.INTEGER,
@@ -37,7 +37,7 @@ export class MessageHistoryModel extends Model<MessageHistoryModel> {
   public time: Date;
 
   @Column({
-    type: DataType.STRING(config.frontend.maxMessageSize),
+    type: DataType.TEXT('long'),
     allowNull: false,
   })
   public content: string;
diff --git a/newback/src/data/database/model/message.mention.model.ts b/newback/src/data/database/model/message.mention.model.ts
index 00deedd31..856ae7ad0 100644
--- a/newback/src/data/database/model/message.mention.model.ts
+++ b/newback/src/data/database/model/message.mention.model.ts
@@ -4,15 +4,17 @@ import {
   ForeignKey,
   Model,
   Table,
+  Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
+import {MessageModel} from '@/data/database/model/message.model';
+
+const uniqueUserIdSymbMess = 'unique_message_mention_user_id_symbol_message_id';
 
 @Injectable()
 @Table({
-  paranoid: true,
   tableName: 'message_mention',
-  timestamps: true,
 })
 export class MessageMentionModel extends Model<MessageMentionModel> {
 
@@ -25,33 +27,25 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
   public id: number;
 
   @ForeignKey(() => UserModel)
+  @Unique(uniqueUserIdSymbMess)
   @Column({
     type: DataType.INTEGER,
     allowNull: false
   })
   public userId: string;
 
+  @ForeignKey(() => MessageModel)
+  @Unique(uniqueUserIdSymbMess)
   @Column({
-    type: DataType.STRING(1),
+    type: DataType.INTEGER,
     allowNull: false
   })
-  public symbol: string;
-
-  @Column({
-    type: DataType.STRING(30),
-    allowNull: true
-  })
-  public surname: string;
+  public messageId: string;
 
+  @Unique(uniqueUserIdSymbMess)
   @Column({
-    type: DataType.DATE,
-    allowNull: false,
-  })
-  public birthday: Date;
-
-  @Column({
-    type: DataType.STRING(100),
-    allowNull: true
+    type: DataType.STRING(1),
+    allowNull: false
   })
-  public contacts: string;
+  public symbol: string;
 }
diff --git a/newback/src/data/database/model/message.model.ts b/newback/src/data/database/model/message.model.ts
index ecc11bfc6..45b4c611d 100644
--- a/newback/src/data/database/model/message.model.ts
+++ b/newback/src/data/database/model/message.model.ts
@@ -12,7 +12,7 @@ import {RoomModel} from '@/data/database/model/room.model';
 import {config} from 'node-config-ts';
 
 @Injectable()
-@Table({paranoid: true, tableName: 'message', timestamps: true})
+@Table({ tableName: 'message'})
 export class MessageModel extends Model<MessageModel> {
 
   @Column({
@@ -46,11 +46,17 @@ export class MessageModel extends Model<MessageModel> {
   public time: Date;
 
   @Column({
-    type: DataType.STRING(config.frontend.maxMessageSize),
+    type: DataType.TEXT('long'),
     allowNull: true,
   })
   public content: string;
 
+  @Column({
+    type: DataType.STRING(255),
+    allowNull: true,
+  })
+  public giphy: string;
+
   @Column({
     type: DataType.STRING(1),
     allowNull: true,
diff --git a/newback/src/data/database/model/room.model.ts b/newback/src/data/database/model/room.model.ts
index 4fac30bfb..3d7b78767 100644
--- a/newback/src/data/database/model/room.model.ts
+++ b/newback/src/data/database/model/room.model.ts
@@ -25,7 +25,7 @@ import {ChannelModel} from '@/data/database/model/channel.model';
 // 	)
 // ]
 @Injectable()
-@Table({paranoid: true, tableName: 'room', timestamps: true})
+@Table({ tableName: 'room'})
 export class RoomModel extends Model<RoomModel> {
 
   @Column({
@@ -40,7 +40,7 @@ export class RoomModel extends Model<RoomModel> {
 
   @Column({
     type: DataType.STRING(16),
-    allowNull: false,
+    allowNull: true,
   })
   public name: string;
 
diff --git a/newback/src/data/database/model/room.users.model.ts b/newback/src/data/database/model/room.users.model.ts
index e66b3c681..b8291ae33 100644
--- a/newback/src/data/database/model/room.users.model.ts
+++ b/newback/src/data/database/model/room.users.model.ts
@@ -4,13 +4,16 @@ import {
   ForeignKey,
   Model,
   Table,
+  Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
 import {RoomModel} from '@/data/database/model/room.model';
 
+const uniqueRoomUser = 'unique_room_user_room_id_user_id';
+
 @Injectable()
-@Table({paranoid: true, tableName: 'room_user', timestamps: true})
+@Table({tableName: 'room_user'})
 export class RoomUsersModel extends Model<RoomUsersModel> {
 
   @Column({
@@ -22,6 +25,7 @@ export class RoomUsersModel extends Model<RoomUsersModel> {
   })
   public id: number;
 
+  @Unique(uniqueRoomUser)
   @ForeignKey(() => RoomModel)
   @Column({
     type: DataType.INTEGER,
@@ -29,6 +33,7 @@ export class RoomUsersModel extends Model<RoomUsersModel> {
   })
   public roomId: number;
 
+  @Unique(uniqueRoomUser)
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/subscription.message.model.ts b/newback/src/data/database/model/subscription.message.model.ts
index 8acf3ea57..2593fc8f1 100644
--- a/newback/src/data/database/model/subscription.message.model.ts
+++ b/newback/src/data/database/model/subscription.message.model.ts
@@ -4,13 +4,16 @@ import {
   ForeignKey,
   Model,
   Table,
+  Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {MessageModel} from '@/data/database/model/message.model';
 import {SubscriptionModel} from '@/data/database/model/subscription.model';
 
+const uniqueSubscriptionMessage = 'unique_subscription_message_subscription_id_message_id';
+
 @Injectable()
-@Table({paranoid: true, tableName: 'room_user', timestamps: true})
+@Table({tableName: 'subscription_message'})
 export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
 
   @Column({
@@ -22,6 +25,7 @@ export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
   })
   public id: number;
 
+  @Unique(uniqueSubscriptionMessage)
   @ForeignKey(() => SubscriptionModel)
   @Column({
     type: DataType.INTEGER,
@@ -29,6 +33,7 @@ export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
   })
   public subscriptionId: number;
 
+  @Unique(uniqueSubscriptionMessage)
   @ForeignKey(() => MessageModel)
   @Column({
     type: DataType.INTEGER,
@@ -36,19 +41,12 @@ export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
   })
   public messageId: number;
 
-  @Column({
-    type: DataType.INTEGER,
-    defaultValue: 2,
-    allowNull: false,
-  })
-  public volume: number;
-
-
   @Column({
     type: DataType.BOOLEAN,
-    defaultValue: true,
+    defaultValue: false,
     allowNull: false,
   })
-  public notifications: boolean;
+  public received: boolean;
+
 
 }
diff --git a/newback/src/data/database/model/subscription.model.ts b/newback/src/data/database/model/subscription.model.ts
index 7b573d86c..7de1ff53d 100644
--- a/newback/src/data/database/model/subscription.model.ts
+++ b/newback/src/data/database/model/subscription.model.ts
@@ -7,10 +7,11 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {UploadedFileChoices} from '@/data/types/model/db';
+import {UploadedFileChoices} from '@/data/types/dto/dto';
+import {IpAddressModel} from '@/data/database/model/ip.address.model';
 
 @Injectable()
-@Table({paranoid: true, tableName: 'subscription', timestamps: true})
+@Table({tableName: 'subscription'})
 export class SubscriptionModel extends Model<SubscriptionModel> {
 
   @Column({
@@ -50,7 +51,7 @@ export class SubscriptionModel extends Model<SubscriptionModel> {
   })
   public isMobile: boolean;
 
-  @ForeignKey(() => IpAdressModel)
+  @ForeignKey(() => IpAddressModel)
   @Column({
     type: DataType.INTEGER,
     allowNull: true,
diff --git a/newback/src/data/database/model/uploaded.file.model.ts b/newback/src/data/database/model/uploaded.file.model.ts
index 7e95f0804..7f042f716 100644
--- a/newback/src/data/database/model/uploaded.file.model.ts
+++ b/newback/src/data/database/model/uploaded.file.model.ts
@@ -4,15 +4,21 @@ import {
   ForeignKey,
   Model,
   Table,
+  Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {ImageType} from '@/data/types/model/db';
+import {
+  ImageType,
+  UploadedFileChoices
+} from '@/data/types/dto/dto';
 import {MessageModel} from '@/data/database/model/message.model';
+import {UserModel} from '@/data/database/model/user.model';
 
 @Injectable()
-@Table({paranoid: true, tableName: 'uploaded_file', timestamps: true})
+@Table({tableName: 'uploaded_file'})
 export class UploadedFileModel extends Model<UploadedFileModel> {
 
+
   @Column({
     type: DataType.INTEGER,
     allowNull: false,
@@ -23,10 +29,10 @@ export class UploadedFileModel extends Model<UploadedFileModel> {
   public id: number;
 
   @Column({
-    type: DataType.ENUM(...Object.keys(ImageType)),
+    type: DataType.ENUM(...Object.keys(UploadedFileChoices)),
     allowNull: false,
   })
-  public type: ImageType;
+  public type: UploadedFileChoices;
 
   @Column({
     type: DataType.STRING(1),
@@ -34,34 +40,16 @@ export class UploadedFileModel extends Model<UploadedFileModel> {
   })
   public symbol: string;
 
-  @ForeignKey(() => MessageModel)
+  @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
     allowNull: false,
   })
-  public messageId: number;
-
-  @Column({
-    type: DataType.STRING,
-    allowNull: true,
-  })
-  public img: string;
+  public userId: number;
 
   @Column({
     type: DataType.STRING,
-    allowNull: true,
-  })
-  public preview: string;
-
-  @Column({
-    type: DataType.STRING,
-    allowNull: true,
-  })
-  public absoluteUrl: string;
-
-  @Column({
-    type: DataType.STRING,
-    allowNull: true,
+    allowNull: false,
   })
-  public webpAsboluteUrl: string;
+  public file: string;
 }
diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/database/model/user.auth.model.ts
index 0db046427..bd581bd0d 100644
--- a/newback/src/data/database/model/user.auth.model.ts
+++ b/newback/src/data/database/model/user.auth.model.ts
@@ -9,7 +9,7 @@ import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
 
 @Injectable()
-@Table({paranoid: true, tableName: 'user_auth', timestamps: true})
+@Table({ tableName: 'user_auth'})
 export class UserAuthModel extends Model<UserAuthModel> {
 
   @ForeignKey(() => UserModel)
diff --git a/newback/src/data/database/model/user.joined.info.model.ts b/newback/src/data/database/model/user.joined.info.model.ts
index d0028e479..0620f1b71 100644
--- a/newback/src/data/database/model/user.joined.info.model.ts
+++ b/newback/src/data/database/model/user.joined.info.model.ts
@@ -4,13 +4,16 @@ import {
   ForeignKey,
   Model,
   Table,
+  Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
 import {IpAddressModel} from '@/data/database/model/ip.address.model';
 
+const uniqueUserJoinedInfoUserIdIpId = 'unique_user_joined_info_user_id_ip_id';
+
 @Injectable()
-@Table({paranoid: true, tableName: 'user_joined_info', timestamps: true})
+@Table({tableName: 'user_joined_info'})
 export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
 
   @Column({
@@ -22,6 +25,7 @@ export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
   })
   public id: number;
 
+  @Unique(uniqueUserJoinedInfoUserIdIpId)
   @ForeignKey(() => IpAddressModel)
   @Column({
     type: DataType.INTEGER,
@@ -29,6 +33,7 @@ export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
   })
   public ipId: number;
 
+  @Unique(uniqueUserJoinedInfoUserIdIpId)
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/database/model/user.model.ts b/newback/src/data/database/model/user.model.ts
index 4457a416a..d041810dd 100644
--- a/newback/src/data/database/model/user.model.ts
+++ b/newback/src/data/database/model/user.model.ts
@@ -10,7 +10,7 @@ import {config} from 'node-config-ts';
 
 
 @Injectable()
-@Table({paranoid: true, tableName: 'user', timestamps: true})
+@Table({tableName: 'user'})
 export class UserModel extends Model<UserModel> {
   @Column({
     type: DataType.INTEGER,
@@ -25,7 +25,7 @@ export class UserModel extends Model<UserModel> {
     type: DataType.DATE,
     allowNull: false,
   })
-  public lastLogin: Date;
+  public lastTimeOnline: Date;
 
   @Column({
     allowNull: false,
@@ -37,12 +37,13 @@ export class UserModel extends Model<UserModel> {
   @Column({
     type: DataType.ENUM(...Object.keys(Gender)),
     allowNull: false,
-    defaultValue: Gender.OTHER,
+    defaultValue: Gender.OTHER.valueOf(),
   })
   public sex: Gender;
 
   @Column({
     allowNull: true,
+    type: DataType.STRING(100),
     defaultValue: null,
   })
   public thumbnail: string;
diff --git a/newback/src/data/database/model/user.profile.model.ts b/newback/src/data/database/model/user.profile.model.ts
index 1306dbde4..7a2d94015 100644
--- a/newback/src/data/database/model/user.profile.model.ts
+++ b/newback/src/data/database/model/user.profile.model.ts
@@ -9,7 +9,7 @@ import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
 
 @Injectable()
-@Table({paranoid: true, tableName: 'user_profile', timestamps: true})
+@Table({ tableName: 'user_profile'})
 export class UserProfileModel extends Model<UserProfileModel> {
 
   @ForeignKey(() => UserModel)
diff --git a/newback/src/data/database/model/user.settings.model.ts b/newback/src/data/database/model/user.settings.model.ts
index fde40e6ad..3a25884e5 100644
--- a/newback/src/data/database/model/user.settings.model.ts
+++ b/newback/src/data/database/model/user.settings.model.ts
@@ -14,7 +14,7 @@ import {
 } from 'lines-logger'
 
 @Injectable()
-@Table({paranoid: true, tableName: 'user_settings', timestamps: true})
+@Table({ tableName: 'user_settings'})
 export class UserSettingsModel extends Model<UserSettingsModel> {
 
   @ForeignKey(() => UserModel)
@@ -85,7 +85,7 @@ export class UserSettingsModel extends Model<UserSettingsModel> {
   @Column({
     type: DataType.ENUM(...Object.keys(Theme)),
     allowNull: false,
-    defaultValue: true,
+    defaultValue: Theme.COLOR_REG.valueOf(),
   })
-  public theme: boolean;
+  public theme: Theme;
 }
diff --git a/newback/src/data/database/model/verification.model.ts b/newback/src/data/database/model/verification.model.ts
index d2a126824..a17201aff 100644
--- a/newback/src/data/database/model/verification.model.ts
+++ b/newback/src/data/database/model/verification.model.ts
@@ -7,10 +7,10 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {VerificationType} from '@/data/types/model/db';
+import {VerificationType} from '@/data/types/dto/dto';
 
 @Injectable()
-@Table({paranoid: true, tableName: 'verification', timestamps: true})
+@Table({ tableName: 'verification'})
 export class VerificationModel extends Model<VerificationModel> {
 
   @Column({
@@ -52,13 +52,12 @@ export class VerificationModel extends Model<VerificationModel> {
     allowNull: false,
     defaultValue: false,
   })
-  public verified: Date;
+  public verified: boolean;
 
   @Column({
     type: DataType.STRING(190),
     allowNull: true,
     unique: false,
-    defaultValue: false,
   })
   public email: string;
 }
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/data/database/ormconfig.ts
index bf9a29233..487e42019 100644
--- a/newback/src/data/database/ormconfig.ts
+++ b/newback/src/data/database/ormconfig.ts
@@ -9,7 +9,10 @@ const {
 const logger = new ConsoleLogger('sql');
 export const ormconfig: SequelizeModuleOptions = {
   synchronize,
-  logging: logging ? (sql: string): void => logger.log(sql, 'sql') : false,
+  sync: {
+    force: true,
+  },
+  logging: logging ? (sql: string): void => logger.debug(sql) : false,
   dialect: 'mysql',
   host,
   port,
@@ -17,5 +20,12 @@ export const ormconfig: SequelizeModuleOptions = {
   password,
   database,
   autoLoadModels: true,
+  define: {
+    charset: 'utf8mb4',
+    paranoid: true,
+    timestamps: true,
+   freezeTableName: true,
+    underscored: true,
+  }
 };
 
diff --git a/newback/src/data/types/model/db.ts b/newback/src/data/types/model/db.ts
deleted file mode 100644
index 027d880d7..000000000
--- a/newback/src/data/types/model/db.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export enum VerificationType {
-  REGISTER = 'REGISTER',
-  PASSWORD = 'PASSWORD',
-  EMAIL = 'EMAIL',
-  CONFIRM_EMAIL = 'CONFIRM_EMAIL',
-}
-
-export enum ImageType {
-  VIDEO = 'v',
-  IMAGE = 'i',
-  GIPHY=  'g'
-}
-export enum  UploadedFileChoices {
-  VIDEO = 'V',
-  FILE = 'F',
-  MEDIA_RECORD= 'M',
-  AUDIO_RECORD = 'A',
-  IMAGE = 'I',
-  PREVIEW = 'P',
-  ISSUE = 'S'
-}
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index e3ecbd4f7..d16cddd31 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -2,8 +2,10 @@ import {
   Module
 } from '@nestjs/common';
 import {AuthModule} from '@/modules/auth/auth.module';
+import {DatabaseModule} from '@/data/database/database.module';
 
 @Module({
-  imports: [AuthModule],
+  imports: [AuthModule, DatabaseModule],
+  exports: [DatabaseModule]
 })
 export class AppModule {}
diff --git a/newback/src/modules/auth/interfaces.ts b/newback/src/modules/auth/interfaces.ts
index 074e4b59b..c57790ebf 100644
--- a/newback/src/modules/auth/interfaces.ts
+++ b/newback/src/modules/auth/interfaces.ts
@@ -3,7 +3,7 @@ import {
   Length,
   Matches,
 } from 'class-validator';
-import {LoginRequest} from '@/types/frontend/dto';
+import {LoginRequest} from '@/data/types/dto/dto';
 import {config} from 'node-config-ts';
 
 export default class LoginRequestValidator implements LoginRequest {
diff --git a/newback/yarn.lock b/newback/yarn.lock
index b3fffa7d9..830a06fed 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -4291,7 +4291,7 @@ rxjs@6.6.7, rxjs@^6.6.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.2.0:
+rxjs@^7, rxjs@^7.2.0:
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
   integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==

From c13df0203058dc56820723d3de77309a589604d1 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 10 Apr 2022 19:35:20 +0300
Subject: [PATCH 005/221] Fix

---
 newback/config/default.json            |   6 +-
 newback/config/sequelize.cli.config.js |   9 +-
 newback/package.json                   |   2 +
 newback/src/data/database/ormconfig.ts |  54 ++++---
 newback/yarn.lock                      | 200 +++++++++++++++++++++++--
 5 files changed, 223 insertions(+), 48 deletions(-)

diff --git a/newback/config/default.json b/newback/config/default.json
index d26f6a301..8f309b304 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -3,7 +3,7 @@
   "application": {
     "env": "default",
     "port": 8889,
-    "logLevel": "log",
+    "logLevel": "debug",
     "logOutput": "text",
     "crtPath": "../frontend/build/certs/server.crt.pem",
     "keyPath": "../frontend/build/certs/private.key.pem"
@@ -20,7 +20,7 @@
     "clientNoServerPingCloseTimeout": 320000
   },
   "redis": {
-    "host": "localhos",
+    "host": "localhost",
     "port": 6379,
     "database": 0
   },
@@ -36,7 +36,7 @@
     }
   },
   "mysql": {
-    "synchronize": true,
+    "synchronize": false,
     "logging": true,
     "host": "localhost",
     "port": 3306,
diff --git a/newback/config/sequelize.cli.config.js b/newback/config/sequelize.cli.config.js
index b9308f07c..388895c46 100644
--- a/newback/config/sequelize.cli.config.js
+++ b/newback/config/sequelize.cli.config.js
@@ -1,13 +1,8 @@
-const { config: sequelizeCliConfig } = require('node-config-ts');
+const {generateConfig} = require('../src/data/database/ormconfig');
 
-console.log('as')
 // fucking sequelize-cli hack
-const conf = {
-  ...sequelizeCliConfig.mysql,
-  dialect: 'mysql'
-}
+const conf = generateConfig((sql) => console.log(sql));
 module.exports = {
-
   development: conf
 };
 
diff --git a/newback/package.json b/newback/package.json
index af61780d0..a39682806 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -5,6 +5,7 @@
   "repository": "https://github.com/akoidan/pychat",
   "license": "MIT",
   "scripts": {
+    "makemigrations": " ./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/makemigration",
     "generate-configs": "node-config-ts",
     "prebuild": "rimraf dist",
     "build": "nest build",
@@ -45,6 +46,7 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7",
     "sequelize": "^6.18.0",
+    "sequelize-auto-migrations": "^1.0.3",
     "sequelize-typescript": "^2.1.3",
     "swagger-ui-express": "^4.3.0"
   },
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/data/database/ormconfig.ts
index 487e42019..251556b7b 100644
--- a/newback/src/data/database/ormconfig.ts
+++ b/newback/src/data/database/ormconfig.ts
@@ -1,31 +1,29 @@
-import { ConsoleLogger } from '@nestjs/common';
-import { SequelizeModuleOptions } from '@nestjs/sequelize';
-import { config } from 'node-config-ts';
+import type {SequelizeModuleOptions} from '@nestjs/sequelize';
+import {config} from 'node-config-ts';
 
-const {
-  host, port, username, password, database, logging, synchronize,
-} = config.mysql;
 
-const logger = new ConsoleLogger('sql');
-export const ormconfig: SequelizeModuleOptions = {
-  synchronize,
-  sync: {
-    force: true,
-  },
-  logging: logging ? (sql: string): void => logger.debug(sql) : false,
-  dialect: 'mysql',
-  host,
-  port,
-  username,
-  password,
-  database,
-  autoLoadModels: true,
-  define: {
-    charset: 'utf8mb4',
-    paranoid: true,
-    timestamps: true,
-   freezeTableName: true,
-    underscored: true,
-  }
-};
+export function generateConfig(logging: ((sql: string) => void)): SequelizeModuleOptions {
+  return {
+    synchronize: config.mysql.synchronize,
+    sync: {
+      force: true,
+    },
+    logging: config.mysql.logging ? logging : false,
+    dialect: 'mysql',
+    host: config.mysql.host,
+    port: config.mysql.port,
+    username: config.mysql.username,
+    password: config.mysql.password,
+    database: config.mysql.database,
+    autoLoadModels: true,
+    define: {
+      collate: 'utf8mb4_general_ci',
+      charset: 'utf8mb4',
+      paranoid: true,
+      timestamps: true,
+      freezeTableName: true,
+      underscored: true,
+    }
+  };
+}
 
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 830a06fed..b96bfc4be 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -541,6 +541,16 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/geojson@^1.0.0":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-1.0.6.tgz#3e02972728c69248c2af08d60a48cbb8680fffdf"
+  integrity sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==
+
+"@types/geojson@^7946.0.0 || ^1.0.0":
+  version "7946.0.8"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
+  integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
+
 "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -1001,6 +1011,11 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+array-back@^3.0.1, array-back@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
+  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -1027,6 +1042,13 @@ asap@^2.0.0:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
+async@^2.5.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -1075,7 +1097,7 @@ bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bluebird@^3.7.2:
+bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -1366,6 +1388,14 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
+cls-bluebird@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee"
+  integrity sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4=
+  dependencies:
+    is-bluebird "^1.0.2"
+    shimmer "^1.1.0"
+
 cluster-key-slot@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
@@ -1420,6 +1450,16 @@ columnify@^1.6.0:
     strip-ansi "^6.0.1"
     wcwidth "^1.0.0"
 
+command-line-args@^5.0.2:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
+  integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==
+  dependencies:
+    array-back "^3.1.0"
+    find-replace "^3.0.0"
+    lodash.camelcase "^4.3.0"
+    typical "^4.0.0"
+
 commander@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
@@ -1450,7 +1490,7 @@ concat-stream@^1.5.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-config-chain@^1.1.12:
+config-chain@^1.1.12, config-chain@^1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
   integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
@@ -1541,7 +1581,7 @@ d@1, d@^1.0.1:
     es5-ext "^0.10.50"
     type "^1.0.1"
 
-debug@2.6.9:
+debug@2.6.9, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -1555,11 +1595,23 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
   dependencies:
     ms "2.1.2"
 
+debug@^3.1.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
+deep-diff@^0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
+  integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
+
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -1599,7 +1651,7 @@ depd@2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-depd@^1.1.2, depd@~1.1.2:
+depd@^1.1.0, depd@^1.1.2, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
@@ -1654,7 +1706,7 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dottie@^2.0.2:
+dottie@^2.0.0, dottie@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154"
   integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==
@@ -2113,6 +2165,13 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
+find-replace@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
+  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
+  dependencies:
+    array-back "^3.0.1"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -2230,6 +2289,11 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
+generic-pool@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.5.0.tgz#acac4fd743a175ff20574f380910036464cb61f7"
+  integrity sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w==
+
 generic-pool@3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
@@ -2488,6 +2552,11 @@ infer-owner@^1.0.4:
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
+inflection@1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
+
 inflection@^1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.2.tgz#15e8c797c6c3dadf31aa658f8df8a4ea024798b0"
@@ -2621,6 +2690,11 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
+is-bluebird@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2"
+  integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI=
+
 is-boolean-object@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
@@ -2794,6 +2868,16 @@ js-beautify@^1.14.0:
     glob "^7.1.3"
     nopt "^5.0.0"
 
+js-beautify@^1.8.9:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.3.tgz#3dd11c949178de7f3bdf3f6f752778d3bed95150"
+  integrity sha512-f1ra8PHtOEu/70EBnmiUlV8nJePS58y9qKjl4JHfYWlFH6bo7ogZBz//FAZp7jDuXtYnGYKymZPlrg2I/9Zo4g==
+  dependencies:
+    config-chain "^1.1.13"
+    editorconfig "^0.15.3"
+    glob "^7.1.3"
+    nopt "^5.0.0"
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -3021,12 +3105,17 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@4.17.21, lodash@^4.17.19, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -3293,14 +3382,14 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment-timezone@^0.5.34:
+moment-timezone@^0.5.14, moment-timezone@^0.5.34:
   version "0.5.34"
   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c"
   integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==
   dependencies:
     moment ">= 2.9.0"
 
-"moment@>= 2.9.0", moment@^2.29.1:
+"moment@>= 2.9.0", moment@^2.20.0, moment@^2.29.1:
   version "2.29.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
   integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
@@ -3315,7 +3404,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.2:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -3640,6 +3729,11 @@ object-hash@3.0.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
+object-hash@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
+  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
+
 object-inspect@^1.12.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
@@ -4250,6 +4344,14 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
+retry-as-promised@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-2.3.2.tgz#cd974ee4fd9b5fe03cbf31871ee48221c07737b7"
+  integrity sha1-zZdO5P2bX+A8vzGHHuSCIcB3N7c=
+  dependencies:
+    bluebird "^3.4.6"
+    debug "^2.6.9"
+
 retry-as-promised@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-5.0.0.tgz#f4ecc25133603a2d2a7aff4a128691d7bc506d54"
@@ -4322,7 +4424,7 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-semver@^5.6.0:
+semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -4358,6 +4460,19 @@ seq-queue@^0.0.5:
   resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
   integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=
 
+sequelize-auto-migrations@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sequelize-auto-migrations/-/sequelize-auto-migrations-1.0.3.tgz#558a370265c533d8c92f5156f813c5a9b21a09ab"
+  integrity sha512-CTh8073gqrthit5xl/ls2lKPzUHzRP/GCY8z99+dlu27oOSmSiFv+NcNHJjmfZvLBSzfif8Nwp3FNtph09Gxew==
+  dependencies:
+    async "^2.5.1"
+    command-line-args "^5.0.2"
+    deep-diff "^0.3.8"
+    js-beautify "^1.8.9"
+    lodash "^4.17.11"
+    object-hash "^1.3.1"
+    sequelize "^4.42.0"
+
 sequelize-cli@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.4.1.tgz#fb9fbbde733ae887970316a700d264fcf0683770"
@@ -4383,6 +4498,29 @@ sequelize-typescript@^2.1.3:
   dependencies:
     glob "7.2.0"
 
+sequelize@^4.42.0:
+  version "4.44.4"
+  resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.44.4.tgz#9607eaa3e59080d27d8b17481d2e449e87e58f18"
+  integrity sha512-nkHmYkbwQK7uwpgW9VBalCBnQqQ8mslTdgcBthtJLORuPvAYRPlfkXZMVUU9TLLJt9CX+/y0MYg0DpcP6ywsEQ==
+  dependencies:
+    bluebird "^3.5.0"
+    cls-bluebird "^2.1.0"
+    debug "^3.1.0"
+    depd "^1.1.0"
+    dottie "^2.0.0"
+    generic-pool "3.5.0"
+    inflection "1.12.0"
+    lodash "^4.17.1"
+    moment "^2.20.0"
+    moment-timezone "^0.5.14"
+    retry-as-promised "^2.3.2"
+    semver "^5.5.0"
+    terraformer-wkt-parser "^1.1.2"
+    toposort-class "^1.0.1"
+    uuid "^3.2.1"
+    validator "^10.4.0"
+    wkx "^0.4.1"
+
 sequelize@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.18.0.tgz#0e99e0c07ee144eb456374a56e2bd501634c3d16"
@@ -4453,6 +4591,11 @@ shelljs@0.8.5:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+shimmer@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -4762,6 +4905,21 @@ tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
+terraformer-wkt-parser@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.1.tgz#8041e2aeb0c9f2b4cbbec8ec2c5c00c45ddfee02"
+  integrity sha512-+CJyNLWb3lJ9RsZMTM66BY0MT3yIo4l4l22Jd9CrZuwzk54fsu4Sc7zejuS9fCITTuTQy3p06d4MZMVI7v5wSg==
+  dependencies:
+    "@types/geojson" "^1.0.0"
+    terraformer "~1.0.5"
+
+terraformer@~1.0.5:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/terraformer/-/terraformer-1.0.12.tgz#39e08f9c753606421acce02e122440c72dfa12d3"
+  integrity sha512-MokUp0+MFal4CmJDVL6VAO1bKegeXcBM2RnPVfqcFIp2IIv8EbPAjG0j/vEy/vuKB8NVMMSF2vfpVS/QLe4DBg==
+  optionalDependencies:
+    "@types/geojson" "^7946.0.0 || ^1.0.0"
+
 terser-webpack-plugin@^5.1.3:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
@@ -4965,6 +5123,11 @@ typescript@^4.6.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
   integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
 
+typical@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
+  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
+
 umzug@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184"
@@ -5028,6 +5191,11 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^3.2.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 v8-compile-cache-lib@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8"
@@ -5053,6 +5221,11 @@ validate-npm-package-name@^4.0.0:
   dependencies:
     builtins "^5.0.0"
 
+validator@^10.4.0:
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
+  integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==
+
 validator@^13.7.0:
   version "13.7.0"
   resolved "https://registry.yarnpkg.com/validator/-/validator-13.7.0.tgz#4f9658ba13ba8f3d82ee881d3516489ea85c0857"
@@ -5168,6 +5341,13 @@ windows-release@^4.0.0:
   dependencies:
     execa "^4.0.2"
 
+wkx@^0.4.1:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003"
+  integrity sha512-ikPXMM9IR/gy/LwiOSqWlSL3X/J5uk9EO2hHNRXS41eTLXaUFEVw9fn/593jW/tE5tedNg8YjT5HkCa4FqQZyQ==
+  dependencies:
+    "@types/node" "*"
+
 wkx@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz#c6c37019acf40e517cc6b94657a25a3d4aa33e8c"

From 62e355bee7fa278a9470d9053417b8075ca1fd61 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 10 Apr 2022 21:55:35 +0300
Subject: [PATCH 006/221] Remove redundant modules

---
 newback/.sequelizerc                         |   7 -
 newback/config/Config.d.ts                   |   2 -
 newback/config/default.json                  |   2 +-
 newback/config/sequelize.cli.config.js       |   8 -
 newback/package.json                         |  24 +-
 newback/src/common/decorators/validators.ts  |   0
 newback/src/data/database/database.module.ts |  20 +-
 newback/src/data/database/ormconfig.ts       |   4 -
 newback/src/migration.runner.ts              |  15 +
 newback/src/modules/auth/auth.module.ts      |   2 +-
 newback/src/modules/auth/interfaces.ts       |   2 +-
 newback/src/modules/logger/logger.module.ts  |  10 +
 newback/test.sql                             | 239 ++++++++++
 newback/yarn.lock                            | 467 +------------------
 14 files changed, 306 insertions(+), 496 deletions(-)
 delete mode 100644 newback/.sequelizerc
 delete mode 100644 newback/config/sequelize.cli.config.js
 delete mode 100644 newback/src/common/decorators/validators.ts
 create mode 100644 newback/src/migration.runner.ts
 create mode 100644 newback/src/modules/logger/logger.module.ts
 create mode 100644 newback/test.sql

diff --git a/newback/.sequelizerc b/newback/.sequelizerc
deleted file mode 100644
index 01f56f0aa..000000000
--- a/newback/.sequelizerc
+++ /dev/null
@@ -1,7 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  'config': './config/sequelize.cli.config.js',
-  'models-path': path.resolve('src', 'data', 'database', 'model'),
-  'migrations-path': path.resolve('src', 'data',  'database', 'migration'),
-};
diff --git a/newback/config/Config.d.ts b/newback/config/Config.d.ts
index 59f8a250c..c4c675df6 100644
--- a/newback/config/Config.d.ts
+++ b/newback/config/Config.d.ts
@@ -12,9 +12,7 @@ declare module "node-config-ts" {
   interface Mysql {
     synchronize: boolean
     logging: boolean
-    dialect: string
     host: string
-    "default-character-set": string
     port: number
     username: string
     password: string
diff --git a/newback/config/default.json b/newback/config/default.json
index 8f309b304..c4dfa7eae 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -36,7 +36,7 @@
     }
   },
   "mysql": {
-    "synchronize": false,
+    "synchronize": true,
     "logging": true,
     "host": "localhost",
     "port": 3306,
diff --git a/newback/config/sequelize.cli.config.js b/newback/config/sequelize.cli.config.js
deleted file mode 100644
index 388895c46..000000000
--- a/newback/config/sequelize.cli.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const {generateConfig} = require('../src/data/database/ormconfig');
-
-// fucking sequelize-cli hack
-const conf = generateConfig((sql) => console.log(sql));
-module.exports = {
-  development: conf
-};
-
diff --git a/newback/package.json b/newback/package.json
index a39682806..f30fb8b5c 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -5,27 +5,12 @@
   "repository": "https://github.com/akoidan/pychat",
   "license": "MIT",
   "scripts": {
-    "makemigrations": " ./node_modules/.bin/ts-node -r tsconfig-paths/register ./node_modules/.bin/makemigration",
-    "generate-configs": "node-config-ts",
-    "prebuild": "rimraf dist",
+    "generate-configs": "node node_modules/node-config-ts/bin/cli",
+    "migrate": "ts-node ./src/migration.runner.ts \n",
     "build": "nest build",
     "start": "nest start",
     "start:dev": "node --inspect=0.0.0.0 dist/src/main",
-    "start:debug": "nest start --debug --watch",
-    "start:local": "yarn generate-configs && yarn db:run:migrate && nest start --debug --watch",
-    "start:prod": "node dist/src/main",
-    "start:prod:migrate": "yarn db:run:migrate && node dist/src/main",
-    "db:run:seeds": "npx sequelize-cli db:seed:all",
-    "db:run:single": "npx sequelize-cli db:seed",
-    "db:run:migrate": "npx sequelize-cli db:migrate",
-    "db:run:revert": "npx sequelize-cli db:migrate:undo",
-    "lint": "eslint '{src,apps,libs,test}/**/*.ts' --fix",
-    "lint:check": "eslint '{src,apps,libs,test}/**/*.ts'",
-    "test": "jest --coverage --runInBand --detectOpenHandles --testTimeout=10000 --passWithNoTests",
-    "gstorage:upload": "node ./src/data/database/migration.helpers/00014-upload-files-to-bucket.js upload",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "elastic:run:migration": "node elastic-migration.js migration up",
-    "elastic:run:seed": "node elastic-migration.js seed up"
+    "start:debug": "nest start --debug --watch"
   },
   "dependencies": {
     "@nestjs/common": "^8.4.4",
@@ -40,13 +25,13 @@
     "lines-logger": "^2.1.2",
     "mysql2": "^2.3.3",
     "node-config-ts": "npm:node-config-ts-2",
+    "node-db-migration": "^1.3.3",
     "npm": "^8.6.0",
     "pg": "^8.7.3",
     "redis": "^4.0.6",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7",
     "sequelize": "^6.18.0",
-    "sequelize-auto-migrations": "^1.0.3",
     "sequelize-typescript": "^2.1.3",
     "swagger-ui-express": "^4.3.0"
   },
@@ -60,7 +45,6 @@
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "eslint": "^8.12.0",
-    "sequelize-cli": "^6.4.1",
     "ts-loader": "^9.2.8",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.3"
diff --git a/newback/src/common/decorators/validators.ts b/newback/src/common/decorators/validators.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/newback/src/data/database/database.module.ts b/newback/src/data/database/database.module.ts
index 3be0c8857..81312e0be 100644
--- a/newback/src/data/database/database.module.ts
+++ b/newback/src/data/database/database.module.ts
@@ -1,7 +1,11 @@
-import { Module } from '@nestjs/common';
+import {
+  ConsoleLogger,
+  Module
+} from '@nestjs/common';
 import { SequelizeModule } from '@nestjs/sequelize';
 
-import {ormconfig } from '@/data/database/ormconfig';
+import {generateConfig } from '@/data/database/ormconfig';
+import { Sequelize } from 'sequelize-typescript';
 import {ChannelModel} from '@/data/database/model/channel.model';
 import {ImageModel} from '@/data/database/model/image.model';
 import {IpAddressModel} from '@/data/database/model/ip.address.model';
@@ -19,14 +23,24 @@ import {UserModel} from '@/data/database/model/user.model';
 import {UserProfileModel} from '@/data/database/model/user.profile.model';
 import {UserSettingsModel} from '@/data/database/model/user.settings.model';
 import {VerificationModel} from '@/data/database/model/verification.model';
+import {
+  Logger,
+  LoggerService
+} from '@nestjs/common/services/logger.service';
+import {LoggerModule} from '@/modules/logger/logger.module';
 
 const repositories = [
 
 ];
 
+
 @Module({
   imports: [
-    SequelizeModule.forRoot(ormconfig),
+    SequelizeModule.forRootAsync({
+      inject: [Logger],
+      imports: [LoggerModule],
+      useFactory: (logger: Logger) => generateConfig((sql) => logger.debug(sql)),
+    }),
     SequelizeModule.forFeature([
      ChannelModel,
       ImageModel,
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/data/database/ormconfig.ts
index 251556b7b..891155794 100644
--- a/newback/src/data/database/ormconfig.ts
+++ b/newback/src/data/database/ormconfig.ts
@@ -5,9 +5,6 @@ import {config} from 'node-config-ts';
 export function generateConfig(logging: ((sql: string) => void)): SequelizeModuleOptions {
   return {
     synchronize: config.mysql.synchronize,
-    sync: {
-      force: true,
-    },
     logging: config.mysql.logging ? logging : false,
     dialect: 'mysql',
     host: config.mysql.host,
@@ -21,7 +18,6 @@ export function generateConfig(logging: ((sql: string) => void)): SequelizeModul
       charset: 'utf8mb4',
       paranoid: true,
       timestamps: true,
-      freezeTableName: true,
       underscored: true,
     }
   };
diff --git a/newback/src/migration.runner.ts b/newback/src/migration.runner.ts
new file mode 100644
index 000000000..af7cb69e5
--- /dev/null
+++ b/newback/src/migration.runner.ts
@@ -0,0 +1,15 @@
+import mysql2 from 'mysql2';
+import {CommandsRunner, MysqlDriver} from 'node-db-migration';
+var connection = mysql2.createConnection({
+    "host" : "localhost",
+    "user" : "root",
+    "database" : "test8",
+    "multipleStatements" : true, // if you have multiple sql in your scripts
+});
+connection.connect(function(err) {
+    let migrations = new CommandsRunner({
+        driver: new MysqlDriver(connection),
+        directoryWithScripts: __dirname + '/diff',
+    });
+    migrations.run('init')
+});
diff --git a/newback/src/modules/auth/auth.module.ts b/newback/src/modules/auth/auth.module.ts
index cb7a2acb5..1095d884b 100644
--- a/newback/src/modules/auth/auth.module.ts
+++ b/newback/src/modules/auth/auth.module.ts
@@ -8,6 +8,6 @@ import { AuthService } from '@/modules/auth/auth.service';
 @Module({
   imports: [],
   controllers: [AuthController],
-  providers: [AuthService],
+  providers: [AuthService, Logger],
 })
 export class AuthModule {}
diff --git a/newback/src/modules/auth/interfaces.ts b/newback/src/modules/auth/interfaces.ts
index c57790ebf..913c727cc 100644
--- a/newback/src/modules/auth/interfaces.ts
+++ b/newback/src/modules/auth/interfaces.ts
@@ -20,7 +20,7 @@ export default class LoginRequestValidator implements LoginRequest {
   @Length(3, 128, {
     message: "Passwords should contain 3-64 symbols"
   })
-  @Matches(/^[^\S].*[^\S]$/, {
+  @Matches(/^\S+$/, {
     message: `Password can't contain whitespaces`
   })
   public password: string;
diff --git a/newback/src/modules/logger/logger.module.ts b/newback/src/modules/logger/logger.module.ts
new file mode 100644
index 000000000..b75d7e8d7
--- /dev/null
+++ b/newback/src/modules/logger/logger.module.ts
@@ -0,0 +1,10 @@
+import {
+  Logger,
+  Module
+} from '@nestjs/common';
+
+@Module({
+  providers: [Logger],
+  exports: [Logger],
+})
+export class LoggerModule {}
diff --git a/newback/test.sql b/newback/test.sql
new file mode 100644
index 000000000..c82ac4307
--- /dev/null
+++ b/newback/test.sql
@@ -0,0 +1,239 @@
+create or replace table ip_address
+(
+	id int auto_increment
+		primary key,
+	ip varchar(32) not null,
+	isp varchar(255) null,
+	country_code varchar(16) null,
+	country varchar(64) null,
+	region varchar(64) null,
+	city varchar(64) null,
+	lat double null,
+	lon double null,
+	zip varchar(32) null,
+	timezone varchar(32) null,
+	constraint id
+		unique (id),
+	constraint ip
+		unique (ip)
+);
+
+create or replace table channel
+(
+	id int auto_increment
+		primary key,
+	name varchar(16) not null,
+	creator_id int null,
+	constraint id
+		unique (id)
+);
+
+create or replace table user
+(
+	id int auto_increment
+	  primary key (id),
+	last_time_online datetime not null,
+	username varchar(16) not null,
+	sex enum('MALE', 'FEMALE', 'OTHER') default 'OTHER' not null,
+	thumbnail varchar(100) null,
+	constraint id
+		unique (id),
+	constraint username
+		unique (username)
+);
+
+create or replace table room
+(
+	id int auto_increment
+	    primary key,
+	name varchar(16) null,
+	is_main_in_channel tinyint(1) default 0 not null,
+	p2p tinyint(1) default 0 not null,
+	channel_id int null,
+	creator_id int null,
+	constraint id
+		unique (id)
+);
+
+create or replace table message
+(
+	id int auto_increment,
+	sender_id int not null,
+	room_id int not null,
+	time datetime not null,
+	content longtext null,
+	giphy varchar(255) null,
+	symbol varchar(1) null,
+	message_status enum('ON_SERVER', 'READ', 'RECEIVED') not null,
+	thread_message_count int default 0 not null,
+	parent_message_id int null,
+	constraint id
+		unique (id)
+);
+
+create or replace table image
+(
+	id int auto_increment
+	    primary key,
+	type enum('VIDEO', 'IMAGE', 'GIPHY') not null,
+	symbol varchar(1) not null,
+	message_id int not null,
+	img varchar(255) null,
+	preview varchar(255) null,
+	absolute_url varchar(255) null,
+	webp_asbolute_url varchar(255) null,
+	constraint id
+		unique (id),
+	constraint unique_image_symbol_message
+		unique (symbol, message_id)
+);
+
+create or replace table message_history
+(
+	id int auto_increment
+	    primary key,
+	message_id int not null,
+	time datetime not null,
+	content longtext not null,
+	constraint id
+		unique (id)
+);
+
+create or replace table message_mention
+(
+	id int not null
+	    primary key,
+	user_id int not null,
+	message_id int not null,
+	symbol varchar(1) not null,
+	constraint id
+		unique (id),
+	constraint unique_message_mention_user_id_symbol_message_id
+		unique (user_id, message_id, symbol)
+);
+
+create or replace table room_user
+(
+	id int auto_increment
+	    primary key,
+	room_id int not null,
+	user_id int not null,
+	volume int default 2 not null,
+	notifications tinyint(1) default 1 not null,
+	constraint id
+		unique (id),
+	constraint unique_room_user_room_id_user_id
+		unique (room_id, user_id)
+);
+
+create or replace table subscription
+(
+	id int auto_increment
+	    primary key,
+	user_id int not null,
+	registration_id varchar(255) not null,
+	agent varchar(64) null,
+	is_mobile tinyint(1) default 0 not null,
+	ip_id int null,
+	constraint id
+		unique (id),
+	constraint registration_id
+		unique (registration_id)
+);
+
+create or replace table subscription_message
+(
+	id int auto_increment
+	    primary key (id),
+	subscription_id int not null,
+	message_id int not null,
+	received tinyint(1) default 0 not null,
+	constraint id
+		unique (id),
+	constraint unique_subscription_message_subscription_id_message_id
+		unique (subscription_id, message_id)
+);
+
+create or replace table uploaded_file
+(
+	id int auto_increment
+	    primary key,
+	type enum('VIDEO', 'FILE', 'MEDIA_RECORD', 'AUDIO_RECORD', 'IMAGE', 'PREVIEW', 'ISSUE') not null,
+	symbol varchar(1) not null,
+	user_id int not null,
+	file varchar(255) not null,
+	constraint id
+		unique (id)
+);
+
+create or replace table user_joined_info
+(
+	id int auto_increment,
+	ip_id int not null,
+	user_id int not null,
+	time datetime not null,
+	constraint id
+		unique (id),
+	constraint unique_user_joined_info_user_id_ip_id
+		unique (ip_id, user_id)
+);
+
+create or replace table verification
+(
+	id int auto_increment,
+	type enum('REGISTER', 'PASSWORD', 'EMAIL', 'CONFIRM_EMAIL') not null,
+	token varchar(17) not null,
+	user_id int not null,
+	time datetime not null,
+	verified tinyint(1) default 0 not null,
+	email varchar(190) null,
+	constraint id
+		unique (id)
+);
+
+create or replace table user_auth
+(
+	id int not null
+	    primary key (id),
+	password varchar(255) not null,
+	email varchar(255) null,
+	facebook_id varchar(255) null,
+	google_id datetime null,
+	email_verification_id datetime null,
+	constraint email
+		unique (email),
+	constraint facebook_id
+		unique (facebook_id),
+	constraint google_id
+		unique (google_id),
+	constraint id
+		unique (id)
+);
+
+create or replace table user_settings
+(
+	id int not null,
+	suggestions tinyint(1) default 1 not null,
+	show_when_im_typing tinyint(1) default 1 not null,
+	embedded_youtube tinyint(1) default 1 not null,
+	highlight_code tinyint(1) default 1 not null,
+	message_sound tinyint(1) default 0 not null,
+	incoming_file_call_sound tinyint(1) default 0 not null,
+	online_change_messages tinyint(1) default 0 not null,
+	devtools_logs enum('log_raise_error', 'log_with_warnings', 'trace', 'debug', 'info', 'warn', 'error', 'disable') default 'error' not null,
+	theme enum('COLOR_LOR', 'COLOR_REG', 'COLOR_WHITE') default 'COLOR_REG' not null,
+	constraint id
+		unique (id)
+);
+
+create or replace table user_profile
+(
+	id int not null,
+	name varchar(30) null,
+	city varchar(50) null,
+	surname varchar(30) null,
+	birthday datetime not null,
+	contacts varchar(100) null,
+	constraint id
+		unique (id)
+);
diff --git a/newback/yarn.lock b/newback/yarn.lock
index b96bfc4be..e7af11ddd 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -541,16 +541,6 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/geojson@^1.0.0":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-1.0.6.tgz#3e02972728c69248c2af08d60a48cbb8680fffdf"
-  integrity sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==
-
-"@types/geojson@^7946.0.0 || ^1.0.0":
-  version "7946.0.8"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
-  integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
-
 "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -953,7 +943,7 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0, ansi-styles@^4.3.0:
+ansi-styles@^4.1.0, ansi-styles@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -1011,11 +1001,6 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-back@^3.0.1, array-back@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
-  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -1042,18 +1027,6 @@ asap@^2.0.0:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
-async@^2.5.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
-  dependencies:
-    lodash "^4.17.14"
-
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
 axios@0.26.1:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
@@ -1097,11 +1070,6 @@ bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 body-parser@1.19.2:
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
@@ -1329,17 +1297,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-color@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.2.tgz#e295addbae470800def0254183c648531cdf4e3f"
-  integrity sha512-g4JYjrTW9MGtCziFNjkqp3IMpGhnJyeB0lOtRPjQkYhXzKYr6tYnXKyEVnMzITxhpbahsEW9KsxOYIDKwcsIBw==
-  dependencies:
-    d "^1.0.1"
-    es5-ext "^0.10.59"
-    es6-iterator "^2.0.3"
-    memoizee "^0.4.15"
-    timers-ext "^0.1.7"
-
 cli-columns@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
@@ -1374,28 +1331,11 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
-
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-cls-bluebird@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee"
-  integrity sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4=
-  dependencies:
-    is-bluebird "^1.0.2"
-    shimmer "^1.1.0"
-
 cluster-key-slot@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
@@ -1450,22 +1390,12 @@ columnify@^1.6.0:
     strip-ansi "^6.0.1"
     wcwidth "^1.0.0"
 
-command-line-args@^5.0.2:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
-  integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==
-  dependencies:
-    array-back "^3.1.0"
-    find-replace "^3.0.0"
-    lodash.camelcase "^4.3.0"
-    typical "^4.0.0"
-
 commander@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^2.19.0, commander@^2.20.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -1490,14 +1420,6 @@ concat-stream@^1.5.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-config-chain@^1.1.12, config-chain@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
-  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
 consola@^2.15.0:
   version "2.15.3"
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
@@ -1573,15 +1495,7 @@ csv-parse@^5.0.4:
   resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.0.4.tgz#97e5e654413bcf95f2714ce09bcb2be6de0eb8e3"
   integrity sha512-5AIdl8l6n3iYQYxan5djB5eKDa+vBnhfWZtRpJTcrETWfVLYN0WSj3L9RwvgYt+psoO77juUr8TG8qpfGZifVQ==
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
-  dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
-
-debug@2.6.9, debug@^2.6.9:
+debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -1595,23 +1509,11 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
   dependencies:
     ms "2.1.2"
 
-debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
-deep-diff@^0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
-  integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
-
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -1651,7 +1553,7 @@ depd@2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-depd@^1.1.0, depd@^1.1.2, depd@~1.1.2:
+depd@^1.1.2, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
@@ -1706,21 +1608,11 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dottie@^2.0.0, dottie@^2.0.2:
+dottie@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154"
   integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==
 
-editorconfig@^0.15.3:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
-  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
-  dependencies:
-    commander "^2.19.0"
-    lru-cache "^4.1.5"
-    semver "^5.6.0"
-    sigmund "^1.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -1820,42 +1712,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@^0.10.59, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.60"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.60.tgz#e8060a86472842b93019c31c34865012449883f4"
-  integrity sha512-jpKNXIt60htYG59/9FGf2PYT3pwMpnEbNKysU+k/4FGwyGtMotOvcZOuW+EmXXYASRqYSXQfGL5cVIthOTgbkg==
-  dependencies:
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.3"
-    next-tick "^1.1.0"
-
-es6-iterator@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
-es6-symbol@^3.1.1, es6-symbol@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
-  dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
-
-es6-weak-map@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
-  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
-  dependencies:
-    d "1"
-    es5-ext "^0.10.46"
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.1"
-
 es7-shim@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/es7-shim/-/es7-shim-6.0.0.tgz#0c430b40b8505ad15570721a8d8dd4eb0c553155"
@@ -2008,14 +1864,6 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-event-emitter@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
 events@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
@@ -2072,13 +1920,6 @@ express@4.17.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-ext@^1.1.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
-  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
-  dependencies:
-    type "^2.5.0"
-
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -2165,13 +2006,6 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-replace@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
-  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
-  dependencies:
-    array-back "^3.0.1"
-
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -2226,16 +2060,6 @@ fs-extra@10.0.1, fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -2289,21 +2113,11 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
-generic-pool@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.5.0.tgz#acac4fd743a175ff20574f380910036464cb61f7"
-  integrity sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w==
-
 generic-pool@3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
   integrity sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg==
 
-get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
@@ -2552,11 +2366,6 @@ infer-owner@^1.0.4:
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
-inflection@1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
-  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
-
 inflection@^1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.2.tgz#15e8c797c6c3dadf31aa658f8df8a4ea024798b0"
@@ -2575,11 +2384,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, i
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
 ini@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
@@ -2690,11 +2494,6 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-bluebird@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2"
-  integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI=
-
 is-boolean-object@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
@@ -2773,11 +2572,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-promise@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
-  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-
 is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
@@ -2858,26 +2652,6 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-js-beautify@^1.14.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.2.tgz#8180514fd4c7789c4ac4bcc327b6dda634c55666"
-  integrity sha512-H85kX95a53os+q1OCqtYe8AXAmgy3BvtysA/V83S3fdhznm6WlUpGi14DqSPbKFsL3dXZFXYl7YQwW9U1+76ng==
-  dependencies:
-    config-chain "^1.1.12"
-    editorconfig "^0.15.3"
-    glob "^7.1.3"
-    nopt "^5.0.0"
-
-js-beautify@^1.8.9:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.3.tgz#3dd11c949178de7f3bdf3f6f752778d3bed95150"
-  integrity sha512-f1ra8PHtOEu/70EBnmiUlV8nJePS58y9qKjl4JHfYWlFH6bo7ogZBz//FAZp7jDuXtYnGYKymZPlrg2I/9Zo4g==
-  dependencies:
-    config-chain "^1.1.13"
-    editorconfig "^0.15.3"
-    glob "^7.1.3"
-    nopt "^5.0.0"
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -3105,17 +2879,12 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@4.17.21, lodash@^4.17.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.19, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -3133,7 +2902,7 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-lru-cache@^4.1.3, lru-cache@^4.1.5:
+lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -3153,13 +2922,6 @@ lru-cache@^7.4.0, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.8.0.tgz#649aaeb294a56297b5cbc5d70f198dcc5ebe5747"
   integrity sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg==
 
-lru-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
-  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
-  dependencies:
-    es5-ext "~0.10.2"
-
 macos-release@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.5.0.tgz#067c2c88b5f3fb3c56a375b2ec93826220fa1ff2"
@@ -3211,20 +2973,6 @@ memfs@^3.4.1:
   dependencies:
     fs-monkey "1.0.3"
 
-memoizee@^0.4.15:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
-  integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
-  dependencies:
-    d "^1.0.1"
-    es5-ext "^0.10.53"
-    es6-weak-map "^2.0.3"
-    event-emitter "^0.3.5"
-    is-promise "^2.2.2"
-    lru-queue "^0.1.0"
-    next-tick "^1.1.0"
-    timers-ext "^0.1.7"
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -3382,14 +3130,14 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment-timezone@^0.5.14, moment-timezone@^0.5.34:
+moment-timezone@^0.5.34:
   version "0.5.34"
   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c"
   integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==
   dependencies:
     moment ">= 2.9.0"
 
-"moment@>= 2.9.0", moment@^2.20.0, moment@^2.29.1:
+moment@*, "moment@>= 2.9.0", moment@^2.29.1:
   version "2.29.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
   integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
@@ -3404,7 +3152,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -3464,11 +3212,6 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-next-tick@1, next-tick@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
-  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
-
 "node-config-ts@npm:node-config-ts-2":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-config-ts-2/-/node-config-ts-2-1.0.0.tgz#349f5dd10e8de8d75f279e2a1e1148f782e77fbe"
@@ -3479,6 +3222,13 @@ next-tick@1, next-tick@^1.1.0:
     prettier "^1.19.1"
     ramda "^0.27.0"
 
+node-db-migration@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/node-db-migration/-/node-db-migration-1.3.3.tgz#e930e39f352afefe90e98521169f4db30eba630c"
+  integrity sha512-OhiBy2+T5zGlenfaoNdh5raNEZEOunJwFAnK8cRZvj4m7Xu2PZrcekkyokhfD23/EC6tYK9IYOdzgFKMFejaoQ==
+  dependencies:
+    moment "*"
+
 node-emoji@1.11.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c"
@@ -3729,11 +3479,6 @@ object-hash@3.0.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
-object-hash@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
-  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
-
 object-inspect@^1.12.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
@@ -4102,11 +3847,6 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -4312,11 +4052,6 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
 require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
@@ -4327,7 +4062,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve@^1.1.6, resolve@^1.20.0:
+resolve@^1.1.6:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -4344,14 +4079,6 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
-retry-as-promised@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-2.3.2.tgz#cd974ee4fd9b5fe03cbf31871ee48221c07737b7"
-  integrity sha1-zZdO5P2bX+A8vzGHHuSCIcB3N7c=
-  dependencies:
-    bluebird "^3.4.6"
-    debug "^2.6.9"
-
 retry-as-promised@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-5.0.0.tgz#f4ecc25133603a2d2a7aff4a128691d7bc506d54"
@@ -4424,11 +4151,6 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
 semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.4, semver@^7.3.5:
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b"
@@ -4460,32 +4182,6 @@ seq-queue@^0.0.5:
   resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
   integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=
 
-sequelize-auto-migrations@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sequelize-auto-migrations/-/sequelize-auto-migrations-1.0.3.tgz#558a370265c533d8c92f5156f813c5a9b21a09ab"
-  integrity sha512-CTh8073gqrthit5xl/ls2lKPzUHzRP/GCY8z99+dlu27oOSmSiFv+NcNHJjmfZvLBSzfif8Nwp3FNtph09Gxew==
-  dependencies:
-    async "^2.5.1"
-    command-line-args "^5.0.2"
-    deep-diff "^0.3.8"
-    js-beautify "^1.8.9"
-    lodash "^4.17.11"
-    object-hash "^1.3.1"
-    sequelize "^4.42.0"
-
-sequelize-cli@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.4.1.tgz#fb9fbbde733ae887970316a700d264fcf0683770"
-  integrity sha512-gIzzFitUGUErq6DYd1JDnsmx7z7XcxzRNe4Py3AqeaxcyjpCAZU2BQnsNPGPMKAaXfMtKi/d9Tu4MtLrehVzIQ==
-  dependencies:
-    cli-color "^2.0.1"
-    fs-extra "^9.1.0"
-    js-beautify "^1.14.0"
-    lodash "^4.17.21"
-    resolve "^1.20.0"
-    umzug "^2.3.0"
-    yargs "^16.2.0"
-
 sequelize-pool@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-7.1.0.tgz#210b391af4002762f823188fd6ecfc7413020768"
@@ -4498,29 +4194,6 @@ sequelize-typescript@^2.1.3:
   dependencies:
     glob "7.2.0"
 
-sequelize@^4.42.0:
-  version "4.44.4"
-  resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.44.4.tgz#9607eaa3e59080d27d8b17481d2e449e87e58f18"
-  integrity sha512-nkHmYkbwQK7uwpgW9VBalCBnQqQ8mslTdgcBthtJLORuPvAYRPlfkXZMVUU9TLLJt9CX+/y0MYg0DpcP6ywsEQ==
-  dependencies:
-    bluebird "^3.5.0"
-    cls-bluebird "^2.1.0"
-    debug "^3.1.0"
-    depd "^1.1.0"
-    dottie "^2.0.0"
-    generic-pool "3.5.0"
-    inflection "1.12.0"
-    lodash "^4.17.1"
-    moment "^2.20.0"
-    moment-timezone "^0.5.14"
-    retry-as-promised "^2.3.2"
-    semver "^5.5.0"
-    terraformer-wkt-parser "^1.1.2"
-    toposort-class "^1.0.1"
-    uuid "^3.2.1"
-    validator "^10.4.0"
-    wkx "^0.4.1"
-
 sequelize@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.18.0.tgz#0e99e0c07ee144eb456374a56e2bd501634c3d16"
@@ -4591,11 +4264,6 @@ shelljs@0.8.5:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shimmer@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
-  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -4605,11 +4273,6 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-sigmund@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
-
 signal-exit@^3.0.2, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
@@ -4905,21 +4568,6 @@ tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-terraformer-wkt-parser@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.1.tgz#8041e2aeb0c9f2b4cbbec8ec2c5c00c45ddfee02"
-  integrity sha512-+CJyNLWb3lJ9RsZMTM66BY0MT3yIo4l4l22Jd9CrZuwzk54fsu4Sc7zejuS9fCITTuTQy3p06d4MZMVI7v5wSg==
-  dependencies:
-    "@types/geojson" "^1.0.0"
-    terraformer "~1.0.5"
-
-terraformer@~1.0.5:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/terraformer/-/terraformer-1.0.12.tgz#39e08f9c753606421acce02e122440c72dfa12d3"
-  integrity sha512-MokUp0+MFal4CmJDVL6VAO1bKegeXcBM2RnPVfqcFIp2IIv8EbPAjG0j/vEy/vuKB8NVMMSF2vfpVS/QLe4DBg==
-  optionalDependencies:
-    "@types/geojson" "^7946.0.0 || ^1.0.0"
-
 terser-webpack-plugin@^5.1.3:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
@@ -4951,14 +4599,6 @@ through@^2.3.6:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-timers-ext@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
-  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
-  dependencies:
-    es5-ext "~0.10.46"
-    next-tick "1"
-
 tiny-relative-date@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
@@ -5098,16 +4738,6 @@ type-is@^1.6.4, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.6.0.tgz#3ca6099af5981d36ca86b78442973694278a219f"
-  integrity sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -5123,18 +4753,6 @@ typescript@^4.6.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
   integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
 
-typical@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
-  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
-
-umzug@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184"
-  integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw==
-  dependencies:
-    bluebird "^3.7.2"
-
 unbox-primitive@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
@@ -5191,11 +4809,6 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^3.2.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
 v8-compile-cache-lib@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8"
@@ -5221,11 +4834,6 @@ validate-npm-package-name@^4.0.0:
   dependencies:
     builtins "^5.0.0"
 
-validator@^10.4.0:
-  version "10.11.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
-  integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==
-
 validator@^13.7.0:
   version "13.7.0"
   resolved "https://registry.yarnpkg.com/validator/-/validator-13.7.0.tgz#4f9658ba13ba8f3d82ee881d3516489ea85c0857"
@@ -5341,13 +4949,6 @@ windows-release@^4.0.0:
   dependencies:
     execa "^4.0.2"
 
-wkx@^0.4.1:
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003"
-  integrity sha512-ikPXMM9IR/gy/LwiOSqWlSL3X/J5uk9EO2hHNRXS41eTLXaUFEVw9fn/593jW/tE5tedNg8YjT5HkCa4FqQZyQ==
-  dependencies:
-    "@types/node" "*"
-
 wkx@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz#c6c37019acf40e517cc6b94657a25a3d4aa33e8c"
@@ -5360,15 +4961,6 @@ word-wrap@^1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -5387,11 +4979,6 @@ xtend@^4.0.0:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
 yallist@4.0.0, yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
@@ -5407,24 +4994,6 @@ yaml@^1.10.0:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@^20.2.2:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"

From c4f4a3dcc4e256f0ea95f038f470ef6695861719 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 10 Apr 2022 23:53:11 +0300
Subject: [PATCH 007/221] @BelongsTo is required to generate constraint

---
 .../src/data/database/model/channel.model.ts  |  6 ++--
 .../src/data/database/model/image.model.ts    |  6 ++--
 .../data/database/model/ip.address.model.ts   |  4 +--
 .../database/model/message.history.model.ts   | 13 +++++----
 .../database/model/message.mention.model.ts   | 10 +++++--
 .../src/data/database/model/message.model.ts  | 22 +++++++-------
 newback/src/data/database/model/room.model.ts | 29 +++++++++----------
 .../data/database/model/room.users.model.ts   |  9 ++++--
 .../model/subscription.message.model.ts       | 10 +++++--
 .../data/database/model/subscription.model.ts | 12 ++++++--
 .../database/model/uploaded.file.model.ts     |  7 +++--
 .../data/database/model/user.auth.model.ts    |  7 +++--
 .../database/model/user.joined.info.model.ts  |  9 ++++--
 newback/src/data/database/model/user.model.ts |  2 --
 .../data/database/model/user.profile.model.ts |  7 +++--
 .../database/model/user.settings.model.ts     |  6 ++--
 .../data/database/model/verification.model.ts |  6 ++--
 newback/src/data/database/ormconfig.ts        |  3 ++
 newback/src/modules/app/app.service.ts        |  8 -----
 newback/src/modules/auth/auth.controller.ts   | 17 +++++++++++
 20 files changed, 123 insertions(+), 70 deletions(-)
 delete mode 100644 newback/src/modules/app/app.service.ts

diff --git a/newback/src/data/database/model/channel.model.ts b/newback/src/data/database/model/channel.model.ts
index a7738fd3d..025498e02 100644
--- a/newback/src/data/database/model/channel.model.ts
+++ b/newback/src/data/database/model/channel.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -14,9 +15,7 @@ import {UserModel} from '@/data/database/model/user.model';
 export class ChannelModel extends Model<ChannelModel> {
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
     autoIncrement: true,
-    unique: true,
     primaryKey: true,
   })
   public id: number;
@@ -33,4 +32,7 @@ export class ChannelModel extends Model<ChannelModel> {
     type: DataType.INTEGER,
   })
   public creatorId: number;
+
+  @BelongsTo(() => UserModel)
+  public creator: UserModel;
 }
diff --git a/newback/src/data/database/model/image.model.ts b/newback/src/data/database/model/image.model.ts
index c76e2751b..630de08bc 100644
--- a/newback/src/data/database/model/image.model.ts
+++ b/newback/src/data/database/model/image.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -24,8 +25,6 @@ export class ImageModel extends Model<ImageModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -52,6 +51,9 @@ export class ImageModel extends Model<ImageModel> {
   })
   public messageId: number;
 
+  @BelongsTo(() => MessageModel)
+  public message: MessageModel;
+
   @Column({
     type: DataType.STRING,
     allowNull: true,
diff --git a/newback/src/data/database/model/ip.address.model.ts b/newback/src/data/database/model/ip.address.model.ts
index 75297b8eb..64a2333b8 100644
--- a/newback/src/data/database/model/ip.address.model.ts
+++ b/newback/src/data/database/model/ip.address.model.ts
@@ -12,8 +12,6 @@ export class IpAddressModel extends Model<IpAddressModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -27,7 +25,7 @@ export class IpAddressModel extends Model<IpAddressModel> {
   public ip: string;
 
   @Column({
-    type: DataType.STRING(255),
+    type: DataType.STRING,
     allowNull: true,
   })
   public isp: string;
diff --git a/newback/src/data/database/model/message.history.model.ts b/newback/src/data/database/model/message.history.model.ts
index 480fadf30..53a44703e 100644
--- a/newback/src/data/database/model/message.history.model.ts
+++ b/newback/src/data/database/model/message.history.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -8,6 +9,7 @@ import {
 import {Injectable} from '@nestjs/common';
 import {config} from 'node-config-ts';
 import {MessageModel} from '@/data/database/model/message.model';
+import {UserModel} from '@/data/database/model/user.model';
 
 
 @Injectable()
@@ -15,9 +17,7 @@ import {MessageModel} from '@/data/database/model/message.model';
 export class MessageHistoryModel extends Model<MessageHistoryModel> {
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
     autoIncrement: true,
-    unique: true,
     primaryKey: true,
   })
   public id: number;
@@ -30,15 +30,18 @@ export class MessageHistoryModel extends Model<MessageHistoryModel> {
   })
   public messageId: number;
 
+  @BelongsTo(() => MessageModel)
+  public message: MessageModel;
+
   @Column({
     allowNull: false,
-    type: DataType.DATE,
+    type: DataType.BIGINT,
   })
-  public time: Date;
+  public time: number;
 
   @Column({
     type: DataType.TEXT('long'),
-    allowNull: false,
+    allowNull: true, // idk but it contains null
   })
   public content: string;
 }
diff --git a/newback/src/data/database/model/message.mention.model.ts b/newback/src/data/database/model/message.mention.model.ts
index 856ae7ad0..9d09b435b 100644
--- a/newback/src/data/database/model/message.mention.model.ts
+++ b/newback/src/data/database/model/message.mention.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -20,8 +21,7 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
+    autoIncrement: true,
     primaryKey: true,
   })
   public id: number;
@@ -34,6 +34,9 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
   })
   public userId: string;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @ForeignKey(() => MessageModel)
   @Unique(uniqueUserIdSymbMess)
   @Column({
@@ -42,6 +45,9 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
   })
   public messageId: string;
 
+  @BelongsTo(() => MessageModel)
+  public message: MessageModel;
+
   @Unique(uniqueUserIdSymbMess)
   @Column({
     type: DataType.STRING(1),
diff --git a/newback/src/data/database/model/message.model.ts b/newback/src/data/database/model/message.model.ts
index 45b4c611d..bb9961e14 100644
--- a/newback/src/data/database/model/message.model.ts
+++ b/newback/src/data/database/model/message.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -17,9 +18,7 @@ export class MessageModel extends Model<MessageModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
     autoIncrement: true,
-    unique: true,
     primaryKey: true,
   })
   public id: number;
@@ -32,6 +31,9 @@ export class MessageModel extends Model<MessageModel> {
   })
   public senderId: number;
 
+  @BelongsTo(() => UserModel)
+  public sender: UserModel;
+
   @ForeignKey(() => RoomModel)
   @Column({
     type: DataType.INTEGER,
@@ -39,11 +41,14 @@ export class MessageModel extends Model<MessageModel> {
   })
   public roomId: number;
 
+  @BelongsTo(() => RoomModel)
+  public room: RoomModel;
+
   @Column({
-    type: DataType.DATE,
+    type: DataType.BIGINT,
     allowNull: false,
   })
-  public time: Date;
+  public time: number;
 
   @Column({
     type: DataType.TEXT('long'),
@@ -51,12 +56,6 @@ export class MessageModel extends Model<MessageModel> {
   })
   public content: string;
 
-  @Column({
-    type: DataType.STRING(255),
-    allowNull: true,
-  })
-  public giphy: string;
-
   @Column({
     type: DataType.STRING(1),
     allowNull: true,
@@ -83,4 +82,7 @@ export class MessageModel extends Model<MessageModel> {
     allowNull: true,
   })
   public parentMessageId: number;
+
+  @BelongsTo(() => MessageModel)
+  public parentMessage: MessageModel;
 }
diff --git a/newback/src/data/database/model/room.model.ts b/newback/src/data/database/model/room.model.ts
index 3d7b78767..0a73a79f5 100644
--- a/newback/src/data/database/model/room.model.ts
+++ b/newback/src/data/database/model/room.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -10,28 +11,18 @@ import {UserModel} from '@/data/database/model/user.model';
 import {ChannelModel} from '@/data/database/model/channel.model';
 
 
-// constraints = [
-// 	CheckConstraint(
-// 		check=Q(Q(channel__isnull=True) & Q(name__isnull=True)) | Q(channel__isnull=False) & Q(name__isnull=False),
-// 		name='channel_should_exist_for_public_room_and_not_exist_for_private'
-// 	),
-// 	CheckConstraint(
-// 		check=Q(creator__isnull=True) | Q(name__isnull=False),
-// 		name='admin_should_not_be_define_for_private_rooms'
-// 	),
-// 	CheckConstraint(
-// 		check=Q(p2p=False) | Q(name__isnull=True),
-// 		name='p2p_only_if_private'
-// 	)
-// ]
+// 	constraint admin_should_not_be_define_for_private_rooms
+// 		check (`creator_id` is null or `name` is not null),
+// 	constraint channel_should_exist_for_public_room_and_not_exist_for_private
+// 		check (`channel_id` is null and `name` is null or `channel_id` is not n),
+// 	constraint p2p_only_if_private
+// 		check (`p2p` = 0x00 or `name` is null)
 @Injectable()
 @Table({ tableName: 'room'})
 export class RoomModel extends Model<RoomModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -66,6 +57,9 @@ export class RoomModel extends Model<RoomModel> {
   })
   public channelId: number;
 
+  @BelongsTo(() => ChannelModel)
+  public channel: ChannelModel;
+
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
@@ -73,4 +67,7 @@ export class RoomModel extends Model<RoomModel> {
     defaultValue: null,
   })
   public creatorId: number;
+
+  @BelongsTo(() => UserModel)
+  public creator: UserModel;
 }
diff --git a/newback/src/data/database/model/room.users.model.ts b/newback/src/data/database/model/room.users.model.ts
index b8291ae33..7cca0dbd3 100644
--- a/newback/src/data/database/model/room.users.model.ts
+++ b/newback/src/data/database/model/room.users.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -18,8 +19,6 @@ export class RoomUsersModel extends Model<RoomUsersModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -33,6 +32,9 @@ export class RoomUsersModel extends Model<RoomUsersModel> {
   })
   public roomId: number;
 
+  @BelongsTo(() => RoomModel)
+  public room: RoomModel;
+
   @Unique(uniqueRoomUser)
   @ForeignKey(() => UserModel)
   @Column({
@@ -41,6 +43,9 @@ export class RoomUsersModel extends Model<RoomUsersModel> {
   })
   public userId: number;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @Column({
     type: DataType.INTEGER,
     defaultValue: 2,
diff --git a/newback/src/data/database/model/subscription.message.model.ts b/newback/src/data/database/model/subscription.message.model.ts
index 2593fc8f1..ae28f8e07 100644
--- a/newback/src/data/database/model/subscription.message.model.ts
+++ b/newback/src/data/database/model/subscription.message.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -9,6 +10,7 @@ import {
 import {Injectable} from '@nestjs/common';
 import {MessageModel} from '@/data/database/model/message.model';
 import {SubscriptionModel} from '@/data/database/model/subscription.model';
+import {UserModel} from '@/data/database/model/user.model';
 
 const uniqueSubscriptionMessage = 'unique_subscription_message_subscription_id_message_id';
 
@@ -18,8 +20,6 @@ export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -33,6 +33,9 @@ export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
   })
   public subscriptionId: number;
 
+  @BelongsTo(() => SubscriptionModel)
+  public subscription: SubscriptionModel;
+
   @Unique(uniqueSubscriptionMessage)
   @ForeignKey(() => MessageModel)
   @Column({
@@ -41,6 +44,9 @@ export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
   })
   public messageId: number;
 
+  @BelongsTo(() => MessageModel)
+  public message: MessageModel;
+
   @Column({
     type: DataType.BOOLEAN,
     defaultValue: false,
diff --git a/newback/src/data/database/model/subscription.model.ts b/newback/src/data/database/model/subscription.model.ts
index 7de1ff53d..5b09c3782 100644
--- a/newback/src/data/database/model/subscription.model.ts
+++ b/newback/src/data/database/model/subscription.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -9,6 +10,7 @@ import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
 import {UploadedFileChoices} from '@/data/types/dto/dto';
 import {IpAddressModel} from '@/data/database/model/ip.address.model';
+import {MessageModel} from '@/data/database/model/message.model';
 
 @Injectable()
 @Table({tableName: 'subscription'})
@@ -16,8 +18,6 @@ export class SubscriptionModel extends Model<SubscriptionModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -30,8 +30,11 @@ export class SubscriptionModel extends Model<SubscriptionModel> {
   })
   public userId: number;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @Column({
-    type: DataType.STRING(255),
+    type: DataType.STRING,
     unique: true,
     allowNull: false,
   })
@@ -57,4 +60,7 @@ export class SubscriptionModel extends Model<SubscriptionModel> {
     allowNull: true,
   })
   public ipId: number;
+
+  @BelongsTo(() => IpAddressModel)
+  public ip: IpAddressModel;
 }
diff --git a/newback/src/data/database/model/uploaded.file.model.ts b/newback/src/data/database/model/uploaded.file.model.ts
index 7f042f716..13f2b67b9 100644
--- a/newback/src/data/database/model/uploaded.file.model.ts
+++ b/newback/src/data/database/model/uploaded.file.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -18,11 +19,8 @@ import {UserModel} from '@/data/database/model/user.model';
 @Table({tableName: 'uploaded_file'})
 export class UploadedFileModel extends Model<UploadedFileModel> {
 
-
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -47,6 +45,9 @@ export class UploadedFileModel extends Model<UploadedFileModel> {
   })
   public userId: number;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @Column({
     type: DataType.STRING,
     allowNull: false,
diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/database/model/user.auth.model.ts
index bd581bd0d..c3dd834d3 100644
--- a/newback/src/data/database/model/user.auth.model.ts
+++ b/newback/src/data/database/model/user.auth.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -15,12 +16,14 @@ export class UserAuthModel extends Model<UserAuthModel> {
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
+    autoIncrement: false,
     primaryKey: true,
   })
   public id: number;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @Column({
     type: DataType.STRING,
     allowNull: false
diff --git a/newback/src/data/database/model/user.joined.info.model.ts b/newback/src/data/database/model/user.joined.info.model.ts
index 0620f1b71..51b4d7b95 100644
--- a/newback/src/data/database/model/user.joined.info.model.ts
+++ b/newback/src/data/database/model/user.joined.info.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -18,8 +19,6 @@ export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -33,6 +32,9 @@ export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
   })
   public ipId: number;
 
+  @BelongsTo(() => IpAddressModel)
+  public ip: IpAddressModel;
+
   @Unique(uniqueUserJoinedInfoUserIdIpId)
   @ForeignKey(() => UserModel)
   @Column({
@@ -41,6 +43,9 @@ export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
   })
   public userId: number;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @Column({
     type: DataType.DATE,
     allowNull: false,
diff --git a/newback/src/data/database/model/user.model.ts b/newback/src/data/database/model/user.model.ts
index d041810dd..4413eb44c 100644
--- a/newback/src/data/database/model/user.model.ts
+++ b/newback/src/data/database/model/user.model.ts
@@ -14,9 +14,7 @@ import {config} from 'node-config-ts';
 export class UserModel extends Model<UserModel> {
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
     autoIncrement: true,
-    unique: true,
     primaryKey: true,
   })
   public id: number;
diff --git a/newback/src/data/database/model/user.profile.model.ts b/newback/src/data/database/model/user.profile.model.ts
index 7a2d94015..dfae80c29 100644
--- a/newback/src/data/database/model/user.profile.model.ts
+++ b/newback/src/data/database/model/user.profile.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -15,12 +16,14 @@ export class UserProfileModel extends Model<UserProfileModel> {
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
+    autoIncrement: false,
     primaryKey: true,
   })
   public id: number;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @Column({
     type: DataType.STRING(30),
     allowNull: true
diff --git a/newback/src/data/database/model/user.settings.model.ts b/newback/src/data/database/model/user.settings.model.ts
index 3a25884e5..0eea57bcc 100644
--- a/newback/src/data/database/model/user.settings.model.ts
+++ b/newback/src/data/database/model/user.settings.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -20,12 +21,13 @@ export class UserSettingsModel extends Model<UserSettingsModel> {
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     primaryKey: true,
   })
   public id: number;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
diff --git a/newback/src/data/database/model/verification.model.ts b/newback/src/data/database/model/verification.model.ts
index a17201aff..633a125cb 100644
--- a/newback/src/data/database/model/verification.model.ts
+++ b/newback/src/data/database/model/verification.model.ts
@@ -1,4 +1,5 @@
 import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
@@ -15,8 +16,6 @@ export class VerificationModel extends Model<VerificationModel> {
 
   @Column({
     type: DataType.INTEGER,
-    allowNull: false,
-    unique: true,
     autoIncrement: true,
     primaryKey: true,
   })
@@ -41,6 +40,9 @@ export class VerificationModel extends Model<VerificationModel> {
   })
   public userId: number;
 
+  @BelongsTo(() => UserModel)
+  public user: UserModel;
+
   @Column({
     type: DataType.DATE,
     allowNull: false,
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/data/database/ormconfig.ts
index 891155794..45f8f9800 100644
--- a/newback/src/data/database/ormconfig.ts
+++ b/newback/src/data/database/ormconfig.ts
@@ -13,6 +13,9 @@ export function generateConfig(logging: ((sql: string) => void)): SequelizeModul
     password: config.mysql.password,
     database: config.mysql.database,
     autoLoadModels: true,
+    sync: {
+      force: true,
+    },
     define: {
       collate: 'utf8mb4_general_ci',
       charset: 'utf8mb4',
diff --git a/newback/src/modules/app/app.service.ts b/newback/src/modules/app/app.service.ts
deleted file mode 100644
index 927d7cca0..000000000
--- a/newback/src/modules/app/app.service.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class AppService {
-  getHello(): string {
-    return 'Hello World!';
-  }
-}
diff --git a/newback/src/modules/auth/auth.controller.ts b/newback/src/modules/auth/auth.controller.ts
index 6eb75d1c1..0c4cb9a02 100644
--- a/newback/src/modules/auth/auth.controller.ts
+++ b/newback/src/modules/auth/auth.controller.ts
@@ -6,6 +6,23 @@ import {
 } from '@nestjs/common';
 import { AuthService } from '@/modules/auth/auth.service';
 import LoginRequestValidator from '@/modules/auth/interfaces';
+import {Sequelize} from 'sequelize';
+import {UserModel} from '@/data/database/model/user.model';
+import {UserSettingsModel} from '@/data/database/model/user.settings.model';
+import {ImageModel} from '@/data/database/model/image.model';
+import {IpAddressModel} from '@/data/database/model/ip.address.model';
+import {MessageHistoryModel} from '@/data/database/model/message.history.model';
+import {MessageMentionModel} from '@/data/database/model/message.mention.model';
+import {MessageModel} from '@/data/database/model/message.model';
+import {RoomModel} from '@/data/database/model/room.model';
+import {RoomUsersModel} from '@/data/database/model/room.users.model';
+import {SubscriptionModel} from '@/data/database/model/subscription.model';
+import {SubscriptionMessageModel} from '@/data/database/model/subscription.message.model';
+import {UploadedFileModel} from '@/data/database/model/uploaded.file.model';
+import {UserAuthModel} from '@/data/database/model/user.auth.model';
+import {UserJoinedInfoModel} from '@/data/database/model/user.joined.info.model';
+import {UserProfileModel} from '@/data/database/model/user.profile.model';
+import {VerificationModel} from '@/data/database/model/verification.model';
 
 @Controller()
 export class AuthController {

From e62fbb828f3be04731b1a71566c9071eb37a6401 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 11 Apr 2022 00:18:39 +0300
Subject: [PATCH 008/221] Finished creating ORM

---
 .../data/database/model/user.auth.model.ts    |   4 +
 newback/test.sql                              | 239 ------------------
 2 files changed, 4 insertions(+), 239 deletions(-)
 delete mode 100644 newback/test.sql

diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/database/model/user.auth.model.ts
index c3dd834d3..8e94ae0e2 100644
--- a/newback/src/data/database/model/user.auth.model.ts
+++ b/newback/src/data/database/model/user.auth.model.ts
@@ -8,6 +8,7 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
+import {VerificationModel} from '@/data/database/model/verification.model';
 
 @Injectable()
 @Table({ tableName: 'user_auth'})
@@ -51,10 +52,13 @@ export class UserAuthModel extends Model<UserAuthModel> {
   })
   public googleId: string;
 
+  @ForeignKey(() => VerificationModel)
   @Column({
     type: DataType.DATE,
     allowNull: true,
   })
   public emailVerificationId: string;
 
+  @BelongsTo(() => VerificationModel)
+  public emailVerification: VerificationModel;
 }
diff --git a/newback/test.sql b/newback/test.sql
deleted file mode 100644
index c82ac4307..000000000
--- a/newback/test.sql
+++ /dev/null
@@ -1,239 +0,0 @@
-create or replace table ip_address
-(
-	id int auto_increment
-		primary key,
-	ip varchar(32) not null,
-	isp varchar(255) null,
-	country_code varchar(16) null,
-	country varchar(64) null,
-	region varchar(64) null,
-	city varchar(64) null,
-	lat double null,
-	lon double null,
-	zip varchar(32) null,
-	timezone varchar(32) null,
-	constraint id
-		unique (id),
-	constraint ip
-		unique (ip)
-);
-
-create or replace table channel
-(
-	id int auto_increment
-		primary key,
-	name varchar(16) not null,
-	creator_id int null,
-	constraint id
-		unique (id)
-);
-
-create or replace table user
-(
-	id int auto_increment
-	  primary key (id),
-	last_time_online datetime not null,
-	username varchar(16) not null,
-	sex enum('MALE', 'FEMALE', 'OTHER') default 'OTHER' not null,
-	thumbnail varchar(100) null,
-	constraint id
-		unique (id),
-	constraint username
-		unique (username)
-);
-
-create or replace table room
-(
-	id int auto_increment
-	    primary key,
-	name varchar(16) null,
-	is_main_in_channel tinyint(1) default 0 not null,
-	p2p tinyint(1) default 0 not null,
-	channel_id int null,
-	creator_id int null,
-	constraint id
-		unique (id)
-);
-
-create or replace table message
-(
-	id int auto_increment,
-	sender_id int not null,
-	room_id int not null,
-	time datetime not null,
-	content longtext null,
-	giphy varchar(255) null,
-	symbol varchar(1) null,
-	message_status enum('ON_SERVER', 'READ', 'RECEIVED') not null,
-	thread_message_count int default 0 not null,
-	parent_message_id int null,
-	constraint id
-		unique (id)
-);
-
-create or replace table image
-(
-	id int auto_increment
-	    primary key,
-	type enum('VIDEO', 'IMAGE', 'GIPHY') not null,
-	symbol varchar(1) not null,
-	message_id int not null,
-	img varchar(255) null,
-	preview varchar(255) null,
-	absolute_url varchar(255) null,
-	webp_asbolute_url varchar(255) null,
-	constraint id
-		unique (id),
-	constraint unique_image_symbol_message
-		unique (symbol, message_id)
-);
-
-create or replace table message_history
-(
-	id int auto_increment
-	    primary key,
-	message_id int not null,
-	time datetime not null,
-	content longtext not null,
-	constraint id
-		unique (id)
-);
-
-create or replace table message_mention
-(
-	id int not null
-	    primary key,
-	user_id int not null,
-	message_id int not null,
-	symbol varchar(1) not null,
-	constraint id
-		unique (id),
-	constraint unique_message_mention_user_id_symbol_message_id
-		unique (user_id, message_id, symbol)
-);
-
-create or replace table room_user
-(
-	id int auto_increment
-	    primary key,
-	room_id int not null,
-	user_id int not null,
-	volume int default 2 not null,
-	notifications tinyint(1) default 1 not null,
-	constraint id
-		unique (id),
-	constraint unique_room_user_room_id_user_id
-		unique (room_id, user_id)
-);
-
-create or replace table subscription
-(
-	id int auto_increment
-	    primary key,
-	user_id int not null,
-	registration_id varchar(255) not null,
-	agent varchar(64) null,
-	is_mobile tinyint(1) default 0 not null,
-	ip_id int null,
-	constraint id
-		unique (id),
-	constraint registration_id
-		unique (registration_id)
-);
-
-create or replace table subscription_message
-(
-	id int auto_increment
-	    primary key (id),
-	subscription_id int not null,
-	message_id int not null,
-	received tinyint(1) default 0 not null,
-	constraint id
-		unique (id),
-	constraint unique_subscription_message_subscription_id_message_id
-		unique (subscription_id, message_id)
-);
-
-create or replace table uploaded_file
-(
-	id int auto_increment
-	    primary key,
-	type enum('VIDEO', 'FILE', 'MEDIA_RECORD', 'AUDIO_RECORD', 'IMAGE', 'PREVIEW', 'ISSUE') not null,
-	symbol varchar(1) not null,
-	user_id int not null,
-	file varchar(255) not null,
-	constraint id
-		unique (id)
-);
-
-create or replace table user_joined_info
-(
-	id int auto_increment,
-	ip_id int not null,
-	user_id int not null,
-	time datetime not null,
-	constraint id
-		unique (id),
-	constraint unique_user_joined_info_user_id_ip_id
-		unique (ip_id, user_id)
-);
-
-create or replace table verification
-(
-	id int auto_increment,
-	type enum('REGISTER', 'PASSWORD', 'EMAIL', 'CONFIRM_EMAIL') not null,
-	token varchar(17) not null,
-	user_id int not null,
-	time datetime not null,
-	verified tinyint(1) default 0 not null,
-	email varchar(190) null,
-	constraint id
-		unique (id)
-);
-
-create or replace table user_auth
-(
-	id int not null
-	    primary key (id),
-	password varchar(255) not null,
-	email varchar(255) null,
-	facebook_id varchar(255) null,
-	google_id datetime null,
-	email_verification_id datetime null,
-	constraint email
-		unique (email),
-	constraint facebook_id
-		unique (facebook_id),
-	constraint google_id
-		unique (google_id),
-	constraint id
-		unique (id)
-);
-
-create or replace table user_settings
-(
-	id int not null,
-	suggestions tinyint(1) default 1 not null,
-	show_when_im_typing tinyint(1) default 1 not null,
-	embedded_youtube tinyint(1) default 1 not null,
-	highlight_code tinyint(1) default 1 not null,
-	message_sound tinyint(1) default 0 not null,
-	incoming_file_call_sound tinyint(1) default 0 not null,
-	online_change_messages tinyint(1) default 0 not null,
-	devtools_logs enum('log_raise_error', 'log_with_warnings', 'trace', 'debug', 'info', 'warn', 'error', 'disable') default 'error' not null,
-	theme enum('COLOR_LOR', 'COLOR_REG', 'COLOR_WHITE') default 'COLOR_REG' not null,
-	constraint id
-		unique (id)
-);
-
-create or replace table user_profile
-(
-	id int not null,
-	name varchar(30) null,
-	city varchar(50) null,
-	surname varchar(30) null,
-	birthday datetime not null,
-	contacts varchar(100) null,
-	constraint id
-		unique (id)
-);

From 3d1680ca3b7577cb647f36be2405b3cb42f937ab Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 11 Apr 2022 14:03:47 +0300
Subject: [PATCH 009/221] Fixed patch + created name

---
 newback/.gitignore                            |   5 +
 .../migration-template/202204110326-init.sql  | 290 ++++++++++++++++++
 newback/config/migration/.gitkeep             |   0
 newback/package.json                          |   4 +-
 .../data/database/model/user.auth.model.ts    |   4 +-
 newback/src/data/database/ormconfig.ts        |   2 +-
 newback/src/data/types/dto                    |   1 +
 newback/src/migration.runner.ts               |  41 ++-
 newback/yarn.lock                             |   8 +-
 9 files changed, 333 insertions(+), 22 deletions(-)
 create mode 100644 newback/config/migration-template/202204110326-init.sql
 create mode 100644 newback/config/migration/.gitkeep
 create mode 120000 newback/src/data/types/dto

diff --git a/newback/.gitignore b/newback/.gitignore
index 14ec4464c..ef314b4c1 100644
--- a/newback/.gitignore
+++ b/newback/.gitignore
@@ -1,3 +1,8 @@
 node_modules
 yarn-error.log
 dist
+# exclude everything
+config/migration/*
+
+# exception to the rule
+!config/migration/.gitkeep
diff --git a/newback/config/migration-template/202204110326-init.sql b/newback/config/migration-template/202204110326-init.sql
new file mode 100644
index 000000000..b6c7b5819
--- /dev/null
+++ b/newback/config/migration-template/202204110326-init.sql
@@ -0,0 +1,290 @@
+-- set force = true in sequelize.config.js
+
+CREATE TABLE `user`
+(
+    `id`               INTEGER auto_increment,
+    `last_time_online` DATETIME                         NOT NULL,
+    `username`         VARCHAR(16)                      NOT NULL UNIQUE,
+    `sex`              ENUM ('MALE', 'FEMALE', 'OTHER') NOT NULL DEFAULT 'OTHER',
+    `thumbnail`        VARCHAR(100)                              DEFAULT NULL,
+    `created_at`       DATETIME                         NOT NULL,
+    `updated_at`       DATETIME                         NOT NULL,
+    `deleted_at`       DATETIME,
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `channel`
+(
+    `id`         INTEGER auto_increment,
+    `name`       VARCHAR(16) NOT NULL,
+    `creator_id` INTEGER,
+    `created_at` DATETIME    NOT NULL,
+    `updated_at` DATETIME    NOT NULL,
+    `deleted_at` DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`creator_id`) REFERENCES `user` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `room`
+(
+    `id`                 INTEGER auto_increment,
+    `name`               VARCHAR(16),
+    `is_main_in_channel` TINYINT(1) NOT NULL DEFAULT false,
+    `p2p`                TINYINT(1) NOT NULL DEFAULT false,
+    `channel_id`         INTEGER             DEFAULT NULL,
+    `creator_id`         INTEGER             DEFAULT NULL,
+    `created_at`         DATETIME   NOT NULL,
+    `updated_at`         DATETIME   NOT NULL,
+    `deleted_at`         DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`channel_id`) REFERENCES `channel` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+    FOREIGN KEY (`creator_id`) REFERENCES `user` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+    constraint admin_should_not_be_define_for_private_rooms check (`creator_id` is null or `name` is not null),
+    constraint channel_should_exist_for_public_room_and_not_exist_for_private check (`channel_id` is null and `name` is null or `channel_id` is not null),
+    constraint p2p_only_if_private check (`p2p` = 0x00 or `name` is null)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `message`
+(
+    `id`                   INTEGER auto_increment,
+    `sender_id`            INTEGER                                NOT NULL,
+    `room_id`              INTEGER                                NOT NULL,
+    `time`                 BIGINT                                 NOT NULL,
+    `content`              LONGTEXT,
+    `symbol`               VARCHAR(1),
+    `message_status`       ENUM ('ON_SERVER', 'READ', 'RECEIVED') NOT NULL,
+    `thread_message_count` INTEGER                                NOT NULL DEFAULT 0,
+    `parent_message_id`    INTEGER,
+    `created_at`           DATETIME                               NOT NULL,
+    `updated_at`           DATETIME                               NOT NULL,
+    `deleted_at`           DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`sender_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`room_id`) REFERENCES `room` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`parent_message_id`) REFERENCES `message` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `image`
+(
+    `id`                INTEGER auto_increment,
+    `type`              ENUM ('VIDEO', 'IMAGE', 'GIPHY') NOT NULL,
+    `symbol`            VARCHAR(1)                       NOT NULL,
+    `message_id`        INTEGER                          NOT NULL,
+    `img`               VARCHAR(255),
+    `preview`           VARCHAR(255),
+    `absolute_url`      VARCHAR(255),
+    `webp_asbolute_url` VARCHAR(255),
+    `created_at`        DATETIME                         NOT NULL,
+    `updated_at`        DATETIME                         NOT NULL,
+    `deleted_at`        DATETIME,
+    UNIQUE `unique_image_symbol_message` (`symbol`, `message_id`),
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`message_id`) REFERENCES `message` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `ip_address`
+(
+    `id`           INTEGER auto_increment,
+    `ip`           VARCHAR(32) NOT NULL UNIQUE,
+    `isp`          VARCHAR(255),
+    `country_code` VARCHAR(16),
+    `country`      VARCHAR(64),
+    `region`       VARCHAR(64),
+    `city`         VARCHAR(64),
+    `lat`          DOUBLE PRECISION,
+    `lon`          DOUBLE PRECISION,
+    `zip`          VARCHAR(32),
+    `timezone`     VARCHAR(32),
+    `created_at`   DATETIME    NOT NULL,
+    `updated_at`   DATETIME    NOT NULL,
+    `deleted_at`   DATETIME,
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `message_history`
+(
+    `id`         INTEGER auto_increment,
+    `message_id` INTEGER  NOT NULL,
+    `time`       BIGINT   NOT NULL,
+    `content`    LONGTEXT,
+    `created_at` DATETIME NOT NULL,
+    `updated_at` DATETIME NOT NULL,
+    `deleted_at` DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`message_id`) REFERENCES `message` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `message_mention`
+(
+    `id`         INTEGER auto_increment,
+    `user_id`    INTEGER    NOT NULL,
+    `message_id` INTEGER    NOT NULL,
+    `symbol`     VARCHAR(1) NOT NULL,
+    `created_at` DATETIME   NOT NULL,
+    `updated_at` DATETIME   NOT NULL,
+    `deleted_at` DATETIME,
+    UNIQUE `unique_message_mention_user_id_symbol_message_id` (`user_id`, `message_id`, `symbol`),
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`message_id`) REFERENCES `message` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `room_user`
+(
+    `id`            INTEGER auto_increment,
+    `room_id`       INTEGER    NOT NULL,
+    `user_id`       INTEGER    NOT NULL,
+    `volume`        INTEGER    NOT NULL DEFAULT 2,
+    `notifications` TINYINT(1) NOT NULL DEFAULT true,
+    `created_at`    DATETIME   NOT NULL,
+    `updated_at`    DATETIME   NOT NULL,
+    `deleted_at`    DATETIME,
+    UNIQUE `unique_room_user_room_id_user_id` (`room_id`, `user_id`),
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`room_id`) REFERENCES `room` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `subscription`
+(
+    `id`              INTEGER auto_increment,
+    `user_id`         INTEGER      NOT NULL,
+    `registration_id` VARCHAR(255) NOT NULL UNIQUE,
+    `agent`           VARCHAR(64),
+    `is_mobile`       TINYINT(1)   NOT NULL DEFAULT false,
+    `ip_id`           INTEGER,
+    `created_at`      DATETIME     NOT NULL,
+    `updated_at`      DATETIME     NOT NULL,
+    `deleted_at`      DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`ip_id`) REFERENCES `ip_address` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `subscription_message`
+(
+    `id`              INTEGER auto_increment,
+    `subscription_id` INTEGER    NOT NULL,
+    `message_id`      INTEGER    NOT NULL,
+    `received`        TINYINT(1) NOT NULL DEFAULT false,
+    `created_at`      DATETIME   NOT NULL,
+    `updated_at`      DATETIME   NOT NULL,
+    `deleted_at`      DATETIME,
+    UNIQUE `unique_subscription_message_subscription_id_message_id` (`subscription_id`, `message_id`),
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`subscription_id`) REFERENCES `subscription` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`message_id`) REFERENCES `message` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `uploaded_file`
+(
+    `id`         INTEGER auto_increment,
+    `type`       ENUM ('VIDEO', 'FILE', 'MEDIA_RECORD', 'AUDIO_RECORD', 'IMAGE', 'PREVIEW', 'ISSUE') NOT NULL,
+    `symbol`     VARCHAR(1)                                                                          NOT NULL,
+    `user_id`    INTEGER                                                                             NOT NULL,
+    `file`       VARCHAR(255)                                                                        NOT NULL,
+    `created_at` DATETIME                                                                            NOT NULL,
+    `updated_at` DATETIME                                                                            NOT NULL,
+    `deleted_at` DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `verification`
+(
+    `id`         INTEGER auto_increment,
+    `type`       ENUM ('REGISTER', 'PASSWORD', 'EMAIL', 'CONFIRM_EMAIL') NOT NULL,
+    `token`      VARCHAR(17)                                             NOT NULL,
+    `user_id`    INTEGER                                                 NOT NULL,
+    `time`       DATETIME                                                NOT NULL,
+    `verified`   TINYINT(1)                                              NOT NULL DEFAULT false,
+    `email`      VARCHAR(190),
+    `created_at` DATETIME                                                NOT NULL,
+    `updated_at` DATETIME                                                NOT NULL,
+    `deleted_at` DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `user_auth`
+(
+    `id`                    INTEGER,
+    `password`              VARCHAR(255) NOT NULL,
+    `email`                 VARCHAR(255) UNIQUE,
+    `facebook_id`           VARCHAR(255) UNIQUE,
+    `google_id`             DATETIME UNIQUE,
+    `email_verification_id` INTEGER,
+    `created_at`            DATETIME     NOT NULL,
+    `updated_at`            DATETIME     NOT NULL,
+    `deleted_at`            DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`email_verification_id`) REFERENCES `verification` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `user_joined_info`
+(
+    `id`         INTEGER auto_increment,
+    `ip_id`      INTEGER  NOT NULL,
+    `user_id`    INTEGER  NOT NULL,
+    `time`       DATETIME NOT NULL,
+    `created_at` DATETIME NOT NULL,
+    `updated_at` DATETIME NOT NULL,
+    `deleted_at` DATETIME,
+    UNIQUE `unique_user_joined_info_user_id_ip_id` (`ip_id`, `user_id`),
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`ip_id`) REFERENCES `ip_address` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `user_profile`
+(
+    `id`         INTEGER,
+    `name`       VARCHAR(30),
+    `city`       VARCHAR(50),
+    `surname`    VARCHAR(30),
+    `birthday`   DATETIME NOT NULL,
+    `contacts`   VARCHAR(100),
+    `created_at` DATETIME NOT NULL,
+    `updated_at` DATETIME NOT NULL,
+    `deleted_at` DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+CREATE TABLE `user_settings`
+(
+    `id`                       INTEGER,
+    `suggestions`              TINYINT(1)                                                                                          NOT NULL DEFAULT true,
+    `show_when_im_typing`      TINYINT(1)                                                                                          NOT NULL DEFAULT true,
+    `embedded_youtube`         TINYINT(1)                                                                                          NOT NULL DEFAULT true,
+    `highlight_code`           TINYINT(1)                                                                                          NOT NULL DEFAULT true,
+    `message_sound`            TINYINT(1)                                                                                          NOT NULL DEFAULT false,
+    `incoming_file_call_sound` TINYINT(1)                                                                                          NOT NULL DEFAULT false,
+    `online_change_messages`   TINYINT(1)                                                                                          NOT NULL DEFAULT false,
+    `devtools_logs`            ENUM ('log_raise_error', 'log_with_warnings', 'trace', 'debug', 'info', 'warn', 'error', 'disable') NOT NULL DEFAULT 'error',
+    `theme`                    ENUM ('COLOR_LOR', 'COLOR_REG', 'COLOR_WHITE')                                                      NOT NULL DEFAULT 'COLOR_REG',
+    `created_at`               DATETIME                                                                                            NOT NULL,
+    `updated_at`               DATETIME                                                                                            NOT NULL,
+    `deleted_at`               DATETIME,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
diff --git a/newback/config/migration/.gitkeep b/newback/config/migration/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/newback/package.json b/newback/package.json
index f30fb8b5c..908cdb169 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "generate-configs": "node node_modules/node-config-ts/bin/cli",
-    "migrate": "ts-node ./src/migration.runner.ts \n",
+    "migrate": "ts-node  -r tsconfig-paths/register ./src/migration.runner.ts ",
     "build": "nest build",
     "start": "nest start",
     "start:dev": "node --inspect=0.0.0.0 dist/src/main",
@@ -25,7 +25,7 @@
     "lines-logger": "^2.1.2",
     "mysql2": "^2.3.3",
     "node-config-ts": "npm:node-config-ts-2",
-    "node-db-migration": "^1.3.3",
+    "node-db-migration": "^1.4.0",
     "npm": "^8.6.0",
     "pg": "^8.7.3",
     "redis": "^4.0.6",
diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/database/model/user.auth.model.ts
index 8e94ae0e2..cd5045f9f 100644
--- a/newback/src/data/database/model/user.auth.model.ts
+++ b/newback/src/data/database/model/user.auth.model.ts
@@ -54,10 +54,10 @@ export class UserAuthModel extends Model<UserAuthModel> {
 
   @ForeignKey(() => VerificationModel)
   @Column({
-    type: DataType.DATE,
+    type: DataType.INTEGER,
     allowNull: true,
   })
-  public emailVerificationId: string;
+  public emailVerificationId: number;
 
   @BelongsTo(() => VerificationModel)
   public emailVerification: VerificationModel;
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/data/database/ormconfig.ts
index 45f8f9800..a5cd231f4 100644
--- a/newback/src/data/database/ormconfig.ts
+++ b/newback/src/data/database/ormconfig.ts
@@ -2,7 +2,7 @@ import type {SequelizeModuleOptions} from '@nestjs/sequelize';
 import {config} from 'node-config-ts';
 
 
-export function generateConfig(logging: ((sql: string) => void)): SequelizeModuleOptions {
+export function generateConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, 'ssl'> {
   return {
     synchronize: config.mysql.synchronize,
     logging: config.mysql.logging ? logging : false,
diff --git a/newback/src/data/types/dto b/newback/src/data/types/dto
new file mode 120000
index 000000000..3f6330a4b
--- /dev/null
+++ b/newback/src/data/types/dto
@@ -0,0 +1 @@
+../../../../common/
\ No newline at end of file
diff --git a/newback/src/migration.runner.ts b/newback/src/migration.runner.ts
index af7cb69e5..fc706e3d1 100644
--- a/newback/src/migration.runner.ts
+++ b/newback/src/migration.runner.ts
@@ -1,15 +1,30 @@
-import mysql2 from 'mysql2';
-import {CommandsRunner, MysqlDriver} from 'node-db-migration';
-var connection = mysql2.createConnection({
-    "host" : "localhost",
-    "user" : "root",
-    "database" : "test8",
-    "multipleStatements" : true, // if you have multiple sql in your scripts
+import {createConnection} from 'mysql2';
+import {generateConfig} from '@/data/database/ormconfig';
+import {
+  CommandsRunner,
+  MysqlDriver
+} from 'node-db-migration';
+
+const {database, host, password, port, username, define} = generateConfig((sql) => console.log(sql))
+
+const connection = createConnection({
+  database,
+  host,
+  password,
+  port,
+  user: username,
+  multipleStatements: true,
+  charset: define.charset,
+  connectAttributes: {
+    'collate': define.collate
+  }
 });
-connection.connect(function(err) {
-    let migrations = new CommandsRunner({
-        driver: new MysqlDriver(connection),
-        directoryWithScripts: __dirname + '/diff',
-    });
-    migrations.run('init')
+
+connection.connect(async function (err) {
+  let migrations = new CommandsRunner({
+    driver: new MysqlDriver(connection),
+    directoryWithScripts: `${__dirname}/../config/migration/`,
+  });
+  await migrations.run('init')
+  await migrations.run('migrate')
 });
diff --git a/newback/yarn.lock b/newback/yarn.lock
index e7af11ddd..693a8427f 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -3222,10 +3222,10 @@ neo-async@^2.6.2:
     prettier "^1.19.1"
     ramda "^0.27.0"
 
-node-db-migration@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/node-db-migration/-/node-db-migration-1.3.3.tgz#e930e39f352afefe90e98521169f4db30eba630c"
-  integrity sha512-OhiBy2+T5zGlenfaoNdh5raNEZEOunJwFAnK8cRZvj4m7Xu2PZrcekkyokhfD23/EC6tYK9IYOdzgFKMFejaoQ==
+node-db-migration@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/node-db-migration/-/node-db-migration-1.4.0.tgz#5616cca04f315fcb15121d60616233adc86db3c6"
+  integrity sha512-g5XDC7gbr6nCcbzBYZj3TojUMxY9YP07k8n1B4Fcgc+/CSPA0SUjK4hUTOrInwB352uaiplg6ijX7J1k7GFE6A==
   dependencies:
     moment "*"
 

From bc62f5ea9d443b0083e2f7b75d7173d3d8ed0ff4 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 00:37:50 +0300
Subject: [PATCH 010/221] Fixed patch + creatated name

---
 backend/templates/sign_up_email.html          |    5 +-
 common/dto.ts                                 |   21 +-
 newback/config/default.json                   |    2 +-
 .../migration-template/202204110326-init.sql  |    2 +-
 newback/config/migration/.gitkeep             |    0
 newback/jest.config.ts                        |   33 +
 newback/package.json                          |   16 +-
 newback/src/data/database/database.module.ts  |   25 +-
 ...20410104137-modify_users_add_new_fields.js |   21 +
 .../data/database/model/user.profile.model.ts |    2 +-
 .../data/database/model/verification.model.ts |    6 -
 newback/src/data/database/ormconfig.ts        |    2 +-
 .../database/repository/room.repository.ts    |   27 +
 .../database/repository/user.repository.ts    |   84 +
 newback/src/data/redis/RedisService.ts        |   22 +
 newback/src/data/utils/consts.ts              |    2 +
 newback/src/main.ts                           |   13 +-
 newback/src/modules/app/app.module.ts         |   28 +-
 newback/src/modules/auth/auth.controller.ts   |   45 +-
 newback/src/modules/auth/auth.module.spec.ts  |  103 +
 newback/src/modules/auth/auth.module.ts       |    8 +-
 newback/src/modules/auth/auth.service.ts      |   64 +-
 .../validators/login.request.validator.ts     |   28 +
 .../sign.up.request.validator.ts}             |   21 +-
 .../validate.user.request.validator.ts        |   26 +
 newback/src/modules/email/email.service.ts    |   30 +
 newback/src/modules/html/html.service.spec.ts |   45 +
 newback/src/modules/html/html.service.ts      |   25 +
 newback/src/modules/logger/interceptor.ts     |   37 +
 newback/src/modules/logger/logger.module.ts   |    4 +-
 .../src/modules/password/password.service.ts  |   29 +
 newback/src/templates/token_email.html        |    4 +-
 newback/yarn.lock                             | 3563 ++++++++++-------
 package.json                                  |   62 -
 34 files changed, 2914 insertions(+), 1491 deletions(-)
 delete mode 100644 newback/config/migration/.gitkeep
 create mode 100644 newback/jest.config.ts
 create mode 100644 newback/src/data/database/migration/20220410104137-modify_users_add_new_fields.js
 create mode 100644 newback/src/data/database/repository/room.repository.ts
 create mode 100644 newback/src/data/database/repository/user.repository.ts
 create mode 100644 newback/src/data/redis/RedisService.ts
 create mode 100644 newback/src/data/utils/consts.ts
 create mode 100644 newback/src/modules/auth/auth.module.spec.ts
 create mode 100644 newback/src/modules/auth/validators/login.request.validator.ts
 rename newback/src/modules/auth/{interfaces.ts => validators/sign.up.request.validator.ts} (68%)
 create mode 100644 newback/src/modules/auth/validators/validate.user.request.validator.ts
 create mode 100644 newback/src/modules/email/email.service.ts
 create mode 100644 newback/src/modules/html/html.service.spec.ts
 create mode 100644 newback/src/modules/html/html.service.ts
 create mode 100644 newback/src/modules/logger/interceptor.ts
 create mode 100644 newback/src/modules/password/password.service.ts
 delete mode 100644 package.json

diff --git a/backend/templates/sign_up_email.html b/backend/templates/sign_up_email.html
index 2d75d6399..231574ba1 100644
--- a/backend/templates/sign_up_email.html
+++ b/backend/templates/sign_up_email.html
@@ -1,5 +1,6 @@
 <h2 style="color: #102a80">Hello, {{ username }}!</h2>
-<p>{{ greetings }}</p>
+<p>You have registered in <b>Pychat</b>. If you find any bugs or propositions you can post them
+  <a href='{{ issueReportLink }}}'>here</a>. To complete your registration please click on the link below.</p>
 <div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
     <a href="{{ magicLink }}" style="font-size: 20px;
     line-height: 26px;
@@ -34,4 +35,4 @@ <h2 style="color: #102a80">Hello, {{ username }}!</h2>
         font-weight: normal;
         text-decoration: none;
         word-break: break-word">{{ magicLink }}</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/common/dto.ts b/common/dto.ts
index 9a73b2bfa..fc8cd2bdb 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -3,6 +3,25 @@ export interface LoginRequest {
   password: string;
 }
 
+export interface ValidateUserRequest {
+  username: string;
+}
+
+export interface ValidateUserResponse {
+  ok: boolean;
+}
+
+export interface SignUpRequest {
+  username: string;
+  password: string;
+  email?: string;
+  sex?: Gender;
+}
+
+export interface SignUpResponse {
+  session: string;
+}
+
 // ISO/IEC 5218 1 male, 2 - female
 export enum Gender {
   MALE = 'MALE',
@@ -24,7 +43,7 @@ export enum Theme {
 
 export enum VerificationType {
   REGISTER = 'REGISTER',
-  PASSWORD = '  PASSWORD = \'p\',\n',
+  PASSWORD = 'PASSWORD',
   EMAIL = 'EMAIL',
   CONFIRM_EMAIL = 'CONFIRM_EMAIL',
 }
diff --git a/newback/config/default.json b/newback/config/default.json
index c4dfa7eae..8f309b304 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -36,7 +36,7 @@
     }
   },
   "mysql": {
-    "synchronize": true,
+    "synchronize": false,
     "logging": true,
     "host": "localhost",
     "port": 3306,
diff --git a/newback/config/migration-template/202204110326-init.sql b/newback/config/migration-template/202204110326-init.sql
index b6c7b5819..b0753bd11 100644
--- a/newback/config/migration-template/202204110326-init.sql
+++ b/newback/config/migration-template/202204110326-init.sql
@@ -258,7 +258,7 @@ CREATE TABLE `user_profile`
     `name`       VARCHAR(30),
     `city`       VARCHAR(50),
     `surname`    VARCHAR(30),
-    `birthday`   DATETIME NOT NULL,
+    `birthday`   DATETIME NULL,
     `contacts`   VARCHAR(100),
     `created_at` DATETIME NOT NULL,
     `updated_at` DATETIME NOT NULL,
diff --git a/newback/config/migration/.gitkeep b/newback/config/migration/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/newback/jest.config.ts b/newback/jest.config.ts
new file mode 100644
index 000000000..726f03b30
--- /dev/null
+++ b/newback/jest.config.ts
@@ -0,0 +1,33 @@
+import type {Config} from '@jest/types';
+const tsconfig = require("./tsconfig.json")
+const moduleNameMapper = require("tsconfig-paths-jest")(tsconfig)
+
+// Sync object
+const config: Config.InitialOptions = {
+  verbose: true,
+};
+
+export default async(): Promise<Config.InitialOptions> => {
+  return {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coveragePathIgnorePatterns": [
+      "/node_modules/",
+      "/dist/",
+      ".dto.ts$"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node",
+    moduleNameMapper,
+  }
+};
diff --git a/newback/package.json b/newback/package.json
index 908cdb169..fd7b21bca 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -18,17 +18,15 @@
     "@nestjs/platform-express": "^8.4.4",
     "@nestjs/sequelize": "^8.0.0",
     "@nestjs/swagger": "^5.2.1",
+    "@types/bcrypt": "^5.0.0",
+    "bcrypt": "^5.0.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
-    "csv-parse": "^5.0.4",
-    "i": "^0.3.7",
+    "ioredis": "^5.0.4",
     "lines-logger": "^2.1.2",
     "mysql2": "^2.3.3",
     "node-config-ts": "npm:node-config-ts-2",
     "node-db-migration": "^1.4.0",
-    "npm": "^8.6.0",
-    "pg": "^8.7.3",
-    "redis": "^4.0.6",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7",
     "sequelize": "^6.18.0",
@@ -36,17 +34,25 @@
     "swagger-ui-express": "^4.3.0"
   },
   "devDependencies": {
+    "@nestjs-modules/ioredis": "^1.0.0",
     "@nestjs/cli": "^8.2.5",
     "@nestjs/schematics": "^8.0.10",
     "@nestjs/testing": "^8.4.4",
     "@types/express": "^4.17.13",
+    "@types/jest": "^27.4.1",
     "@types/node": "^17.0.23",
     "@types/sequelize": "^4.28.11",
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "eslint": "^8.12.0",
+    "eslint-plugin-jest": "^26.1.4",
+    "jest": "^27.5.1",
+    "jest-runner-eslint": "^1.0.0",
+    "supertest": "^6.2.2",
+    "ts-jest": "^27.1.4",
     "ts-loader": "^9.2.8",
     "ts-node": "^10.7.0",
+    "tsconfig-paths-jest": "^0.0.1",
     "typescript": "^4.6.3"
   }
 }
diff --git a/newback/src/data/database/database.module.ts b/newback/src/data/database/database.module.ts
index 81312e0be..b135bcf43 100644
--- a/newback/src/data/database/database.module.ts
+++ b/newback/src/data/database/database.module.ts
@@ -1,11 +1,7 @@
-import {
-  ConsoleLogger,
-  Module
-} from '@nestjs/common';
-import { SequelizeModule } from '@nestjs/sequelize';
+import {Module} from '@nestjs/common';
+import {SequelizeModule} from '@nestjs/sequelize';
 
-import {generateConfig } from '@/data/database/ormconfig';
-import { Sequelize } from 'sequelize-typescript';
+import {generateConfig} from '@/data/database/ormconfig';
 import {ChannelModel} from '@/data/database/model/channel.model';
 import {ImageModel} from '@/data/database/model/image.model';
 import {IpAddressModel} from '@/data/database/model/ip.address.model';
@@ -23,26 +19,23 @@ import {UserModel} from '@/data/database/model/user.model';
 import {UserProfileModel} from '@/data/database/model/user.profile.model';
 import {UserSettingsModel} from '@/data/database/model/user.settings.model';
 import {VerificationModel} from '@/data/database/model/verification.model';
-import {
-  Logger,
-  LoggerService
-} from '@nestjs/common/services/logger.service';
-import {LoggerModule} from '@/modules/logger/logger.module';
+import {Logger} from '@nestjs/common/services/logger.service';
+import {UserRepository} from '@/data/database/repository/user.repository';
+import {RoomRepository} from '@/data/database/repository/room.repository';
 
 const repositories = [
-
+  UserRepository,
+  RoomRepository,
 ];
 
-
 @Module({
   imports: [
     SequelizeModule.forRootAsync({
       inject: [Logger],
-      imports: [LoggerModule],
       useFactory: (logger: Logger) => generateConfig((sql) => logger.debug(sql)),
     }),
     SequelizeModule.forFeature([
-     ChannelModel,
+      ChannelModel,
       ImageModel,
       IpAddressModel,
       MessageHistoryModel,
diff --git a/newback/src/data/database/migration/20220410104137-modify_users_add_new_fields.js b/newback/src/data/database/migration/20220410104137-modify_users_add_new_fields.js
new file mode 100644
index 000000000..a740c9a27
--- /dev/null
+++ b/newback/src/data/database/migration/20220410104137-modify_users_add_new_fields.js
@@ -0,0 +1,21 @@
+'use strict';
+
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    /**
+     * Add altering commands here.
+     *
+     * Example:
+     * await queryInterface.createTable('users', { id: Sequelize.INTEGER });
+     */
+  },
+
+  async down (queryInterface, Sequelize) {
+    /**
+     * Add reverting commands here.
+     *
+     * Example:
+     * await queryInterface.dropTable('users');
+     */
+  }
+};
diff --git a/newback/src/data/database/model/user.profile.model.ts b/newback/src/data/database/model/user.profile.model.ts
index dfae80c29..095a95d72 100644
--- a/newback/src/data/database/model/user.profile.model.ts
+++ b/newback/src/data/database/model/user.profile.model.ts
@@ -44,7 +44,7 @@ export class UserProfileModel extends Model<UserProfileModel> {
 
   @Column({
     type: DataType.DATE,
-    allowNull: false,
+    allowNull: true,
   })
   public birthday: Date;
 
diff --git a/newback/src/data/database/model/verification.model.ts b/newback/src/data/database/model/verification.model.ts
index 633a125cb..7947c7a5f 100644
--- a/newback/src/data/database/model/verification.model.ts
+++ b/newback/src/data/database/model/verification.model.ts
@@ -43,12 +43,6 @@ export class VerificationModel extends Model<VerificationModel> {
   @BelongsTo(() => UserModel)
   public user: UserModel;
 
-  @Column({
-    type: DataType.DATE,
-    allowNull: false,
-  })
-  public time: Date;
-
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/data/database/ormconfig.ts
index a5cd231f4..4f65066d2 100644
--- a/newback/src/data/database/ormconfig.ts
+++ b/newback/src/data/database/ormconfig.ts
@@ -14,7 +14,7 @@ export function generateConfig(logging: ((sql: string) => void)): Omit<Sequelize
     database: config.mysql.database,
     autoLoadModels: true,
     sync: {
-      force: true,
+      force: config.mysql.synchronize,
     },
     define: {
       collate: 'utf8mb4_general_ci',
diff --git a/newback/src/data/database/repository/room.repository.ts b/newback/src/data/database/repository/room.repository.ts
new file mode 100644
index 000000000..099bc737f
--- /dev/null
+++ b/newback/src/data/database/repository/room.repository.ts
@@ -0,0 +1,27 @@
+import {Injectable} from '@nestjs/common';
+import {InjectModel} from '@nestjs/sequelize';
+import {UserModel} from '@/data/database/model/user.model';
+import {UserAuthModel} from '@/data/database/model/user.auth.model';
+import {SignUpRequest} from '@/data/types/dto/dto';
+import {UserProfileModel} from '@/data/database/model/user.profile.model';
+import {UserSettingsModel} from '@/data/database/model/user.settings.model';
+import {RoomModel} from '@/data/database/model/room.model';
+import {RoomUsersModel} from '@/data/database/model/room.users.model';
+
+
+@Injectable()
+export class RoomRepository {
+  public constructor(
+    @InjectModel(RoomModel) private readonly roomModel: typeof RoomModel,
+    @InjectModel(RoomUsersModel) private readonly roomUsersModel: typeof RoomUsersModel,
+  ) {
+  }
+
+  public async createRoomUser(roomId: number, userId: number) {
+    await this.roomUsersModel.create({
+      roomId,
+      userId,
+      notifications: false,
+    })
+  }
+}
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/data/database/repository/user.repository.ts
new file mode 100644
index 000000000..80e78102d
--- /dev/null
+++ b/newback/src/data/database/repository/user.repository.ts
@@ -0,0 +1,84 @@
+import {Injectable} from '@nestjs/common';
+import {InjectModel} from '@nestjs/sequelize';
+import {UserModel} from '@/data/database/model/user.model';
+import {UserAuthModel} from '@/data/database/model/user.auth.model';
+import {
+  SignUpRequest,
+  VerificationType
+} from '@/data/types/dto/dto';
+import {UserProfileModel} from '@/data/database/model/user.profile.model';
+import {UserSettingsModel} from '@/data/database/model/user.settings.model';
+import {VerificationModel} from '@/data/database/model/verification.model';
+
+
+@Injectable()
+export class UserRepository {
+  public constructor(
+    @InjectModel(UserModel) private readonly userModel: typeof UserModel,
+    @InjectModel(UserAuthModel) private readonly userAuthModel: typeof UserAuthModel,
+    @InjectModel(UserProfileModel) private readonly userProfileModel: typeof UserProfileModel,
+    @InjectModel(UserSettingsModel) private readonly userSettingsModel: typeof UserSettingsModel,
+    @InjectModel(VerificationModel) private readonly verificationModel: typeof VerificationModel,
+  ) {
+  }
+
+  public async createUser(data: SignUpRequest): Promise<number> {
+    let userModel = await this.userModel.create({
+      username: data.username,
+      lastTimeOnline: new Date(),
+      sex: data.sex
+    })
+    await Promise.all([
+      this.userProfileModel.create({
+        id: userModel.id
+      }),
+      this.userAuthModel.create({
+        password: data.password,
+        email: data.email,
+        id: userModel.id
+      }),
+      this.userSettingsModel.create({
+        id: userModel.id
+      })
+    ])
+    return userModel.id;
+  }
+
+  public async checkUserExistByUserName(username: string): Promise<boolean> {
+    return await this.userModel.findOne({
+      where: {username},
+    }) != null
+  }
+
+   public async createVerification(email: string, userId: number, token: string): Promise<void> {
+    let verification = await this.verificationModel.create({
+      type: VerificationType.REGISTER,
+      email,
+      userId,
+      token,
+    });
+    await this.userAuthModel.update( {
+      emailVerificationId: verification.id,
+    }, {
+      where: {
+        id: userId,
+      }
+    })
+  }
+
+  public async checkUserExistByEmail(email: string): Promise<boolean> {
+    return await this.userAuthModel.findOne({
+      where: {email},
+    }) != null
+  }
+
+  public async getUserByEmail(email: string): Promise<UserAuthModel | null> {
+    return this.userAuthModel.findOne({
+      where: {email},
+      include: [
+        'user', // LEFT OUTER JOIN "id" = "user"."id"
+      ],
+    })
+  }
+
+}
diff --git a/newback/src/data/redis/RedisService.ts b/newback/src/data/redis/RedisService.ts
new file mode 100644
index 000000000..ac85e7d21
--- /dev/null
+++ b/newback/src/data/redis/RedisService.ts
@@ -0,0 +1,22 @@
+import {Injectable} from '@nestjs/common';
+import {SignUpRequest} from '@/data/types/dto/dto';
+import {REDIS_SESSIONS_KEY} from '@/data/utils/consts';
+import {
+  InjectRedis,
+  Redis
+} from '@nestjs-modules/ioredis';
+
+@Injectable()
+export class RedisService {
+
+  constructor(
+    @InjectRedis() private readonly redis: Redis,
+  ) {
+  }
+
+
+  public async saveSession(session: string, userId: number) {
+    await this.redis.hset(REDIS_SESSIONS_KEY, session, userId);
+  }
+
+}
diff --git a/newback/src/data/utils/consts.ts b/newback/src/data/utils/consts.ts
new file mode 100644
index 000000000..142842582
--- /dev/null
+++ b/newback/src/data/utils/consts.ts
@@ -0,0 +1,2 @@
+export const ALL_ROOM_ID = 1;
+export const REDIS_SESSIONS_KEY = 'sessions';
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 8280df3ce..f38db42a0 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -1,17 +1,20 @@
-import { NestFactory } from '@nestjs/core';
-import { AppModule } from '@/modules/app/app.module';
-import { config } from 'node-config-ts';
+import {NestFactory} from '@nestjs/core';
+import {AppModule} from '@/modules/app/app.module';
+import {config} from 'node-config-ts';
 import {
   ConsoleLogger,
+  Logger,
   ValidationPipe
 } from '@nestjs/common';
-
+import {LoggerModule} from '@/modules/logger/logger.module';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule, {
     logger: new ConsoleLogger(),
   });
-  app.useGlobalPipes(new ValidationPipe())
+  app.useGlobalPipes(new ValidationPipe());
+  app.useLogger(app.get(Logger))
   await app.listen(config.application.port);
 }
+
 bootstrap();
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index d16cddd31..4e830fd3a 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -1,11 +1,27 @@
-import {
-  Module
-} from '@nestjs/common';
+import {Module} from '@nestjs/common';
 import {AuthModule} from '@/modules/auth/auth.module';
 import {DatabaseModule} from '@/data/database/database.module';
+import {LoggingInterceptor} from '@/modules/logger/interceptor';
+import {APP_INTERCEPTOR} from '@nestjs/core';
+import {LoggerModule} from '@/modules/logger/logger.module';
+import {RedisModule} from '@nestjs-modules/ioredis';
+import {config} from 'node-config-ts';
 
 @Module({
-  imports: [AuthModule, DatabaseModule],
-  exports: [DatabaseModule]
+  imports: [AuthModule, DatabaseModule, LoggerModule, RedisModule.forRoot({
+    config: {
+      host: config.redis.host,
+      port: config.redis.port,
+      db: config.redis.database,
+    }
+  })],
+  exports: [DatabaseModule],
+  providers: [
+    {
+      provide: APP_INTERCEPTOR,
+      useClass: LoggingInterceptor,
+    },
+  ],
 })
-export class AppModule {}
+export class AppModule {
+}
diff --git a/newback/src/modules/auth/auth.controller.ts b/newback/src/modules/auth/auth.controller.ts
index 0c4cb9a02..cfb88cf9a 100644
--- a/newback/src/modules/auth/auth.controller.ts
+++ b/newback/src/modules/auth/auth.controller.ts
@@ -1,35 +1,38 @@
 import {
   Body,
+  ConflictException,
   Controller,
-  Get,
+  Logger,
   Post
 } from '@nestjs/common';
-import { AuthService } from '@/modules/auth/auth.service';
-import LoginRequestValidator from '@/modules/auth/interfaces';
-import {Sequelize} from 'sequelize';
-import {UserModel} from '@/data/database/model/user.model';
-import {UserSettingsModel} from '@/data/database/model/user.settings.model';
-import {ImageModel} from '@/data/database/model/image.model';
-import {IpAddressModel} from '@/data/database/model/ip.address.model';
-import {MessageHistoryModel} from '@/data/database/model/message.history.model';
-import {MessageMentionModel} from '@/data/database/model/message.mention.model';
-import {MessageModel} from '@/data/database/model/message.model';
-import {RoomModel} from '@/data/database/model/room.model';
-import {RoomUsersModel} from '@/data/database/model/room.users.model';
-import {SubscriptionModel} from '@/data/database/model/subscription.model';
-import {SubscriptionMessageModel} from '@/data/database/model/subscription.message.model';
-import {UploadedFileModel} from '@/data/database/model/uploaded.file.model';
-import {UserAuthModel} from '@/data/database/model/user.auth.model';
-import {UserJoinedInfoModel} from '@/data/database/model/user.joined.info.model';
-import {UserProfileModel} from '@/data/database/model/user.profile.model';
-import {VerificationModel} from '@/data/database/model/verification.model';
+import {AuthService} from '@/modules/auth/auth.service';
+import {LoginRequestValidator} from '@/modules/auth/validators/login.request.validator';
+import {SignUpRequestValidator} from '@/modules/auth/validators/sign.up.request.validator';
+import {ValidateUserRequestValidator} from '@/modules/auth/validators/validate.user.request.validator';
+import {SignUpResponse} from '@/data/types/dto/dto';
 
 @Controller()
 export class AuthController {
-  constructor(private readonly appService: AuthService) {}
+  constructor(
+    private readonly appService: AuthService,
+    private readonly logger: Logger
+  ) {}
 
   @Post('/auth')
   public auth(@Body() body: LoginRequestValidator): string {
     return 'asd';
   }
+
+  @Post('/register')
+  public register(@Body() body: SignUpRequestValidator): SignUpResponse {
+    return this.appService.registerUser(body);
+  }
+
+
+  @Post('/validate_user')
+  public async validateUser(@Body() body: ValidateUserRequestValidator): Promise<void> {
+    await this.appService.validateUser(body.username);
+  }
+
+
 }
diff --git a/newback/src/modules/auth/auth.module.spec.ts b/newback/src/modules/auth/auth.module.spec.ts
new file mode 100644
index 000000000..c55a7b6be
--- /dev/null
+++ b/newback/src/modules/auth/auth.module.spec.ts
@@ -0,0 +1,103 @@
+import {
+  INestApplication,
+  Logger,
+  ValidationPipe
+} from '@nestjs/common';
+import * as supertest from 'supertest';
+import {Test} from '@nestjs/testing';
+import {AuthService} from '@/modules/auth/auth.service';
+import {AuthController} from '@/modules/auth/auth.controller';
+import {LoggerModule} from '@/modules/logger/logger.module';
+import {PasswordService} from '@/modules/password/password.service';
+import {UserRepository} from '@/data/database/repository/user.repository';
+
+describe('AuthModule', () => {
+  let app: INestApplication;
+  let request: () => supertest.SuperTest<supertest.Test>;
+  let userRepository: UserRepository;
+  beforeEach(async() => {
+
+    userRepository = {} as UserRepository;
+    const moduleFixture = await Test.createTestingModule({
+      imports: [LoggerModule],
+      providers: [
+        AuthService,
+        {
+          provide: UserRepository,
+          useValue: userRepository,
+        },
+        Logger,
+        PasswordService,
+      ],
+      controllers: [AuthController]
+    }).compile();
+    app = moduleFixture.createNestApplication();
+    app.useGlobalPipes(new ValidationPipe());
+    await app.init();
+
+    const requestToServer = supertest(app.getHttpServer());
+    request = (): supertest.SuperTest<supertest.Test> => requestToServer;
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  afterAll(() => app.close());
+
+  describe('signup', () => {
+    it('validate request', async() => {
+      const {body} = await request()
+        .post('/register').send({
+          username: 'a',
+          password: 'as$'
+        });
+
+      await expect(body).toStrictEqual({'a': 3});
+    });
+  });
+  describe('validate user', () => {
+    it('should give error on invalid character for username', async() => {
+      const {body} = await request()
+        .post('/validate_user').send({
+          username: '%',
+        });
+
+      await expect(body).toStrictEqual({
+        "error": "Bad Request",
+        "message": [
+          "Username can only contain latin characters, numbers and symbols '-' '_'",
+        ],
+        "statusCode": 400,
+      });
+    });
+    it('should give error if username has great length', async() => {
+      const {body} = await request()
+        .post('/validate_user').send({
+          username: '1234567890123456789',
+        });
+
+      await expect(body).toStrictEqual({
+        "error": "Bad Request",
+        "message": [
+          "Username should be 1-16 characters",
+        ],
+        "statusCode": 400,
+      });
+    });
+  it('should throw an error if user exists', async() => {
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
+
+      const {body} = await request()
+        .post('/validate_user').send({
+          username: 'asd',
+        });
+
+      await expect(body).toStrictEqual({
+        "error": "Conflict",
+        "message": "This user already exist",
+        "statusCode": 409,
+      });
+    });
+  });
+});
diff --git a/newback/src/modules/auth/auth.module.ts b/newback/src/modules/auth/auth.module.ts
index 1095d884b..296bfb122 100644
--- a/newback/src/modules/auth/auth.module.ts
+++ b/newback/src/modules/auth/auth.module.ts
@@ -1,13 +1,15 @@
 import {
-  Logger,
   Module
 } from '@nestjs/common';
 import { AuthController } from '@/modules/auth/auth.controller';
 import { AuthService } from '@/modules/auth/auth.service';
+import {DatabaseModule} from '@/data/database/database.module';
+import {PasswordService} from '@/modules/password/password.service';
+import {RedisService} from '@/data/redis/RedisService';
 
 @Module({
-  imports: [],
+  imports: [DatabaseModule],
   controllers: [AuthController],
-  providers: [AuthService, Logger],
+  providers: [AuthService, PasswordService, RedisService],
 })
 export class AuthModule {}
diff --git a/newback/src/modules/auth/auth.service.ts b/newback/src/modules/auth/auth.service.ts
index 53400c8b7..0fd565648 100644
--- a/newback/src/modules/auth/auth.service.ts
+++ b/newback/src/modules/auth/auth.service.ts
@@ -1,8 +1,66 @@
-import { Injectable } from '@nestjs/common';
+import {
+  ConflictException,
+  Injectable
+} from '@nestjs/common';
+import {UserRepository} from '@/data/database/repository/user.repository';
+import {PasswordService} from '@/modules/password/password.service';
+import {SignUpRequest} from '@/data/types/dto/dto';
+import {RoomRepository} from '@/data/database/repository/room.repository';
+import {ALL_ROOM_ID} from '@/data/utils/consts';
+import {RedisService} from '@/data/redis/RedisService';
+import {EmailService} from '@/modules/email/email.service';
 
 @Injectable()
 export class AuthService {
-  getHello(): string {
-    return 'Hello World!';
+
+  constructor(
+    private readonly userRepository: UserRepository,
+    private readonly roomRepository: RoomRepository,
+    private readonly passwordService: PasswordService,
+    private readonly redisService: RedisService,
+    private readonly emailService: EmailService,
+  ) {
+  }
+
+  public async authorize(email: string): Promise<string> {
+    let user = await this.userRepository.getUserByEmail(email);
+    return user.user.username;
+  }
+
+  private async createUser(data: SignUpRequest) {
+    await this.validateUser(data.username);
+    if (data.email) {
+      await this.validateEmail(data.email)
+    }
+    const password = await this.passwordService.createPassword(data.password);
+    let userId = await this.userRepository.createUser({...data, password})
+    await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId);
+    return userId;
+  }
+
+  public async registerUser(data: SignUpRequest) {
+    let userId = await this.createUser(data);
+    let session = await this.passwordService.generateRandomString(32);
+    await this.redisService.saveSession(session, userId);
+    if (data.email) {
+       let token = await this.passwordService.generateRandomString(32);
+       await this.userRepository.createVerification(data.email, userId, token)
+       await this.emailService.sendSignUpEmail(data.username, data.email, token)
+    }
+    return session;
+  }
+
+  public async validateEmail(email: string): Promise<void> {
+    let exist = await this.userRepository.checkUserExistByEmail(email);
+    if (exist) {
+      throw new ConflictException("User with this email already exist");
+    }
+  }
+
+  public async validateUser(userName: string): Promise<void> {
+    let exist = await this.userRepository.checkUserExistByUserName(userName);
+    if (exist) {
+      throw new ConflictException("User with this username already exist");
+    }
   }
 }
diff --git a/newback/src/modules/auth/validators/login.request.validator.ts b/newback/src/modules/auth/validators/login.request.validator.ts
new file mode 100644
index 000000000..84e84300c
--- /dev/null
+++ b/newback/src/modules/auth/validators/login.request.validator.ts
@@ -0,0 +1,28 @@
+import {
+  IsEmail,
+  IsEnum,
+  IsOptional,
+  IsString,
+  Length,
+  Matches,
+} from 'class-validator';
+import {
+  Gender,
+  LoginRequest,
+  SignUpRequest
+} from '@/data/types/dto/dto';
+import {config} from 'node-config-ts';
+
+export class LoginRequestValidator implements LoginRequest {
+  @IsString()
+  @Matches(/^\S+$/, {
+    message: `Username can't contain whitespaces`
+  })
+  public username: string;
+
+  @IsString()
+  @Matches(/^\S+$/, {
+    message: `Password can't contain whitespaces`
+  })
+  public password: string;
+}
diff --git a/newback/src/modules/auth/interfaces.ts b/newback/src/modules/auth/validators/sign.up.request.validator.ts
similarity index 68%
rename from newback/src/modules/auth/interfaces.ts
rename to newback/src/modules/auth/validators/sign.up.request.validator.ts
index 913c727cc..9f45ec69b 100644
--- a/newback/src/modules/auth/interfaces.ts
+++ b/newback/src/modules/auth/validators/sign.up.request.validator.ts
@@ -1,12 +1,19 @@
 import {
+  IsEmail,
+  IsEnum,
+  IsOptional,
   IsString,
   Length,
   Matches,
 } from 'class-validator';
-import {LoginRequest} from '@/data/types/dto/dto';
+import {
+  Gender,
+  SignUpRequest,
+} from '@/data/types/dto/dto';
 import {config} from 'node-config-ts';
 
-export default class LoginRequestValidator implements LoginRequest {
+export class SignUpRequestValidator implements SignUpRequest {
+
   @IsString()
   @Length(1, config.frontend.maxUserNameLength, {
     message: `Username should be 1-${config.frontend.maxUserNameLength} characters`
@@ -16,6 +23,7 @@ export default class LoginRequestValidator implements LoginRequest {
   })
   public username: string;
 
+
   @IsString()
   @Length(3, 128, {
     message: "Passwords should contain 3-64 symbols"
@@ -24,4 +32,13 @@ export default class LoginRequestValidator implements LoginRequest {
     message: `Password can't contain whitespaces`
   })
   public password: string;
+
+  @IsOptional()
+  @IsEnum(Gender)
+  public sex?: Gender;
+
+  @IsOptional()
+  @IsEmail()
+  public email?: string;
+
 }
diff --git a/newback/src/modules/auth/validators/validate.user.request.validator.ts b/newback/src/modules/auth/validators/validate.user.request.validator.ts
new file mode 100644
index 000000000..6fe0bad3f
--- /dev/null
+++ b/newback/src/modules/auth/validators/validate.user.request.validator.ts
@@ -0,0 +1,26 @@
+import {
+  IsEmail,
+  IsEnum,
+  IsOptional,
+  IsString,
+  Length,
+  Matches,
+} from 'class-validator';
+import {
+  Gender,
+  LoginRequest,
+  SignUpRequest,
+  ValidateUserRequest
+} from '@/data/types/dto/dto';
+import {config} from 'node-config-ts';
+
+export class ValidateUserRequestValidator implements ValidateUserRequest {
+  @IsString()
+  @Length(1, config.frontend.maxUserNameLength, {
+    message: `Username should be 1-${config.frontend.maxUserNameLength} characters`
+  })
+  @Matches(/[a-zA-Z-_0-9]+/, {
+    message: `Username can only contain latin characters, numbers and symbols '-' '_'`
+  })
+  public username: string;
+}
diff --git a/newback/src/modules/email/email.service.ts b/newback/src/modules/email/email.service.ts
new file mode 100644
index 000000000..83d0516bf
--- /dev/null
+++ b/newback/src/modules/email/email.service.ts
@@ -0,0 +1,30 @@
+import {Injectable} from '@nestjs/common';
+import {config} from 'node-config-ts';
+
+@Injectable()
+export class EmailService {
+  public constructor() {
+  }
+
+
+  public sendSignUpEmail(username: string, email: string, token) {
+		const link = `${config.frontend.address}/#/confirm_email?token=${token}`;
+		const text = `Hi ${username}, you have registered pychat` +
+						`\nTo complete your registration please click on the url bellow: ${link}` +
+						`\n\nIf you find any bugs or propositions you can post them ${config.frontend.issueReportLink}`;
+)
+		self.logger.info('Sending verification email to userId %s (email %s)', user.id, user.email)
+		yield self.__send_mail(
+			"Confirm chat registration",
+			text,
+			user.email,
+			html_message,
+			True
+		)
+
+  }
+
+  public async sendEmail(templateId: 'change_email' | 'change_password' | 'sign_up_email' | 'token_email', params: Record<string, string>): Promise<void> {
+    void 0;
+  }
+}
diff --git a/newback/src/modules/html/html.service.spec.ts b/newback/src/modules/html/html.service.spec.ts
new file mode 100644
index 000000000..24010478f
--- /dev/null
+++ b/newback/src/modules/html/html.service.spec.ts
@@ -0,0 +1,45 @@
+import {HtmlService} from '@/modules/html/html.service';
+
+describe('HtmlService', () => {
+
+  describe('replaceTemplate', () => {
+    it('should replace single param',  () => {
+      let service = new HtmlService();
+      let result = service.replaceTemplate('aa {{ blah }} bbbb', {blah: 3})
+      expect(result).toEqual('aa 3 bbbb');
+    });
+
+     it('should replace multiple params',  () => {
+      let service = new HtmlService();
+      let result = service.replaceTemplate('aa {{ blah }} {{koko}}', {blah: 3, koko: 4})
+      expect(result).toEqual('aa 3 4');
+    });
+
+    it('should not fail when empty',  () => {
+      let service = new HtmlService();
+      let result = service.replaceTemplate('aa', {})
+      expect(result).toEqual('aa');
+    });
+
+     it('should throw an exception when param is missing',  () => {
+      let service = new HtmlService();
+      expect(() => service.replaceTemplate('aa {{ adas }}', {blah: 4})).toThrow(Error("Unable to render template. 'adas' is missing in {\"blah\":4}"))
+    });
+  });
+  describe('renderTemplate', () => {
+    it('should replace single param', async () => {
+      let service = new HtmlService();
+      let result = await service.renderTemplate('token_email', {sign_up_email: 'include', timeCreated: 'now', 'ip': 'localhost', 'ipInfo': 'Chernihiv'})
+    expect(result).toEqual(`include
+<p>
+    <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
+</p>
+<p>
+    Link was generated now <br/>
+    IP: localhost<br/>
+    Chernihiv
+</p>
+`);
+    });
+  });
+});
diff --git a/newback/src/modules/html/html.service.ts b/newback/src/modules/html/html.service.ts
new file mode 100644
index 000000000..355b32bb0
--- /dev/null
+++ b/newback/src/modules/html/html.service.ts
@@ -0,0 +1,25 @@
+import {Injectable} from '@nestjs/common';
+import {readFile} from 'fs';
+import {promisify} from 'util';
+import {resolve} from "path";
+@Injectable()
+export class HtmlService {
+
+
+  public replaceTemplate(content: string, params: Record<string, string|number>): string {
+    const replaceHtmlRegex = /\{\{\s?(\w+)\s?\}\}/g;
+    const html = content.replace(replaceHtmlRegex, (_, v) => {
+      if (!params[v]) {
+        throw Error(`Unable to render template. '${v}' is missing in ${JSON.stringify(params)}`)
+      }
+     return params[v] as string
+    });
+    return html;
+  }
+
+  public async renderTemplate(template: string, params: Record<string, string|number>) {
+    let filePath = resolve(__dirname, '..' , '..', 'templates',`${template}.html`);
+    const content = await promisify(readFile)(filePath, 'utf-8');
+    return this.replaceTemplate(content, params);
+	}
+}
diff --git a/newback/src/modules/logger/interceptor.ts b/newback/src/modules/logger/interceptor.ts
new file mode 100644
index 000000000..333d540c1
--- /dev/null
+++ b/newback/src/modules/logger/interceptor.ts
@@ -0,0 +1,37 @@
+import {
+  CallHandler,
+  ExecutionContext,
+  Injectable,
+  Logger,
+  NestInterceptor
+} from '@nestjs/common';
+import {
+  Observable,
+  tap,
+  throwError
+} from 'rxjs';
+import {catchError} from 'rxjs/operators';
+
+@Injectable()
+export class LoggingInterceptor implements NestInterceptor {
+
+  private id: number = 0;
+  constructor(private readonly logger: Logger) {
+
+  }
+
+  public intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
+    let request = context.switchToHttp().getRequest();
+    let thisId = this.id++;
+    if (request.body) {
+      this.logger.debug(`Request[${thisId}]: body=${JSON.stringify(request.body)}, headers=${JSON.stringify(request.headers)}`, 'Http');
+    }
+    return next.handle().pipe(tap((responseBody) => {
+      this.logger.debug(`Response[${thisId}]: body=${JSON.stringify(responseBody)}`, 'Http')
+    })).pipe(catchError(err => {
+      this.logger.error(`Response[${thisId}]]: err='${err.message}', body=${JSON.stringify(err.response)}`, err.stack, 'Http');
+      return throwError(err)
+    }));
+  }
+
+}
diff --git a/newback/src/modules/logger/logger.module.ts b/newback/src/modules/logger/logger.module.ts
index b75d7e8d7..8346ea555 100644
--- a/newback/src/modules/logger/logger.module.ts
+++ b/newback/src/modules/logger/logger.module.ts
@@ -1,10 +1,12 @@
 import {
+  Global,
   Logger,
   Module
 } from '@nestjs/common';
 
+@Global()
 @Module({
   providers: [Logger],
-  exports: [Logger],
+  exports: [Logger]
 })
 export class LoggerModule {}
diff --git a/newback/src/modules/password/password.service.ts b/newback/src/modules/password/password.service.ts
new file mode 100644
index 000000000..1ea0be2c0
--- /dev/null
+++ b/newback/src/modules/password/password.service.ts
@@ -0,0 +1,29 @@
+import {Injectable} from '@nestjs/common';
+import {
+  compare,
+  hash
+} from 'bcrypt';
+
+@Injectable()
+export class PasswordService {
+  public constructor() {
+  }
+
+  public async createPassword(password: string): Promise<string> {
+    return hash(password, 10);
+  }
+
+  public async generateRandomString(length: number): Promise<string> {
+    let result = '';
+    const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+    for (let i = 0; i < length; i++) {
+      result += characters.charAt(Math.floor(Math.random() *
+        characters.length));
+    }
+    return result;
+  }
+
+  public async checkPassword(password: string, hash: string): Promise<boolean> {
+    return compare(password, hash);
+  }
+}
diff --git a/newback/src/templates/token_email.html b/newback/src/templates/token_email.html
index 72273e51f..734da4a18 100644
--- a/newback/src/templates/token_email.html
+++ b/newback/src/templates/token_email.html
@@ -1,4 +1,4 @@
-{% include "sign_up_email.html" %}
+{{ sign_up_email }}
 <p>
     <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
 </p>
@@ -6,4 +6,4 @@
     Link was generated {{ timeCreated }} <br/>
     IP: {{ ip }}<br/>
     {{ ipInfo }}
-</p>
\ No newline at end of file
+</p>
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 693a8427f..b344e0367 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
 "@angular-devkit/core@13.3.2":
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-13.3.2.tgz#b2e7a9a6457d587a59d5f6df799bebb6930a5ddc"
@@ -37,18 +44,139 @@
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
   dependencies:
     "@babel/highlight" "^7.16.7"
 
+"@babel/compat-data@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
+  integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
+
+"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
+  integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.9"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-module-transforms" "^7.17.7"
+    "@babel/helpers" "^7.17.9"
+    "@babel/parser" "^7.17.9"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.9"
+    "@babel/types" "^7.17.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
+    semver "^6.3.0"
+
+"@babel/generator@^7.17.9", "@babel/generator@^7.7.2":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc"
+  integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-compilation-targets@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
+  integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
+  dependencies:
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-validator-option" "^7.16.7"
+    browserslist "^4.17.5"
+    semver "^6.3.0"
+
+"@babel/helper-environment-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
+  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-function-name@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
+  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
+  dependencies:
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.17.0"
+
+"@babel/helper-hoist-variables@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-imports@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-transforms@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
+  integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-simple-access" "^7.17.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
+  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+
+"@babel/helper-simple-access@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
+  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
+  dependencies:
+    "@babel/types" "^7.17.0"
+
+"@babel/helper-split-export-declaration@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
+"@babel/helper-validator-option@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
+  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
+
+"@babel/helpers@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
+  integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
+  dependencies:
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.9"
+    "@babel/types" "^7.17.0"
+
 "@babel/highlight@^7.16.7":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
@@ -58,6 +186,140 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
+  integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-bigint@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-import-meta@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8"
+  integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/template@^7.16.7", "@babel/template@^7.3.3":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d"
+  integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.9"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.9"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
@@ -85,11 +347,6 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
 "@humanwhocodes/config-array@^0.9.2":
   version "0.9.5"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
@@ -104,10 +361,233 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@isaacs/string-locale-compare@^1.1.0":
+"@ioredis/commands@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.1.1.tgz#2ba4299ea624a6bfac15b35f6df90b0015691ec3"
+  integrity sha512-fsR4P/ROllzf/7lXYyElUJCheWdTJVJvOTps8v9IWKFATxR61ANOlnoPqhH099xYLrJGpc2ZQ28B3rMeUt5VQg==
+
+"@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
-  integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
+  dependencies:
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    get-package-type "^0.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
+"@jest/console@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba"
+  integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^27.5.1"
+    jest-util "^27.5.1"
+    slash "^3.0.0"
+
+"@jest/core@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626"
+  integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==
+  dependencies:
+    "@jest/console" "^27.5.1"
+    "@jest/reporters" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    emittery "^0.8.1"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^27.5.1"
+    jest-config "^27.5.1"
+    jest-haste-map "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-resolve-dependencies "^27.5.1"
+    jest-runner "^27.5.1"
+    jest-runtime "^27.5.1"
+    jest-snapshot "^27.5.1"
+    jest-util "^27.5.1"
+    jest-validate "^27.5.1"
+    jest-watcher "^27.5.1"
+    micromatch "^4.0.4"
+    rimraf "^3.0.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
+"@jest/environment@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74"
+  integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==
+  dependencies:
+    "@jest/fake-timers" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    jest-mock "^27.5.1"
+
+"@jest/fake-timers@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74"
+  integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    "@sinonjs/fake-timers" "^8.0.1"
+    "@types/node" "*"
+    jest-message-util "^27.5.1"
+    jest-mock "^27.5.1"
+    jest-util "^27.5.1"
+
+"@jest/globals@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b"
+  integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    expect "^27.5.1"
+
+"@jest/reporters@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04"
+  integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.2.9"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^5.1.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.1.3"
+    jest-haste-map "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-util "^27.5.1"
+    jest-worker "^27.5.1"
+    slash "^3.0.0"
+    source-map "^0.6.0"
+    string-length "^4.0.1"
+    terminal-link "^2.0.0"
+    v8-to-istanbul "^8.1.0"
+
+"@jest/source-map@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf"
+  integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.2.9"
+    source-map "^0.6.0"
+
+"@jest/test-result@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb"
+  integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==
+  dependencies:
+    "@jest/console" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
+"@jest/test-sequencer@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b"
+  integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==
+  dependencies:
+    "@jest/test-result" "^27.5.1"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^27.5.1"
+    jest-runtime "^27.5.1"
+
+"@jest/transform@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409"
+  integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^27.5.1"
+    babel-plugin-istanbul "^6.1.1"
+    chalk "^4.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-util "^27.5.1"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
+"@jest/types@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^16.0.0"
+    chalk "^4.0.0"
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+
+"@jridgewell/trace-mapping@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@mapbox/node-pre-gyp@^1.0.0":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc"
+  integrity sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==
+  dependencies:
+    detect-libc "^2.0.0"
+    https-proxy-agent "^5.0.0"
+    make-dir "^3.1.0"
+    node-fetch "^2.6.7"
+    nopt "^5.0.0"
+    npmlog "^5.0.1"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.11"
+
+"@nestjs-modules/ioredis@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@nestjs-modules/ioredis/-/ioredis-1.0.0.tgz#4b2560f450047ea6cb044ebce5dd4363a24cc416"
+  integrity sha512-4y35a1VtNS3+RofrLWdPe9FiEhpji05wdgnkO97VUu9kxFe8y2Ck5UorRsu3dDzYn5BdumHg8kB9Qbb220gxSg==
 
 "@nestjs/cli@^8.2.5":
   version "8.2.5"
@@ -211,41 +691,6 @@
     optional "0.1.4"
     tslib "2.3.1"
 
-"@node-redis/bloom@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@node-redis/bloom/-/bloom-1.0.1.tgz#144474a0b7dc4a4b91badea2cfa9538ce0a1854e"
-  integrity sha512-mXEBvEIgF4tUzdIN89LiYsbi6//EdpFA7L8M+DHCvePXg+bfHWi+ct5VI6nHUFQE5+ohm/9wmgihCH3HSkeKsw==
-
-"@node-redis/client@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@node-redis/client/-/client-1.0.5.tgz#ebac5e2bbf12214042a37621604973a954ede755"
-  integrity sha512-ESZ3bd1f+od62h4MaBLKum+klVJfA4wAeLHcVQBkoXa1l0viFesOWnakLQqKg+UyrlJhZmXJWtu0Y9v7iTMrig==
-  dependencies:
-    cluster-key-slot "1.1.0"
-    generic-pool "3.8.2"
-    redis-parser "3.0.0"
-    yallist "4.0.0"
-
-"@node-redis/graph@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@node-redis/graph/-/graph-1.0.0.tgz#baf8eaac4a400f86ea04d65ec3d65715fd7951ab"
-  integrity sha512-mRSo8jEGC0cf+Rm7q8mWMKKKqkn6EAnA9IA2S3JvUv/gaWW/73vil7GLNwion2ihTptAm05I9LkepzfIXUKX5g==
-
-"@node-redis/json@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@node-redis/json/-/json-1.0.2.tgz#8ad2d0f026698dc1a4238cc3d1eb099a3bee5ab8"
-  integrity sha512-qVRgn8WfG46QQ08CghSbY4VhHFgaTY71WjpwRBGEuqGPfWwfRcIf3OqSpR7Q/45X+v3xd8mvYjywqh0wqJ8T+g==
-
-"@node-redis/search@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@node-redis/search/-/search-1.0.5.tgz#96050007eb7c50a7e47080320b4f12aca8cf94c4"
-  integrity sha512-MCOL8iCKq4v+3HgEQv8zGlSkZyXSXtERgrAJ4TSryIG/eLFy84b57KmNNa/V7M1Q2Wd2hgn2nPCGNcQtk1R1OQ==
-
-"@node-redis/time-series@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@node-redis/time-series/-/time-series-1.0.2.tgz#5dd3638374edd85ebe0aa6b0e87addc88fb9df69"
-  integrity sha512-HGQ8YooJ8Mx7l28tD7XjtB3ImLEjlUxG1wC1PAjxu6hPJqjPshUZxAICzDqDjtIbhDTf48WXXUcx8TQJB1XTKA==
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -267,172 +712,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@^5.0.0", "@npmcli/arborist@^5.0.4":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.0.5.tgz#e38b63cabc496840bb329182fe6bee18ad9f3ee2"
-  integrity sha512-96UwbW4ASOMg/ltORxx36njDiIy5HYdWR5HOvroYeVhoSOLYKwlixALowNK7ZBt49MOaJVCfLMyu9on71gQC/g==
-  dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
-    "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/map-workspaces" "^2.0.0"
-    "@npmcli/metavuln-calculator" "^3.0.1"
-    "@npmcli/move-file" "^2.0.0"
-    "@npmcli/name-from-folder" "^1.0.1"
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/package-json" "^2.0.0"
-    "@npmcli/run-script" "^3.0.0"
-    bin-links "^3.0.0"
-    cacache "^16.0.0"
-    common-ancestor-path "^1.0.1"
-    json-parse-even-better-errors "^2.3.1"
-    json-stringify-nice "^1.1.4"
-    mkdirp "^1.0.4"
-    mkdirp-infer-owner "^2.0.0"
-    nopt "^5.0.0"
-    npm-install-checks "^5.0.0"
-    npm-package-arg "^9.0.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.0"
-    npmlog "^6.0.1"
-    pacote "^13.0.5"
-    parse-conflict-json "^2.0.1"
-    proc-log "^2.0.0"
-    promise-all-reject-late "^1.0.0"
-    promise-call-limit "^1.0.1"
-    read-package-json-fast "^2.0.2"
-    readdir-scoped-modules "^1.1.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    ssri "^9.0.0"
-    treeverse "^2.0.0"
-    walk-up-path "^1.0.0"
-
-"@npmcli/ci-detect@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
-  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
-
-"@npmcli/config@^4.0.1":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.0.2.tgz#cecb171225d8325cee30ee45893eebd9503bb203"
-  integrity sha512-UqD4h4LgyNOb7xRmAK7QXiMu0/k2x7wEzrEqXZ1wGIQVmCl3vamsAprDjAhi7IKlgRulg09hpwYs2/57OP22xw==
-  dependencies:
-    "@npmcli/map-workspaces" "^2.0.2"
-    ini "^3.0.0"
-    mkdirp-infer-owner "^2.0.0"
-    nopt "^5.0.0"
-    proc-log "^2.0.0"
-    read-package-json-fast "^2.0.3"
-    semver "^7.3.5"
-    walk-up-path "^1.0.0"
-
-"@npmcli/disparity-colors@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-2.0.0.tgz#cb518166ee21573b96241a3613fef70acb2a60ba"
-  integrity sha512-FFXGrIjhvd2qSZ8iS0yDvbI7nbjdyT2VNO7wotosjYZM2p2r8PN3B7Om3M5NO9KqW/OVzfzLB3L0V5Vo5QXC7A==
-  dependencies:
-    ansi-styles "^4.3.0"
-
-"@npmcli/fs@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
-  integrity sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/git@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.1.tgz#049b99b1381a2ddf7dc56ba3e91eaf76ca803a8d"
-  integrity sha512-UU85F/T+F1oVn3IsB/L6k9zXIMpXBuUBE25QDH0SsURwT6IOBqkC7M16uqo2vVZIyji3X1K4XH9luip7YekH1A==
-  dependencies:
-    "@npmcli/promise-spawn" "^3.0.0"
-    lru-cache "^7.4.4"
-    mkdirp "^1.0.4"
-    npm-pick-manifest "^7.0.0"
-    proc-log "^2.0.0"
-    promise-inflight "^1.0.1"
-    promise-retry "^2.0.1"
-    semver "^7.3.5"
-    which "^2.0.2"
-
-"@npmcli/installed-package-contents@^1.0.7":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
-  integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
-  dependencies:
-    npm-bundled "^1.1.1"
-    npm-normalize-package-bin "^1.0.1"
-
-"@npmcli/map-workspaces@^2.0.0", "@npmcli/map-workspaces@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.2.tgz#dfc87ced615afeb98a081da2aa9bba072bf6712d"
-  integrity sha512-ED54EslGsHFWBPN5x8JAOszuWywuoXYSi9E3HQRsgVkWnqsdTBJDSM4IFMRwmmBUbCHAxmP3wGLu1WMm4fhrOw==
-  dependencies:
-    "@npmcli/name-from-folder" "^1.0.1"
-    glob "^7.2.0"
-    minimatch "^5.0.1"
-    read-package-json-fast "^2.0.3"
-
-"@npmcli/metavuln-calculator@^3.0.1":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.0.tgz#b1c2f0991c4f2d992b1615a54d4358c05efc3702"
-  integrity sha512-Q5fbQqGDlYqk7kWrbg6E2j/mtqQjZop0ZE6735wYA1tYNHguIDjAuWs+kFb5rJCkLIlXllfapvsyotYKiZOTBA==
-  dependencies:
-    cacache "^16.0.0"
-    json-parse-even-better-errors "^2.3.1"
-    pacote "^13.0.3"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02"
-  integrity sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@npmcli/name-from-folder@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
-  integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
-
-"@npmcli/node-gyp@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
-  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
-
-"@npmcli/package-json@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
-  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
-  dependencies:
-    json-parse-even-better-errors "^2.3.1"
-
-"@npmcli/package-json@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
-  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
-  dependencies:
-    json-parse-even-better-errors "^2.3.1"
-
-"@npmcli/promise-spawn@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
-  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
-  dependencies:
-    infer-owner "^1.0.4"
-
-"@npmcli/run-script@^3.0.0", "@npmcli/run-script@^3.0.1":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-3.0.2.tgz#3e9116d831f4539bf292d18b015977a6118997ee"
-  integrity sha512-vdjD/PMBl+OX9j9C9irx5sCCIKfp2PWkpPNH9zxvlJAfSZ3Qp5aU412v+O3PFJl3R1PFNwuyChCqHg4ma6ci2Q==
-  dependencies:
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/promise-spawn" "^3.0.0"
-    node-gyp "^9.0.0"
-    read-package-json-fast "^2.0.3"
-
 "@nuxtjs/opencollective@0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz#620ce1044f7ac77185e825e1936115bb38e2681c"
@@ -442,10 +721,24 @@
     consola "^2.15.0"
     node-fetch "^2.6.1"
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+"@sinonjs/commons@^1.7.0":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^8.0.1":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
+  integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
@@ -467,6 +760,46 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
   integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
 
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
+  version "7.1.19"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
+  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
+  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
+  integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
+"@types/bcrypt@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@types/bcrypt/-/bcrypt-5.0.0.tgz#a835afa2882d165aff5690893db314eaa98b9f20"
+  integrity sha512-agtcFKaruL8TmcvqbndlqHPSJgsolhf/qPWchFlgnW1gECTN/nKbFcoFnvKAQRFfKbh+BO6A3SWdJu9t+xF3Lw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/bluebird@*":
   version "3.5.36"
   resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.36.tgz#00d9301d4dc35c2f6465a8aec634bb533674c652"
@@ -541,6 +874,40 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/graceful-fs@^4.1.2":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
+  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
+  dependencies:
+    "@types/node" "*"
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
+  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
+
+"@types/istanbul-lib-report@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
+"@types/jest@^27.4.1":
+  version "27.4.1"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.1.tgz#185cbe2926eaaf9662d340cc02e548ce9e11ab6d"
+  integrity sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==
+  dependencies:
+    jest-matcher-utils "^27.0.0"
+    pretty-format "^27.0.0"
+
 "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -576,6 +943,11 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/prettier@^2.1.5":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759"
+  integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==
+
 "@types/qs@*":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
@@ -604,11 +976,28 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
+"@types/stack-utils@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+
 "@types/validator@*", "@types/validator@^13.7.1":
   version "13.7.2"
   resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.2.tgz#a2114225d9be743fb154b06c29b8257aaca42922"
   integrity sha512-KFcchQ3h0OPQgFirBRPZr5F/sVjxZsOrQHedj3zi8AH3Zv/hOLx2OLR4hxR5HcfoU+33n69ZuOfzthKVdMoTiw==
 
+"@types/yargs-parser@*":
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
+  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+
+"@types/yargs@^16.0.0":
+  version "16.0.4"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
+  integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@typescript-eslint/eslint-plugin@^5.18.0":
   version "5.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d"
@@ -669,7 +1058,7 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.18.0":
+"@typescript-eslint/utils@5.18.0", "@typescript-eslint/utils@^5.10.0":
   version "5.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855"
   integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==
@@ -820,7 +1209,12 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abbrev@1, abbrev@~1.1.1:
+abab@^2.0.3, abab@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -833,6 +1227,14 @@ accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
+acorn-globals@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
+  dependencies:
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
+
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
@@ -843,40 +1245,33 @@ acorn-jsx@^5.3.1:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
+acorn-walk@^7.1.1:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+
 acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
+acorn@^7.1.1:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
+acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
   integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
-agent-base@6, agent-base@^6.0.2:
+agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
-  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
-  dependencies:
-    debug "^4.1.0"
-    depd "^1.1.2"
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 ajv-formats@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -943,24 +1338,19 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.1.0, ansi-styles@^4.3.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
-ansicolors@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
-  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
-
-ansistyles@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
-  integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk=
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-anymatch@~3.1.2:
+anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -973,20 +1363,15 @@ append-field@^1.0.0:
   resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
   integrity sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY=
 
-"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
+"aproba@^1.0.3 || ^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-archy@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
-
-are-we-there-yet@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
-  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
@@ -996,6 +1381,13 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -1027,6 +1419,11 @@ asap@^2.0.0:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
 axios@0.26.1:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
@@ -1034,6 +1431,67 @@ axios@0.26.1:
   dependencies:
     follow-redirects "^1.14.8"
 
+babel-jest@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444"
+  integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==
+  dependencies:
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^27.5.1"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    slash "^3.0.0"
+
+babel-plugin-istanbul@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^5.0.4"
+    test-exclude "^6.0.0"
+
+babel-plugin-jest-hoist@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e"
+  integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.0.0"
+    "@types/babel__traverse" "^7.0.6"
+
+babel-preset-current-node-syntax@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-import-meta" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+
+babel-preset-jest@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81"
+  integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==
+  dependencies:
+    babel-plugin-jest-hoist "^27.5.1"
+    babel-preset-current-node-syntax "^1.0.0"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -1044,19 +1502,15 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-bin-links@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.1.tgz#cc70ffb481988b22c527d3e6e454787876987a49"
-  integrity sha512-9vx+ypzVhASvHTS6K+YSGf7nwQdANoz7v6MTC0aCtYnOEZ87YvMf81aY737EZnGZdpbRM3sfWjO9oWkKmuIvyQ==
+bcrypt@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-5.0.1.tgz#f1a2c20f208e2ccdceea4433df0c8b2c54ecdf71"
+  integrity sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==
   dependencies:
-    cmd-shim "^5.0.0"
-    mkdirp-infer-owner "^2.0.0"
-    npm-normalize-package-bin "^1.0.0"
-    read-cmd-shim "^3.0.0"
-    rimraf "^3.0.0"
-    write-file-atomic "^4.0.0"
+    "@mapbox/node-pre-gyp" "^1.0.0"
+    node-addon-api "^3.1.0"
 
-binary-extensions@^2.0.0, binary-extensions@^2.2.0:
+binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
@@ -1112,13 +1566,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -1126,7 +1573,12 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@^4.14.5:
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
+
+browserslist@^4.14.5, browserslist@^4.17.5:
   version "4.20.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
   integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
@@ -1137,16 +1589,25 @@ browserslist@^4.14.5:
     node-releases "^2.0.2"
     picocolors "^1.0.0"
 
+bs-logger@0.x:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
+  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
+  dependencies:
+    fast-json-stable-stringify "2.x"
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer-writer@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
-  integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==
-
 buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
@@ -1155,13 +1616,6 @@ buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builtins@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.0.tgz#20d87e7f95d46481b1abe4adc616a9cb6b492cba"
-  integrity sha512-aizhtbxgT1Udg0Fj6GssXshAVK+nxbtCV+1OtTrMNy67jffDFBY6CUBAkhO4owbleAx6fdbnWdpsmmcXydbzNw==
-  dependencies:
-    semver "^7.0.0"
-
 busboy@^0.2.11:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"
@@ -1175,30 +1629,6 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-cacache@^16.0.0, cacache@^16.0.2, cacache@^16.0.3:
-  version "16.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.0.4.tgz#66877ae82717ade4d1416d5b3caa3a870f2c6d0c"
-  integrity sha512-U0D4wF3/W8ZgK4qDA5fTtOVSr0gaDfd5aa7tUdAV0uukVWKsAIn6SzXQCoVlg7RWZiJa+bcsM3/pXLumGaL2Ug==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^7.2.0"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^1.1.1"
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -1212,12 +1642,22 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+camelcase@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
+
 caniuse-lite@^1.0.30001317:
   version "1.0.30001327"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001327.tgz#c1546d7d7bb66506f0ccdad6a7d07fc6d668c858"
   integrity sha512-1/Cg4jlD9qjZzhbzkzEaAC2JHsP0WrOc8Rd/3a3LuajGzGWR/hD7TVyvq99VqmTy99eVh8Zkmdq213OgvgXx7w==
 
-chalk@3.0.0:
+chalk@3.0.0, chalk@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
   integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
@@ -1242,6 +1682,11 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -1272,12 +1717,15 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-cidr-regex@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-3.1.1.tgz#ba1972c57c66f61875f18fd7dd487469770b571d"
-  integrity sha512-RBqYd32aDwbCMFJRL6wHOlDNYJsPNTt8vC82ErHF5vKt8QQzxm1FrkW8s/R5pVrXMf17sba09Uoy91PKiddAsw==
-  dependencies:
-    ip-regex "^4.1.0"
+ci-info@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
+  integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
+
+cjs-module-lexer@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
+  integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
 
 class-transformer@^0.5.1:
   version "0.5.1"
@@ -1292,19 +1740,6 @@ class-validator@^0.13.2:
     libphonenumber-js "^1.9.43"
     validator "^13.7.0"
 
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-columns@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
-  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
-  dependencies:
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
 cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -1317,7 +1752,7 @@ cli-spinners@^2.5.0:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
   integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
 
-cli-table3@0.6.1, cli-table3@^0.6.1:
+cli-table3@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
   integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
@@ -1331,22 +1766,34 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-cluster-key-slot@1.1.0:
+cluster-key-slot@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
   integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
 
-cmd-shim@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
-  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
-  dependencies:
-    mkdirp-infer-owner "^2.0.0"
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
+collect-v8-coverage@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
+  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
 
 color-convert@^1.9.0:
   version "1.9.3"
@@ -1372,7 +1819,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-support@^1.1.3:
+color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -1382,13 +1829,12 @@ colors@1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
-    strip-ansi "^6.0.1"
-    wcwidth "^1.0.0"
+    delayed-stream "~1.0.0"
 
 commander@4.1.1:
   version "4.1.1"
@@ -1400,10 +1846,10 @@ commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-common-ancestor-path@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
-  integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
+component-emitter@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -1425,7 +1871,7 @@ consola@^2.15.0:
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
-console-control-strings@^1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
@@ -1442,6 +1888,13 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
+convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -1452,6 +1905,11 @@ cookie@0.4.2:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
+cookiejar@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc"
+  integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -1465,6 +1923,17 @@ cors@2.8.5:
     object-assign "^4"
     vary "^1"
 
+cosmiconfig@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
+  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.7.2"
+
 cosmiconfig@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
@@ -1476,12 +1945,21 @@ cosmiconfig@^7.0.1:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+create-jest-runner@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/create-jest-runner/-/create-jest-runner-0.6.0.tgz#9ca6583d969acc15cdc21cd07d430945daf83de6"
+  integrity sha512-9ibH8XA4yOJwDLRlzIUv5Ceg2DZFrQFjEtRKplVP6scGKwoz28V27xPHTbXziq2LePAD/xXlJlywhUq1dtF+nw==
+  dependencies:
+    chalk "^3.0.0"
+    jest-worker "^25.1.0"
+    throat "^5.0.0"
+
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -1490,10 +1968,31 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-csv-parse@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.0.4.tgz#97e5e654413bcf95f2714ce09bcb2be6de0eb8e3"
-  integrity sha512-5AIdl8l6n3iYQYxan5djB5eKDa+vBnhfWZtRpJTcrETWfVLYN0WSj3L9RwvgYt+psoO77juUr8TG8qpfGZifVQ==
+cssom@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+
+cssom@~0.3.6:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+  dependencies:
+    cssom "~0.3.6"
+
+data-urls@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+  dependencies:
+    abab "^2.0.3"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
 
 debug@2.6.9:
   version "2.6.9"
@@ -1502,19 +2001,24 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-debuglog@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+decimal.js@^10.2.1:
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
+  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
-deep-is@^0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -1538,6 +2042,11 @@ define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -1553,7 +2062,7 @@ depd@2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-depd@^1.1.2, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
@@ -1568,10 +2077,20 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-dezalgo@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
-  integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
+detect-libc@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
+  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+
+detect-newline@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+dezalgo@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
@@ -1584,16 +2103,16 @@ dicer@0.2.5:
     readable-stream "1.1.x"
     streamsearch "0.1.2"
 
+diff-sequences@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
+  integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==
+
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-diff@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
-  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -1608,6 +2127,20 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+domexception@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
+  dependencies:
+    webidl-conversions "^5.0.0"
+
+dot-prop@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
+  dependencies:
+    is-obj "^2.0.0"
+
 dottie@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154"
@@ -1623,6 +2156,11 @@ electron-to-chromium@^1.4.84:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a"
   integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==
 
+emittery@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
+  integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -1633,13 +2171,6 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -1651,19 +2182,9 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.2:
   version "5.9.2"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
   integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-env-paths@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
-  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-err-code@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
 
 error-ex@^1.3.1:
   version "1.3.2"
@@ -1742,11 +2263,35 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escodegen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^5.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+eslint-plugin-jest@^26.1.4:
+  version "26.1.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.4.tgz#8e3410093ff4439d0c3a371add5bf9e05623a57a"
+  integrity sha512-wgqxujmqc2qpvZqMFWCh6Cniqc8lWpapvXt9j/19DmBDqeDaYhJrSRezYR1SKyemvjx+9e9kny/dgRahraHImA==
+  dependencies:
+    "@typescript-eslint/utils" "^5.10.0"
+
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -1830,6 +2375,11 @@ espree@^9.3.1:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^3.3.0"
 
+esprima@^4.0.0, esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
 esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
@@ -1884,6 +2434,36 @@ execa@^4.0.2:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+expect@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74"
+  integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    jest-get-type "^27.5.1"
+    jest-matcher-utils "^27.5.1"
+    jest-message-util "^27.5.1"
+
 express@4.17.3:
   version "4.17.3"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
@@ -1945,26 +2525,21 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fast-safe-stringify@2.1.1:
+fast-safe-stringify@2.1.1, fast-safe-stringify@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
 
-fastest-levenshtein@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
-  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
-
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
@@ -1972,6 +2547,13 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
 figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -2006,6 +2588,14 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -2041,6 +2631,34 @@ fork-ts-checker-webpack-plugin@7.2.3:
     semver "^7.3.5"
     tapable "^2.2.1"
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+formidable@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.0.1.tgz#4310bc7965d185536f9565184dee74fbb75557ff"
+  integrity sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==
+  dependencies:
+    dezalgo "1.0.3"
+    hexoid "1.0.0"
+    once "1.4.0"
+    qs "6.9.3"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -2060,7 +2678,7 @@ fs-extra@10.0.1, fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -2077,7 +2695,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@~2.3.2:
+fsevents@^2.3.2, fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -2092,19 +2710,20 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-gauge@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
+    wide-align "^1.1.2"
 
 generate-function@^2.3.1:
   version "2.3.1"
@@ -2113,10 +2732,15 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
-generic-pool@3.8.2:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
-  integrity sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg==
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
   version "1.1.1"
@@ -2127,6 +2751,11 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
 get-stream@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -2134,6 +2763,11 @@ get-stream@^5.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -2161,7 +2795,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.2.0, glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+glob@7.2.0, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -2173,6 +2807,11 @@ glob@7.2.0, glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
 globals@^13.6.0, globals@^13.9.0:
   version "13.13.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
@@ -2192,7 +2831,7 @@ globby@^11.0.4:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -2244,17 +2883,22 @@ hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hosted-git-info@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.0.0.tgz#df7a06678b4ebd722139786303db80fdf302ea56"
-  integrity sha512-rRnjWu0Bxj+nIfUOkz0695C0H6tRrN5iYIzYejb0tDEefe2AekHu/U5Kn9pEie5vsJqpNQU02az7TGSH3qpz4Q==
+hexoid@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
+  integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==
+
+html-encoding-sniffer@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
   dependencies:
-    lru-cache "^7.5.1"
+    whatwg-encoding "^1.0.5"
 
-http-cache-semantics@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 http-errors@1.8.1:
   version "1.8.1"
@@ -2278,12 +2922,12 @@ http-errors@2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
   dependencies:
-    "@tootallnate/once" "2"
+    "@tootallnate/once" "1"
     agent-base "6"
     debug "4"
 
@@ -2300,17 +2944,10 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
-  dependencies:
-    ms "^2.0.0"
-
-i@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/i/-/i-0.3.7.tgz#2a7437a923d59c14b17243dc63a549af24d85799"
-  integrity sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q==
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
@@ -2319,7 +2956,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.6.2, iconv-lite@^0.6.3:
+iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -2331,19 +2968,12 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore-walk@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
-  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
-  dependencies:
-    minimatch "^5.0.1"
-
 ignore@^5.1.8, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -2351,21 +2981,19 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-local@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflection@^1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.2.tgz#15e8c797c6c3dadf31aa658f8df8a4ea024798b0"
@@ -2384,29 +3012,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, i
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
-  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
-
-ini@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1"
-  integrity sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==
-
-init-package-json@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
-  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
-  dependencies:
-    npm-package-arg "^9.0.1"
-    promzard "^0.3.0"
-    read "^1.0.7"
-    read-package-json "^5.0.0"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^4.0.0"
-
 inquirer@7.3.3:
   version "7.3.3"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
@@ -2460,15 +3065,20 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-ip-regex@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
-  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
-
-ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+ioredis@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.0.4.tgz#0d4abfd818adfc5ef5029fddac4b8f503a1433b7"
+  integrity sha512-qFJw3MnPNsJF1lcIOP3vztbsasOXK3nDdNAgjQj7t7/Bn/w10PGchTOpqylQNxjzPbLoYDu34LjeJtSWiKBntQ==
+  dependencies:
+    "@ioredis/commands" "^1.1.1"
+    cluster-key-slot "^1.1.0"
+    debug "^4.3.4"
+    denque "^2.0.1"
+    lodash.defaults "^4.2.0"
+    lodash.isarguments "^3.1.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.1.0"
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -2507,13 +3117,6 @@ is-callable@^1.1.4, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-cidr@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
-  integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
-  dependencies:
-    cidr-regex "^3.1.1"
-
 is-core-module@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
@@ -2538,6 +3141,11 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-generator-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
+
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -2550,100 +3158,557 @@ is-interactive@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
   integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
 
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+
+is-number-object@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
+
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
+
+is-property@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
+
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-shared-array-buffer@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+is-string@^1.0.5, is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  dependencies:
+    has-symbols "^1.0.2"
+
+is-typedarray@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+  dependencies:
+    call-bind "^1.0.2"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
+  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+
+istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
+  integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^6.3.0"
+
+istanbul-lib-report@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+  dependencies:
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^3.0.0"
+    supports-color "^7.1.0"
+
+istanbul-lib-source-maps@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^3.0.0"
+    source-map "^0.6.1"
+
+istanbul-reports@^3.1.3:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c"
+  integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
+iterare@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/iterare/-/iterare-1.2.1.tgz#139c400ff7363690e33abffa33cbba8920f00042"
+  integrity sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==
+
+jest-changed-files@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5"
+  integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    execa "^5.0.0"
+    throat "^6.0.1"
+
+jest-circus@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc"
+  integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^0.7.0"
+    expect "^27.5.1"
+    is-generator-fn "^2.0.0"
+    jest-each "^27.5.1"
+    jest-matcher-utils "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-runtime "^27.5.1"
+    jest-snapshot "^27.5.1"
+    jest-util "^27.5.1"
+    pretty-format "^27.5.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+    throat "^6.0.1"
+
+jest-cli@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145"
+  integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==
+  dependencies:
+    "@jest/core" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    import-local "^3.0.2"
+    jest-config "^27.5.1"
+    jest-util "^27.5.1"
+    jest-validate "^27.5.1"
+    prompts "^2.0.1"
+    yargs "^16.2.0"
+
+jest-config@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41"
+  integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==
+  dependencies:
+    "@babel/core" "^7.8.0"
+    "@jest/test-sequencer" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    babel-jest "^27.5.1"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.1"
+    graceful-fs "^4.2.9"
+    jest-circus "^27.5.1"
+    jest-environment-jsdom "^27.5.1"
+    jest-environment-node "^27.5.1"
+    jest-get-type "^27.5.1"
+    jest-jasmine2 "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-runner "^27.5.1"
+    jest-util "^27.5.1"
+    jest-validate "^27.5.1"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^27.5.1"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
+
+jest-diff@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
+  integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^27.5.1"
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
+
+jest-docblock@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0"
+  integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==
+  dependencies:
+    detect-newline "^3.0.0"
+
+jest-each@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e"
+  integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    chalk "^4.0.0"
+    jest-get-type "^27.5.1"
+    jest-util "^27.5.1"
+    pretty-format "^27.5.1"
+
+jest-environment-jsdom@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546"
+  integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/fake-timers" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    jest-mock "^27.5.1"
+    jest-util "^27.5.1"
+    jsdom "^16.6.0"
+
+jest-environment-node@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e"
+  integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/fake-timers" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    jest-mock "^27.5.1"
+    jest-util "^27.5.1"
+
+jest-get-type@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
+  integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
+
+jest-haste-map@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f"
+  integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    "@types/graceful-fs" "^4.1.2"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^27.5.1"
+    jest-serializer "^27.5.1"
+    jest-util "^27.5.1"
+    jest-worker "^27.5.1"
+    micromatch "^4.0.4"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^2.3.2"
+
+jest-jasmine2@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4"
+  integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/source-map" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    expect "^27.5.1"
+    is-generator-fn "^2.0.0"
+    jest-each "^27.5.1"
+    jest-matcher-utils "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-runtime "^27.5.1"
+    jest-snapshot "^27.5.1"
+    jest-util "^27.5.1"
+    pretty-format "^27.5.1"
+    throat "^6.0.1"
+
+jest-leak-detector@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8"
+  integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==
+  dependencies:
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
+
+jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"
+  integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^27.5.1"
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+jest-message-util@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf"
+  integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^27.5.1"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^27.5.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
 
-is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
+jest-mock@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6"
+  integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==
   dependencies:
-    has-tostringtag "^1.0.0"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+jest-pnp-resolver@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
+  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
+jest-regex-util@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95"
+  integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==
 
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+jest-resolve-dependencies@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8"
+  integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==
   dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
+    "@jest/types" "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-snapshot "^27.5.1"
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+jest-resolve@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384"
+  integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==
   dependencies:
-    call-bind "^1.0.2"
-
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+    "@jest/types" "^27.5.1"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^27.5.1"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^27.5.1"
+    jest-validate "^27.5.1"
+    resolve "^1.20.0"
+    resolve.exports "^1.1.0"
+    slash "^3.0.0"
 
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+jest-runner-eslint@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jest-runner-eslint/-/jest-runner-eslint-1.0.0.tgz#5cede321ed5ed57233462c5204a0fa8d90f993bd"
+  integrity sha512-LMlAaIQqIIySEThv651bfvzwX6J4nOu91RaEUYmXJgn4XXbM40rSMlBaC8ZrrFcFemu88MFlnrCLuYf7ZHE2sQ==
   dependencies:
-    has-tostringtag "^1.0.0"
+    chalk "^3.0.0"
+    cosmiconfig "^6.0.0"
+    create-jest-runner "^0.6.0"
+    dot-prop "^5.3.0"
 
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+jest-runner@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5"
+  integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==
+  dependencies:
+    "@jest/console" "^27.5.1"
+    "@jest/environment" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.8.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^27.5.1"
+    jest-environment-jsdom "^27.5.1"
+    jest-environment-node "^27.5.1"
+    jest-haste-map "^27.5.1"
+    jest-leak-detector "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-runtime "^27.5.1"
+    jest-util "^27.5.1"
+    jest-worker "^27.5.1"
+    source-map-support "^0.5.6"
+    throat "^6.0.1"
+
+jest-runtime@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af"
+  integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/fake-timers" "^27.5.1"
+    "@jest/globals" "^27.5.1"
+    "@jest/source-map" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    chalk "^4.0.0"
+    cjs-module-lexer "^1.0.0"
+    collect-v8-coverage "^1.0.0"
+    execa "^5.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-mock "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-snapshot "^27.5.1"
+    jest-util "^27.5.1"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+
+jest-serializer@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64"
+  integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==
   dependencies:
-    has-symbols "^1.0.2"
+    "@types/node" "*"
+    graceful-fs "^4.2.9"
 
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+jest-snapshot@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1"
+  integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==
+  dependencies:
+    "@babel/core" "^7.7.2"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.0.0"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/babel__traverse" "^7.0.4"
+    "@types/prettier" "^2.1.5"
+    babel-preset-current-node-syntax "^1.0.0"
+    chalk "^4.0.0"
+    expect "^27.5.1"
+    graceful-fs "^4.2.9"
+    jest-diff "^27.5.1"
+    jest-get-type "^27.5.1"
+    jest-haste-map "^27.5.1"
+    jest-matcher-utils "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-util "^27.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^27.5.1"
+    semver "^7.3.2"
 
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+jest-util@^27.0.0, jest-util@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9"
+  integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==
   dependencies:
-    call-bind "^1.0.2"
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+jest-validate@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067"
+  integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^27.5.1"
+    leven "^3.1.0"
+    pretty-format "^27.5.1"
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+jest-watcher@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2"
+  integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==
+  dependencies:
+    "@jest/test-result" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    jest-util "^27.5.1"
+    string-length "^4.0.1"
 
-iterare@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/iterare/-/iterare-1.2.1.tgz#139c400ff7363690e33abffa33cbba8920f00042"
-  integrity sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==
+jest-worker@^25.1.0:
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
+  integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
 
-jest-worker@^27.4.5:
+jest-worker@^27.4.5, jest-worker@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
   integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
@@ -2652,11 +3717,28 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+jest@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc"
+  integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==
+  dependencies:
+    "@jest/core" "^27.5.1"
+    import-local "^3.0.2"
+    jest-cli "^27.5.1"
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -2664,12 +3746,50 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+jsdom@^16.6.0:
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
+  dependencies:
+    abab "^2.0.5"
+    acorn "^8.2.4"
+    acorn-globals "^6.0.0"
+    cssom "^0.4.4"
+    cssstyle "^2.3.0"
+    data-urls "^2.0.0"
+    decimal.js "^10.2.1"
+    domexception "^2.0.1"
+    escodegen "^2.0.0"
+    form-data "^3.0.0"
+    html-encoding-sniffer "^2.0.1"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.0"
+    parse5 "6.0.1"
+    saxes "^5.0.1"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.0.0"
+    w3c-hr-time "^1.0.2"
+    w3c-xmlserializer "^2.0.0"
+    webidl-conversions "^6.1.0"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.5.0"
+    ws "^7.4.6"
+    xml-name-validator "^3.0.0"
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
 json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -2689,11 +3809,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stringify-nice@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
-  integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
-
 json-to-ts@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/json-to-ts/-/json-to-ts-1.7.0.tgz#896a4eaa3d1ed3fef0c9e73ba98b3e8b25c1e02d"
@@ -2703,6 +3818,11 @@ json-to-ts@^1.6.0:
     hash.js "^1.0.3"
     pluralize "^3.1.0"
 
+json5@2.x, json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -2724,20 +3844,15 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonparse@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
-
-just-diff-apply@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.2.0.tgz#15da3888ab3acecc14ce9a067f2d7589c653cb89"
-  integrity sha512-unjtin7rnng0KUpE4RPWwTl8iwWiZuyZqOQ+vm8orV6aIXX8mHN8zlKCPPbOycfDNuLh2PBazbFhNoDJv4S/FA==
+kleur@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-just-diff@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.0.1.tgz#db8fe1cfeea1156f2374bfb289826dca28e7e390"
-  integrity sha512-X00TokkRIDotUIf3EV4xUm6ELc/IkqhS/vPSHdWnsM5y0HoNMfEqrazizI7g78lpHvnRSRt/PFfKtRqJCOGIuQ==
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
 levn@^0.4.1:
   version "0.4.1"
@@ -2747,117 +3862,13 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-libnpmaccess@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.3.tgz#473cc3e4aadb2bc713419d92e45d23b070d8cded"
-  integrity sha512-4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg==
-  dependencies:
-    aproba "^2.0.0"
-    minipass "^3.1.1"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
-
-libnpmdiff@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.3.tgz#ad3997330c887c1098ac42682f1e5ad014d49cec"
-  integrity sha512-AiwBtXtH7HjfmT7FbTf9LFzJB347RrIA4I+IewMfhq8vYXaUveHwJMVNgMM2H/o2J+7Hf12JCBoOF5bTwlmGyw==
-  dependencies:
-    "@npmcli/disparity-colors" "^2.0.0"
-    "@npmcli/installed-package-contents" "^1.0.7"
-    binary-extensions "^2.2.0"
-    diff "^5.0.0"
-    minimatch "^5.0.1"
-    npm-package-arg "^9.0.1"
-    pacote "^13.0.5"
-    tar "^6.1.0"
-
-libnpmexec@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.3.tgz#8f1af808d228766d046b24632304137d64630e1c"
-  integrity sha512-71QeTdmiR/nUyNhaSdVuquD65cDrEY2lKHyewlZSmQGX5k4ApimbLnpQkAjeEB7Y9/AVPNAM7F9nrHyb/aExjQ==
-  dependencies:
-    "@npmcli/arborist" "^5.0.0"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/run-script" "^3.0.0"
-    chalk "^4.1.0"
-    mkdirp-infer-owner "^2.0.0"
-    npm-package-arg "^9.0.1"
-    npmlog "^6.0.1"
-    pacote "^13.0.5"
-    proc-log "^2.0.0"
-    read "^1.0.7"
-    read-package-json-fast "^2.0.2"
-    walk-up-path "^1.0.0"
-
-libnpmfund@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.2.tgz#7da0827950f0db2cce0acb0dc7652d1834a8b239"
-  integrity sha512-wmFMP/93Wjy+jDg5LaSldDgAhSgCyA64JUUmp806Kae7y3YP9Qv5m1vUhPxT4yebxgB2v/I6G1/RUcNb1y0kVg==
-  dependencies:
-    "@npmcli/arborist" "^5.0.0"
-
-libnpmhook@^8.0.2:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.3.tgz#9628518a63455d21dafda312ee46175275707ff5"
-  integrity sha512-TEdNI1mC5zS+w/juCgxrwwQnpbq9lY76NDOS0N37pn6pWIUxB1Yq8mwy6MUEXR1TgH4HurSQyKT6I6Kp9Wjm4A==
-  dependencies:
-    aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
-
-libnpmorg@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.3.tgz#a85cbdb3665ad4f7c7279d239a4581ec2eeef5a6"
-  integrity sha512-r4CpmCEF+e5PbFMBi64xSXmqn0uGgV4T7NWpGL4/A6KT/DTtIxALILQZq+l0ZdN1xm4RjOvqSDR22oT4il8rAQ==
-  dependencies:
-    aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
-
-libnpmpack@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.0.3.tgz#0de60120a2456524b0cdb25bac58f454a1441c2e"
-  integrity sha512-/H4XXJp5S74palJfVhM5za/4dw8/1DRfU5g+t2taAojjr5+cSKyEoxxnHOnSRWu7zqqMeT8e4jX6Cz8lNUsbAw==
-  dependencies:
-    "@npmcli/run-script" "^3.0.0"
-    npm-package-arg "^9.0.1"
-    pacote "^13.0.5"
-
-libnpmpublish@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.3.tgz#b10cd9c8b2ebeccadc05aea78f11acb28fe606c4"
-  integrity sha512-slJ5XuTR3DIF669K7MLVSdhvkatoM3/D+wvryKxVtquKnEbfFORESI1w0lYD4tvrPEy6AU9y/qEMDqhUW712HQ==
-  dependencies:
-    normalize-package-data "^4.0.0"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
-    semver "^7.1.3"
-    ssri "^9.0.0"
-
-libnpmsearch@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.3.tgz#ed502a4c2c70ea36723180455fae1357546b2184"
-  integrity sha512-Ofq76qKAPhxbiyzPf/5LPjJln26VTKwU9hIU0ACxQ6tNtBJ1CHmI7iITrdp7vNezhZc0FlkXwrIpqXjhBJZgLQ==
-  dependencies:
-    npm-registry-fetch "^13.0.0"
-
-libnpmteam@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.3.tgz#9335fbbd032b3770f5c9b7ffc6203f47d1ed144a"
-  integrity sha512-LsYYLz4TlTpcqkusInY5MhKjiHFaCx1GV0LmydXJ/QMh+3IWBJpUhes4ynTZuFoJKkDIFjxyMU09ul+RZixgdg==
-  dependencies:
-    aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
-
-libnpmversion@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.2.tgz#02e517ee2a6454010ab81fd47d26fa1e328f356d"
-  integrity sha512-W76aMbL6NWkvOCoBpbWEoypCBsaXU95vhYY2eqBg0Ev11lwpjLIGC78ZCzT/M2hI00ena+yoCpGXGnAk949KOQ==
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/run-script" "^3.0.0"
-    json-parse-even-better-errors "^2.3.1"
-    proc-log "^2.0.0"
-    semver "^7.3.5"
-    stringify-package "^1.0.1"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
 
 libphonenumber-js@^1.9.43:
   version "1.9.50"
@@ -2879,12 +3890,34 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.isarguments@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+
+lodash.memoize@4.x:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@4.17.21, lodash@^4.17.19, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -2917,7 +3950,7 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.0, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+lru-cache@^7.4.0:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.8.0.tgz#649aaeb294a56297b5cbc5d70f198dcc5ebe5747"
   integrity sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg==
@@ -2934,32 +3967,24 @@ magic-string@0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
-make-error@^1.1.1:
+make-dir@^3.0.0, make-dir@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
+make-error@1.x, make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.1.1:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.1.2.tgz#acffef43f86250602b932eecc0ad3acc992ae233"
-  integrity sha512-GWMGiZsKVeJACQGJ1P3Z+iNec7pLsU6YW1q11eaPn3RR8nRXHppFWfP7Eu0//55JK3hSjrAQRl8sDa5uXpq1Ew==
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.0.2"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.1.1"
-    ssri "^9.0.0"
+    tmpl "1.0.5"
 
 media-typer@0.3.0:
   version "0.3.0"
@@ -2988,7 +4013,7 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-methods@~1.1.2:
+methods@^1.1.2, methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
@@ -3006,7 +4031,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -3018,6 +4043,11 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
+mime@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -3035,73 +4065,19 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
-  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimist@1.2.6, minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
-  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-json-stream@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
-  integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
-  dependencies:
-    jsonparse "^1.3.1"
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
   integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -3109,15 +4085,6 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp-infer-owner@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
-  integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
-  dependencies:
-    chownr "^2.0.0"
-    infer-owner "^1.0.4"
-    mkdirp "^1.0.3"
-
 mkdirp@^0.5.4:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -3125,7 +4092,7 @@ mkdirp@^0.5.4:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -3152,7 +4119,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.2:
+ms@2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -3171,7 +4138,7 @@ multer@1.4.4:
     type-is "^1.6.4"
     xtend "^4.0.0"
 
-mute-stream@0.0.8, mute-stream@~0.0.4:
+mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
@@ -3202,7 +4169,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.3, negotiator@^0.6.3:
+negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -3212,6 +4179,11 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+node-addon-api@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
 "node-config-ts@npm:node-config-ts-2":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-config-ts-2/-/node-config-ts-2-1.0.0.tgz#349f5dd10e8de8d75f279e2a1e1148f782e77fbe"
@@ -3236,28 +4208,17 @@ node-emoji@1.11.0:
   dependencies:
     lodash "^4.17.21"
 
-node-fetch@^2.6.1:
+node-fetch@^2.6.1, node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-gyp@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.0.0.tgz#e1da2067427f3eb5bb56820cb62bc6b1e4bd2089"
-  integrity sha512-Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-releases@^2.0.2:
   version "2.0.2"
@@ -3271,204 +4232,33 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.0.tgz#1122d5359af21d4cd08718b92b058a658594177c"
-  integrity sha512-m+GL22VXJKkKbw62ZaBBjv8u6IE3UI4Mh5QakIqs3fWiKe0Xyi6L97hakwZK41/LD4R/2ly71Bayx0NLMwLA/g==
-  dependencies:
-    hosted-git-info "^5.0.0"
-    is-core-module "^2.8.1"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
-
 normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-npm-audit-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
-  integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
-  dependencies:
-    chalk "^4.0.0"
-
-npm-bundled@^1.1.1, npm-bundled@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
-  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-install-checks@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
-  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
-  dependencies:
-    semver "^7.1.1"
-
-npm-install-checks@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
-  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
-  dependencies:
-    semver "^7.1.1"
-
-npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-package-arg@^9.0.0, npm-package-arg@^9.0.1:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.0.2.tgz#f3ef7b1b3b02e82564af2d5228b4c36567dcd389"
-  integrity sha512-v/miORuX8cndiOheW8p2moNuPJ7QhcFh9WGlTorruG8hXSA23vMTEp5hTCmDxic0nD8KHhj/NQgFuySD3GYY3g==
-  dependencies:
-    hosted-git-info "^5.0.0"
-    semver "^7.3.5"
-    validate-npm-package-name "^4.0.0"
-
-npm-packlist@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.0.0.tgz#74795ebbbf91bd5a2db6ecff4d6fe1f1c1a07e11"
-  integrity sha512-uU20UwM4Hogfab1Q7htJbhcyafM9lGHxOrDjkKvR2S3z7Ds0uRaESk0cXctczk+ABT4DZWNwjB10xlurFdEwZg==
-  dependencies:
-    glob "^7.2.0"
-    ignore-walk "^5.0.1"
-    npm-bundled "^1.1.2"
-    npm-normalize-package-bin "^1.0.1"
-
-npm-pick-manifest@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
-  integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
-  dependencies:
-    npm-install-checks "^5.0.0"
-    npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^9.0.0"
-    semver "^7.3.5"
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-npm-profile@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.0.2.tgz#b2da9887d16d1f0d1ce8a9c3b37a48454a372919"
-  integrity sha512-0Fq8l+A10YXnnS63E3HThWjOb7+19Wsh1nOVutC2fKuowar8t/5PpINsbcm5xQ2dA28uAu+wjFfUyiEVSMz4Jw==
-  dependencies:
-    npm-registry-fetch "^13.0.0"
-    proc-log "^2.0.0"
-
-npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1, npm-registry-fetch@^13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.1.0.tgz#71bed52e30a4b27441604bbba79c7db8e0e34cb5"
-  integrity sha512-TIYL5X8CcwDhbFMXFDShNcpG6OMCYK6VzvSr6MUWP20tCU2DJ4ao2qQg3DT+3Pet8mO6/cgbZpon4LMh3duYLg==
-  dependencies:
-    make-fetch-happen "^10.0.6"
-    minipass "^3.1.6"
-    minipass-fetch "^2.0.3"
-    minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^9.0.1"
-    proc-log "^2.0.0"
-
-npm-run-path@^4.0.0:
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
-npm-user-validate@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
-  integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
-
-npm@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/npm/-/npm-8.6.0.tgz#46a601fdffa80b018e1dcf08e10d5efb625e5c9e"
-  integrity sha512-icekvN8FJFESIFkLaFEVl05Nocl5Id5HnoVhJzhCUvtNY8tj9kfUlH/J527fZq/8ltsAUqpettfutwRjQYS2fA==
-  dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
-    "@npmcli/arborist" "^5.0.4"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/config" "^4.0.1"
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/map-workspaces" "^2.0.2"
-    "@npmcli/package-json" "^1.0.1"
-    "@npmcli/run-script" "^3.0.1"
-    abbrev "~1.1.1"
-    ansicolors "~0.3.2"
-    ansistyles "~0.1.3"
-    archy "~1.0.0"
-    cacache "^16.0.3"
-    chalk "^4.1.2"
-    chownr "^2.0.0"
-    cli-columns "^4.0.0"
-    cli-table3 "^0.6.1"
-    columnify "^1.6.0"
-    fastest-levenshtein "^1.0.12"
-    glob "^7.2.0"
-    graceful-fs "^4.2.9"
-    hosted-git-info "^5.0.0"
-    ini "^2.0.0"
-    init-package-json "^3.0.2"
-    is-cidr "^4.0.2"
-    json-parse-even-better-errors "^2.3.1"
-    libnpmaccess "^6.0.2"
-    libnpmdiff "^4.0.2"
-    libnpmexec "^4.0.2"
-    libnpmfund "^3.0.1"
-    libnpmhook "^8.0.2"
-    libnpmorg "^4.0.2"
-    libnpmpack "^4.0.2"
-    libnpmpublish "^6.0.2"
-    libnpmsearch "^5.0.2"
-    libnpmteam "^4.0.2"
-    libnpmversion "^3.0.1"
-    make-fetch-happen "^10.1.1"
-    minipass "^3.1.6"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    mkdirp-infer-owner "^2.0.0"
-    ms "^2.1.2"
-    node-gyp "^9.0.0"
-    nopt "^5.0.0"
-    npm-audit-report "^3.0.0"
-    npm-install-checks "^4.0.0"
-    npm-package-arg "^9.0.1"
-    npm-pick-manifest "^7.0.0"
-    npm-profile "^6.0.2"
-    npm-registry-fetch "^13.1.0"
-    npm-user-validate "^1.0.1"
-    npmlog "^6.0.1"
-    opener "^1.5.2"
-    pacote "^13.0.5"
-    parse-conflict-json "^2.0.2"
-    proc-log "^2.0.1"
-    qrcode-terminal "^0.12.0"
-    read "~1.0.7"
-    read-package-json "^5.0.0"
-    read-package-json-fast "^2.0.3"
-    readdir-scoped-modules "^1.1.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    ssri "^8.0.1"
-    tar "^6.1.11"
-    text-table "~0.2.0"
-    tiny-relative-date "^1.3.0"
-    treeverse "^1.0.4"
-    validate-npm-package-name "^4.0.0"
-    which "^2.0.2"
-    write-file-atomic "^4.0.1"
-
-npmlog@^6.0.0, npmlog@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.1.tgz#06f1344a174c06e8de9c6c70834cfba2964bba17"
-  integrity sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
   dependencies:
-    are-we-there-yet "^3.0.0"
+    are-we-there-yet "^2.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.0"
+    gauge "^3.0.0"
     set-blocking "^2.0.0"
 
+nwsapi@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
 object-assign@^4, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -3540,30 +4330,37 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@1.4.0, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0:
+onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
 optional@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/optional/-/optional-0.1.4.tgz#cdb1a9bedc737d2025f690ceeb50e049444fd5b3"
   integrity sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw==
 
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -3604,44 +4401,24 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
-    aggregate-error "^3.0.0"
+    p-try "^2.0.0"
 
-packet-reader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74"
-  integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==
-
-pacote@^13.0.3, pacote@^13.0.5:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.1.1.tgz#d3e6e27ffc5137d2a07233ed6fba2a209ecb2b7b"
-  integrity sha512-MTT3k1OhUo+IpvoHGp25OwsRU0L+kJQM236OCywxvY4OIJ/YfloNW2/Yc3HMASH10BkfZaGMVK/pxybB7fWcLw==
-  dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/promise-spawn" "^3.0.0"
-    "@npmcli/run-script" "^3.0.1"
-    cacache "^16.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    infer-owner "^1.0.4"
-    minipass "^3.1.6"
-    mkdirp "^1.0.4"
-    npm-package-arg "^9.0.0"
-    npm-packlist "^5.0.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
-    promise-retry "^2.0.1"
-    read-package-json "^5.0.0"
-    read-package-json-fast "^2.0.3"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -3650,16 +4427,7 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-conflict-json@^2.0.1, parse-conflict-json@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
-  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
-  dependencies:
-    json-parse-even-better-errors "^2.3.1"
-    just-diff "^5.0.1"
-    just-diff-apply "^5.2.0"
-
-parse-json@^5.0.0:
+parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -3669,11 +4437,21 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
+parse5@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+
 parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3709,62 +4487,28 @@ pg-connection-string@^2.5.0:
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
   integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
 
-pg-int8@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
-  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
-
-pg-pool@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905"
-  integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==
-
-pg-protocol@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0"
-  integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==
-
-pg-types@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
-  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
-  dependencies:
-    pg-int8 "1.0.1"
-    postgres-array "~2.0.0"
-    postgres-bytea "~1.0.0"
-    postgres-date "~1.0.4"
-    postgres-interval "^1.1.0"
-
-pg@^8.7.3:
-  version "8.7.3"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz#8a5bdd664ca4fda4db7997ec634c6e5455b27c44"
-  integrity sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==
-  dependencies:
-    buffer-writer "2.0.0"
-    packet-reader "1.0.0"
-    pg-connection-string "^2.5.0"
-    pg-pool "^3.5.1"
-    pg-protocol "^1.5.0"
-    pg-types "^2.1.0"
-    pgpass "1.x"
-
-pgpass@1.x:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
-  integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
-  dependencies:
-    split2 "^4.1.0"
-
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+pirates@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
+  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+
+pkg-dir@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
 pluralize@8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
@@ -3775,77 +4519,42 @@ pluralize@^3.1.0:
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-3.1.0.tgz#84213d0a12356069daa84060c559242633161368"
   integrity sha1-hCE9ChI1YGnaqEBgxVkkJjMWE2g=
 
-postgres-array@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
-  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
-
-postgres-bytea@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
-  integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
-
-postgres-date@~1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
-  integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
-
-postgres-interval@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695"
-  integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==
-  dependencies:
-    xtend "^4.0.0"
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
 prettier@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-proc-log@^2.0.0, proc-log@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
-  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+pretty-format@^27.0.0, pretty-format@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+  integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
+  dependencies:
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
+    react-is "^17.0.1"
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-promise-all-reject-late@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2"
-  integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==
-
-promise-call-limit@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24"
-  integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q==
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-promise-retry@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
-  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
-  dependencies:
-    err-code "^2.0.2"
-    retry "^0.12.0"
-
-promzard@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
-  integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=
+prompts@^2.0.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
   dependencies:
-    read "1"
+    kleur "^3.0.3"
+    sisteransi "^1.0.5"
 
 proxy-addr@~2.0.7:
   version "2.0.7"
@@ -3860,6 +4569,11 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
+psl@^1.1.33:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -3868,23 +4582,23 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-qrcode-terminal@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
-  integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
-
-qs@6.10.3:
+qs@6.10.3, qs@^6.10.1:
   version "6.10.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
   integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
   dependencies:
     side-channel "^1.0.4"
 
+qs@6.9.3:
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
+  integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
+
 qs@6.9.7:
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
@@ -3932,35 +4646,10 @@ raw-body@2.5.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-read-cmd-shim@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz#62b8c638225c61e6cc607f8f4b779f3b8238f155"
-  integrity sha512-KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog==
-
-read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
-  integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
-  dependencies:
-    json-parse-even-better-errors "^2.3.0"
-    npm-normalize-package-bin "^1.0.1"
-
-read-package-json@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.0.tgz#d62602755547e152a3923c220238d9a7f0b60745"
-  integrity sha512-1cjk2MV5ONDMn34uxSID3X8NY7VKsXfJnjbcVdFMvHEnJOBzU6MJ7/3yg6QFVZDq5/1yFNrKBUK9kGnonyGP2Q==
-  dependencies:
-    glob "^7.2.0"
-    json-parse-even-better-errors "^2.3.1"
-    normalize-package-data "^4.0.0"
-    npm-normalize-package-bin "^1.0.1"
-
-read@1, read@^1.0.7, read@~1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
-  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
-  dependencies:
-    mute-stream "~0.0.4"
+react-is@^17.0.1:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 readable-stream@1.1.x:
   version "1.1.14"
@@ -3994,16 +4683,6 @@ readable-stream@^3.4.0, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdir-scoped-modules@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
-  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
-  dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    graceful-fs "^4.1.2"
-    once "^1.3.0"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -4018,30 +4697,18 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
-redis-errors@^1.0.0:
+redis-errors@^1.0.0, redis-errors@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
   integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
 
-redis-parser@3.0.0:
+redis-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
   integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=
   dependencies:
     redis-errors "^1.0.0"
 
-redis@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-4.0.6.tgz#a2ded4d9f4f4bad148e54781051618fc684cd858"
-  integrity sha512-IaPAxgF5dV0jx+A9l6yd6R9/PAChZIoAskDVRzUODeLDNhsMlq7OLLTmu0AwAr0xjrJ1bibW5xdpRwqIQ8Q0Xg==
-  dependencies:
-    "@node-redis/bloom" "1.0.1"
-    "@node-redis/client" "1.0.5"
-    "@node-redis/graph" "1.0.0"
-    "@node-redis/json" "1.0.2"
-    "@node-redis/search" "1.0.5"
-    "@node-redis/time-series" "1.0.2"
-
 reflect-metadata@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
@@ -4052,17 +4719,39 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
 require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve@^1.1.6:
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve.exports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
+  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
+
+resolve@^1.1.6, resolve@^1.20.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -4084,11 +4773,6 @@ retry-as-promised@^5.0.0:
   resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-5.0.0.tgz#f4ecc25133603a2d2a7aff4a128691d7bc506d54"
   integrity sha512-6S+5LvtTl2ggBumk04hBo/4Uf6fRJUwIgunGZ7CYEBCeufGFW1Pu6ucUf/UskHeWOIsUcLOGLFXPig5tR5V1nA==
 
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -4142,6 +4826,13 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+saxes@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+  dependencies:
+    xmlchars "^2.2.0"
+
 schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
@@ -4151,13 +4842,18 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.4, semver@^7.3.5:
+semver@7.x, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b"
   integrity sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==
   dependencies:
     lru-cache "^7.4.0"
 
+semver@^6.0.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 send@0.17.2:
   version "0.17.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
@@ -4273,39 +4969,22 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.2, signal-exit@^3.0.7:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+sisteransi@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-socks-proxy-agent@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
-  integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.1"
-    socks "^2.6.1"
-
-socks@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
-  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
-  dependencies:
-    ip "^1.1.5"
-    smart-buffer "^4.2.0"
-
-source-map-support@0.5.21, source-map-support@~0.5.20:
+source-map-support@0.5.21, source-map-support@^0.5.6, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -4313,12 +4992,17 @@ source-map-support@0.5.21, source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@0.7.3, source-map@~0.7.2:
+source-map@0.7.3, source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-source-map@^0.6.0, source-map@^0.6.1:
+source-map@^0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -4328,55 +5012,27 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
-
-split2@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809"
-  integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sqlstring@^2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
   integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
 
-ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+stack-utils@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
+  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
   dependencies:
-    minipass "^3.1.1"
+    escape-string-regexp "^2.0.0"
 
-ssri@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.0.tgz#70ad90e339eb910f1a7ff1dcf4afc268326c4547"
-  integrity sha512-Y1Z6J8UYnexKFN1R/hxUaYoY2LVdKEzziPmVAFKiKX8fiwvCJTVzn/xYE9TEWod5OVyNfIHHuVfIEuBClL/uJQ==
-  dependencies:
-    minipass "^3.1.1"
+standard-as-callback@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
+  integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
 statuses@2.0.1:
   version "2.0.1"
@@ -4401,6 +5057,14 @@ string-at@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
+string-length@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
+  dependencies:
+    char-regex "^1.0.2"
+    strip-ansi "^6.0.0"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -4481,11 +5145,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-package@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
-  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -4498,6 +5157,11 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -4508,6 +5172,31 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+superagent@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.2.tgz#71393141edd086ccf2544a29a4a609e46b7911f3"
+  integrity sha512-o9/fP6dww7a4xmEF5a484o2rG34UUGo8ztDlv7vbCWuqPhpndMi0f7eXxdlryk5U12Kzy46nh8eNpLAJ93Alsg==
+  dependencies:
+    component-emitter "^1.3.0"
+    cookiejar "^2.1.3"
+    debug "^4.3.3"
+    fast-safe-stringify "^2.1.1"
+    form-data "^4.0.0"
+    formidable "^2.0.1"
+    methods "^1.1.2"
+    mime "^2.5.0"
+    qs "^6.10.1"
+    readable-stream "^3.6.0"
+    semver "^7.3.5"
+
+supertest@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.2.2.tgz#04a5998fd3efaff187cb69f07a169755d655b001"
+  integrity sha512-wCw9WhAtKJsBvh07RaS+/By91NNE0Wh0DN19/hWPlBOU8tAfOtbZoVSV4xXeoKoxgPx0rx2y+y+8660XtE7jzg==
+  dependencies:
+    methods "^1.1.2"
+    superagent "^7.1.0"
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -4515,7 +5204,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.1.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -4529,6 +5218,14 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-hyperlinks@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
+  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
+  dependencies:
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
+
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -4551,12 +5248,17 @@ symbol-observable@4.0.0:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
   integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
 
+symbol-tree@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
 tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -4568,6 +5270,14 @@ tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
+terminal-link@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
+  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    supports-hyperlinks "^2.0.0"
+
 terser-webpack-plugin@^5.1.3:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
@@ -4589,21 +5299,35 @@ terser@^5.7.2:
     source-map "~0.7.2"
     source-map-support "~0.5.20"
 
-text-table@^0.2.0, text-table@~0.2.0:
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+throat@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
+  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
+
+throat@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
+  integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
+
 through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-tiny-relative-date@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
-  integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
-
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -4611,6 +5335,16 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmpl@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -4628,6 +5362,22 @@ toposort-class@^1.0.1:
   resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988"
   integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=
 
+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
+
+tr46@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
+  dependencies:
+    punycode "^2.1.1"
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -4638,15 +5388,19 @@ tree-kill@1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-treeverse@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
-  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
-
-treeverse@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
-  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+ts-jest@^27.1.4:
+  version "27.1.4"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.4.tgz#84d42cf0f4e7157a52e7c64b1492c46330943e00"
+  integrity sha512-qjkZlVPWVctAezwsOD1OPzbZ+k7zA5z3oxII4dGdZo5ggX/PL7kvwTM0pXTr10fAtbiVpJaL3bWd502zAhpgSQ==
+  dependencies:
+    bs-logger "0.x"
+    fast-json-stable-stringify "2.x"
+    jest-util "^27.0.0"
+    json5 "2.x"
+    lodash.memoize "4.x"
+    make-error "1.x"
+    semver "7.x"
+    yargs-parser "20.x"
 
 ts-loader@^9.2.8:
   version "9.2.8"
@@ -4677,6 +5431,11 @@ ts-node@^10.7.0:
     v8-compile-cache-lib "^3.0.0"
     yn "3.1.1"
 
+tsconfig-paths-jest@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths-jest/-/tsconfig-paths-jest-0.0.1.tgz#a977a5648c434037b69884e644ce1b82bf025b68"
+  integrity sha1-qXelZIxDQDe2mITmRM4bgr8CW2g=
+
 tsconfig-paths-webpack-plugin@3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz#01aafff59130c04a8c4ebc96a3045c43c376449a"
@@ -4720,6 +5479,18 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-detect@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
@@ -4738,6 +5509,13 @@ type-is@^1.6.4, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -4763,19 +5541,10 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
+universalify@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 universalify@^2.0.0:
   version "2.0.0"
@@ -4819,20 +5588,14 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-validate-npm-package-license@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-validate-npm-package-name@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
-  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+v8-to-istanbul@^8.1.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed"
+  integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==
   dependencies:
-    builtins "^5.0.0"
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+    source-map "^0.7.3"
 
 validator@^13.7.0:
   version "13.7.0"
@@ -4844,10 +5607,26 @@ vary@^1, vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-walk-up-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e"
-  integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg==
+w3c-hr-time@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+  dependencies:
+    browser-process-hrtime "^1.0.0"
+
+w3c-xmlserializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+  dependencies:
+    xml-name-validator "^3.0.0"
+
+walker@^1.0.7:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
+  dependencies:
+    makeerror "1.0.12"
 
 watchpack@^2.3.1:
   version "2.3.1"
@@ -4857,7 +5636,7 @@ watchpack@^2.3.1:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-wcwidth@^1.0.0, wcwidth@^1.0.1:
+wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
   integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
@@ -4869,6 +5648,16 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
 
+webidl-conversions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+
+webidl-conversions@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+
 webpack-node-externals@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917"
@@ -4909,6 +5698,18 @@ webpack@5.71.0:
     watchpack "^2.3.1"
     webpack-sources "^3.2.3"
 
+whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -4917,6 +5718,15 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
+  dependencies:
+    lodash "^4.7.0"
+    tr46 "^2.1.0"
+    webidl-conversions "^6.1.0"
+
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -4928,14 +5738,14 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which@^2.0.1, which@^2.0.2:
+which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.5:
+wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -4956,44 +5766,93 @@ wkx@^0.5.0:
   dependencies:
     "@types/node" "*"
 
-word-wrap@^1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^4.0.0, write-file-atomic@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
-  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
   dependencies:
     imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+ws@^7.4.6:
+  version "7.5.7"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
+  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
 xtend@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-yallist@4.0.0, yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yaml@^1.10.0:
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yaml@^1.10.0, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yargs-parser@20.x, yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
diff --git a/package.json b/package.json
deleted file mode 100644
index 43c7353ef..000000000
--- a/package.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": "pychat",
-  "version": "1.0.0",
-  "description": "Opensource chat",
-  "scripts": {
-    "build": "vite --config build/vite.config.ts build",
-    "start": "vite --config build/vite.config.ts",
-    "cp-prod-files": "tar c dist/ | ssh http@pychat.org -p 8886 \"rm -rf /srv/http/pychat/frontend/dist && tar x -C /srv/http/pychat/frontend/\"",
-    "serve": "yarn build && node build/static-server.js",
-    "postinstall": "patch -p1 -i patches/vue-class-component+8.0.0-rc.1.patch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/akoidan/pychat.git"
-  },
-  "author": "Andrew Koidan <deathangel908@gmail.com",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/akoidan/pychat/issues"
-  },
-  "homepage": "https://github.com/akoidan/pychat#readme",
-  "devDependencies": {
-    "@babel/types": "^7.17.0",
-    "@types/chrome": "^0.0.180",
-    "@types/cordova": "^0.0.34",
-    "@types/electron": "^1.6.10",
-    "@types/giphy-api": "^2.0.3",
-    "@types/lodash.debounce": "4.0.6",
-    "@types/node": "^17.0.23",
-    "@types/vue-cropperjs": "^4.1.1",
-    "@types/websql": "0.0.27",
-    "@vitejs/plugin-vue": "^2.3.1",
-    "patch-package": "^6.2.2",
-    "sass": "^1.49.9",
-    "typescript": "^4.6.3",
-    "vite": "^2.9.1",
-    "vite-plugin-static-copy": "https://github.com/akoidan/vite-plugin-static-copy",
-    "vue-tsc": "^0.33.9",
-    "vite-plugin-checker": "^0.4.4"
-  },
-  "dependencies": {
-    "electron-devtools-installer": "^3.2.0",
-    "emoji-datasource-apple": "^7.0.2",
-    "highlight.js": "^11.5.0",
-    "is-mobile": "2.1.0",
-    "lines-logger": "^2.0.2",
-    "lodash.debounce": "4.0.8",
-    "mitt": "^3.0.0",
-    "npm-font-open-sans": "1.1.0",
-    "reflect-metadata": "0.1.13",
-    "servor": "^4.0.2",
-    "spainter": "^1.2.12",
-    "typeface-oswald": "0.0.75",
-    "vue": "^3.2.31",
-    "vue-class-component": "https://github.com/vuejs/vue-class-component#next",
-    "vue-cropperjs": "^4.2.0",
-    "vue-property-decorator": "npm:@smyld/vue-property-decorator@^10.0.17",
-    "vue-router": "^4.0.14",
-    "vuex": "^4.0.2",
-    "vuex-module-decorators": "^2.0.0"
-  }
-}

From 3e6b2ca12a3691bf0b5fb10635c784444f348350 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 02:08:27 +0300
Subject: [PATCH 011/221] Register works

---
 common/dto.ts                                 |    8 +-
 newback/config/Config.d.ts                    |   16 +
 newback/config/default.json                   |   10 +
 .../migration-template/202204110326-init.sql  |    3 +-
 newback/package.json                          |    3 +
 ...20410104137-modify_users_add_new_fields.js |   21 -
 .../src/data/database/model/image.model.ts    |    8 +-
 .../database/model/message.history.model.ts   |    2 -
 .../src/data/database/model/message.model.ts  |    3 +-
 newback/src/data/database/model/room.model.ts |    2 +-
 .../model/subscription.message.model.ts       |    1 -
 .../data/database/model/subscription.model.ts |    1 -
 .../database/model/uploaded.file.model.ts     |    7 +-
 .../data/database/model/user.auth.model.ts    |    2 +-
 .../data/database/model/user.profile.model.ts |    2 +-
 .../database/model/user.settings.model.ts     |    2 +-
 .../data/database/model/verification.model.ts |    4 +-
 .../database/repository/room.repository.ts    |   10 +-
 .../database/repository/user.repository.ts    |   23 +-
 newback/src/data/redis/RedisService.ts        |    1 -
 newback/src/main.ts                           |    1 -
 newback/src/modules/auth/auth.controller.ts   |    9 +-
 newback/src/modules/auth/auth.module.spec.ts  |    2 +-
 newback/src/modules/auth/auth.module.ts       |   15 +-
 newback/src/modules/auth/auth.service.ts      |   66 +-
 .../validators/login.request.validator.ts     |   11 +-
 .../validate.user.request.validator.ts        |   10 +-
 .../src/modules/email.render/email.module.ts  |   23 +
 .../email.render/email.sender.service.ts      |   47 +
 newback/src/modules/email/email.service.ts    |   30 -
 newback/src/modules/html/html.service.spec.ts |   27 +-
 newback/src/modules/html/html.service.ts      |   14 +-
 newback/src/modules/logger/interceptor.ts     |    1 +
 newback/src/modules/logger/logger.module.ts   |    3 +-
 newback/src/templates/change_email.html       |    8 +-
 newback/src/templates/change_password.html    |    8 +-
 newback/src/templates/sign_up_email.html      |   17 +-
 newback/src/templates/token_email.html        |   10 +-
 newback/yarn.lock                             | 1025 ++++++++++++++++-
 39 files changed, 1241 insertions(+), 215 deletions(-)
 delete mode 100644 newback/src/data/database/migration/20220410104137-modify_users_add_new_fields.js
 create mode 100644 newback/src/modules/email.render/email.module.ts
 create mode 100644 newback/src/modules/email.render/email.sender.service.ts
 delete mode 100644 newback/src/modules/email/email.service.ts

diff --git a/common/dto.ts b/common/dto.ts
index fc8cd2bdb..50ff656b9 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -34,6 +34,7 @@ export enum MessageStatus {
   READ = 'READ',
   RECEIVED = 'RECEIVED', //sent
 }
+
 export enum Theme {
   COLOR_LOR = 'COLOR_LOR',
   COLOR_REG = 'COLOR_REG',
@@ -51,12 +52,13 @@ export enum VerificationType {
 export enum ImageType {
   VIDEO = 'VIDEO',
   IMAGE = 'IMAGE',
-  GIPHY=  'GIPHY'
+  GIPHY = 'GIPHY'
 }
-export enum  UploadedFileChoices {
+
+export enum UploadedFileChoices {
   VIDEO = 'VIDEO',
   FILE = 'FILE',
-  MEDIA_RECORD= 'MEDIA_RECORD',
+  MEDIA_RECORD = 'MEDIA_RECORD',
   AUDIO_RECORD = 'AUDIO_RECORD',
   IMAGE = 'IMAGE',
   PREVIEW = 'PREVIEW',
diff --git a/newback/config/Config.d.ts b/newback/config/Config.d.ts
index c4c675df6..fb4b488e1 100644
--- a/newback/config/Config.d.ts
+++ b/newback/config/Config.d.ts
@@ -5,6 +5,7 @@ declare module "node-config-ts" {
     name: string
     application: Application
     settings: Settings
+    email: Email
     redis: Redis
     frontend: Frontend
     mysql: Mysql
@@ -35,6 +36,21 @@ declare module "node-config-ts" {
     port: number
     database: number
   }
+  interface Email {
+    host: string
+    port: number
+    secure: boolean
+    tls: Tls
+    auth: Auth
+    from: string
+  }
+  interface Auth {
+    user: string
+    password: string
+  }
+  interface Tls {
+    ciphers: string
+  }
   interface Settings {
     wsIdCharLength: number
     allRedisRoom: string
diff --git a/newback/config/default.json b/newback/config/default.json
index 8f309b304..77bad58d7 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -19,6 +19,16 @@
     "pingInterval": 300000,
     "clientNoServerPingCloseTimeout": 320000
   },
+  "email": {
+    "host": "smtp.gmail.com",
+    "port": 587,
+    "auth": {
+      "type": "login",
+      "user": "chat.django@gmail.com",
+      "password": "Ilovepython"
+    },
+    "from": "root@pychat.org"
+  },
   "redis": {
     "host": "localhost",
     "port": 6379,
diff --git a/newback/config/migration-template/202204110326-init.sql b/newback/config/migration-template/202204110326-init.sql
index b0753bd11..90bc4cc0d 100644
--- a/newback/config/migration-template/202204110326-init.sql
+++ b/newback/config/migration-template/202204110326-init.sql
@@ -206,9 +206,8 @@ CREATE TABLE `verification`
 (
     `id`         INTEGER auto_increment,
     `type`       ENUM ('REGISTER', 'PASSWORD', 'EMAIL', 'CONFIRM_EMAIL') NOT NULL,
-    `token`      VARCHAR(17)                                             NOT NULL,
+    `token`      VARCHAR(32)                                             NOT NULL,
     `user_id`    INTEGER                                                 NOT NULL,
-    `time`       DATETIME                                                NOT NULL,
     `verified`   TINYINT(1)                                              NOT NULL DEFAULT false,
     `email`      VARCHAR(190),
     `created_at` DATETIME                                                NOT NULL,
diff --git a/newback/package.json b/newback/package.json
index fd7b21bca..d48d42485 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -13,12 +13,14 @@
     "start:debug": "nest start --debug --watch"
   },
   "dependencies": {
+    "@nestjs-modules/mailer": "^1.6.1",
     "@nestjs/common": "^8.4.4",
     "@nestjs/core": "^8.4.4",
     "@nestjs/platform-express": "^8.4.4",
     "@nestjs/sequelize": "^8.0.0",
     "@nestjs/swagger": "^5.2.1",
     "@types/bcrypt": "^5.0.0",
+    "@types/nodemailer": "^6.4.4",
     "bcrypt": "^5.0.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -27,6 +29,7 @@
     "mysql2": "^2.3.3",
     "node-config-ts": "npm:node-config-ts-2",
     "node-db-migration": "^1.4.0",
+    "nodemailer": "^6.7.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7",
     "sequelize": "^6.18.0",
diff --git a/newback/src/data/database/migration/20220410104137-modify_users_add_new_fields.js b/newback/src/data/database/migration/20220410104137-modify_users_add_new_fields.js
deleted file mode 100644
index a740c9a27..000000000
--- a/newback/src/data/database/migration/20220410104137-modify_users_add_new_fields.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-module.exports = {
-  async up (queryInterface, Sequelize) {
-    /**
-     * Add altering commands here.
-     *
-     * Example:
-     * await queryInterface.createTable('users', { id: Sequelize.INTEGER });
-     */
-  },
-
-  async down (queryInterface, Sequelize) {
-    /**
-     * Add reverting commands here.
-     *
-     * Example:
-     * await queryInterface.dropTable('users');
-     */
-  }
-};
diff --git a/newback/src/data/database/model/image.model.ts b/newback/src/data/database/model/image.model.ts
index 630de08bc..493879770 100644
--- a/newback/src/data/database/model/image.model.ts
+++ b/newback/src/data/database/model/image.model.ts
@@ -8,18 +8,14 @@ import {
   Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
-import {
-  ImageType,
-  UploadedFileChoices
-} from '@/data/types/dto/dto';
+import {ImageType} from '@/data/types/dto/dto';
 import {MessageModel} from '@/data/database/model/message.model';
 
 const uniqueUserIdSymbMess = 'unique_image_symbol_message';
 
 
 @Injectable()
-@Table({ tableName: 'image'})
+@Table({tableName: 'image'})
 export class ImageModel extends Model<ImageModel> {
 
 
diff --git a/newback/src/data/database/model/message.history.model.ts b/newback/src/data/database/model/message.history.model.ts
index 53a44703e..8d99046b8 100644
--- a/newback/src/data/database/model/message.history.model.ts
+++ b/newback/src/data/database/model/message.history.model.ts
@@ -7,9 +7,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {config} from 'node-config-ts';
 import {MessageModel} from '@/data/database/model/message.model';
-import {UserModel} from '@/data/database/model/user.model';
 
 
 @Injectable()
diff --git a/newback/src/data/database/model/message.model.ts b/newback/src/data/database/model/message.model.ts
index bb9961e14..98c930e53 100644
--- a/newback/src/data/database/model/message.model.ts
+++ b/newback/src/data/database/model/message.model.ts
@@ -10,10 +10,9 @@ import {Injectable} from '@nestjs/common';
 import {MessageStatus,} from '@/data/types/dto/dto';
 import {UserModel} from '@/data/database/model/user.model';
 import {RoomModel} from '@/data/database/model/room.model';
-import {config} from 'node-config-ts';
 
 @Injectable()
-@Table({ tableName: 'message'})
+@Table({tableName: 'message'})
 export class MessageModel extends Model<MessageModel> {
 
   @Column({
diff --git a/newback/src/data/database/model/room.model.ts b/newback/src/data/database/model/room.model.ts
index 0a73a79f5..0ff516521 100644
--- a/newback/src/data/database/model/room.model.ts
+++ b/newback/src/data/database/model/room.model.ts
@@ -18,7 +18,7 @@ import {ChannelModel} from '@/data/database/model/channel.model';
 // 	constraint p2p_only_if_private
 // 		check (`p2p` = 0x00 or `name` is null)
 @Injectable()
-@Table({ tableName: 'room'})
+@Table({tableName: 'room'})
 export class RoomModel extends Model<RoomModel> {
 
   @Column({
diff --git a/newback/src/data/database/model/subscription.message.model.ts b/newback/src/data/database/model/subscription.message.model.ts
index ae28f8e07..5baea7833 100644
--- a/newback/src/data/database/model/subscription.message.model.ts
+++ b/newback/src/data/database/model/subscription.message.model.ts
@@ -10,7 +10,6 @@ import {
 import {Injectable} from '@nestjs/common';
 import {MessageModel} from '@/data/database/model/message.model';
 import {SubscriptionModel} from '@/data/database/model/subscription.model';
-import {UserModel} from '@/data/database/model/user.model';
 
 const uniqueSubscriptionMessage = 'unique_subscription_message_subscription_id_message_id';
 
diff --git a/newback/src/data/database/model/subscription.model.ts b/newback/src/data/database/model/subscription.model.ts
index 5b09c3782..bb117732b 100644
--- a/newback/src/data/database/model/subscription.model.ts
+++ b/newback/src/data/database/model/subscription.model.ts
@@ -10,7 +10,6 @@ import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
 import {UploadedFileChoices} from '@/data/types/dto/dto';
 import {IpAddressModel} from '@/data/database/model/ip.address.model';
-import {MessageModel} from '@/data/database/model/message.model';
 
 @Injectable()
 @Table({tableName: 'subscription'})
diff --git a/newback/src/data/database/model/uploaded.file.model.ts b/newback/src/data/database/model/uploaded.file.model.ts
index 13f2b67b9..0c7df2067 100644
--- a/newback/src/data/database/model/uploaded.file.model.ts
+++ b/newback/src/data/database/model/uploaded.file.model.ts
@@ -5,14 +5,9 @@ import {
   ForeignKey,
   Model,
   Table,
-  Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {
-  ImageType,
-  UploadedFileChoices
-} from '@/data/types/dto/dto';
-import {MessageModel} from '@/data/database/model/message.model';
+import {UploadedFileChoices} from '@/data/types/dto/dto';
 import {UserModel} from '@/data/database/model/user.model';
 
 @Injectable()
diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/database/model/user.auth.model.ts
index cd5045f9f..1e7bb23f3 100644
--- a/newback/src/data/database/model/user.auth.model.ts
+++ b/newback/src/data/database/model/user.auth.model.ts
@@ -11,7 +11,7 @@ import {UserModel} from '@/data/database/model/user.model';
 import {VerificationModel} from '@/data/database/model/verification.model';
 
 @Injectable()
-@Table({ tableName: 'user_auth'})
+@Table({tableName: 'user_auth'})
 export class UserAuthModel extends Model<UserAuthModel> {
 
   @ForeignKey(() => UserModel)
diff --git a/newback/src/data/database/model/user.profile.model.ts b/newback/src/data/database/model/user.profile.model.ts
index 095a95d72..c7e605fc3 100644
--- a/newback/src/data/database/model/user.profile.model.ts
+++ b/newback/src/data/database/model/user.profile.model.ts
@@ -10,7 +10,7 @@ import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
 
 @Injectable()
-@Table({ tableName: 'user_profile'})
+@Table({tableName: 'user_profile'})
 export class UserProfileModel extends Model<UserProfileModel> {
 
   @ForeignKey(() => UserModel)
diff --git a/newback/src/data/database/model/user.settings.model.ts b/newback/src/data/database/model/user.settings.model.ts
index 0eea57bcc..ef70f7405 100644
--- a/newback/src/data/database/model/user.settings.model.ts
+++ b/newback/src/data/database/model/user.settings.model.ts
@@ -15,7 +15,7 @@ import {
 } from 'lines-logger'
 
 @Injectable()
-@Table({ tableName: 'user_settings'})
+@Table({tableName: 'user_settings'})
 export class UserSettingsModel extends Model<UserSettingsModel> {
 
   @ForeignKey(() => UserModel)
diff --git a/newback/src/data/database/model/verification.model.ts b/newback/src/data/database/model/verification.model.ts
index 7947c7a5f..95d996bba 100644
--- a/newback/src/data/database/model/verification.model.ts
+++ b/newback/src/data/database/model/verification.model.ts
@@ -11,7 +11,7 @@ import {UserModel} from '@/data/database/model/user.model';
 import {VerificationType} from '@/data/types/dto/dto';
 
 @Injectable()
-@Table({ tableName: 'verification'})
+@Table({tableName: 'verification'})
 export class VerificationModel extends Model<VerificationModel> {
 
   @Column({
@@ -28,7 +28,7 @@ export class VerificationModel extends Model<VerificationModel> {
   public type: VerificationType;
 
   @Column({
-    type: DataType.STRING(17),
+    type: DataType.STRING(32),
     allowNull: false,
   })
   public token: string;
diff --git a/newback/src/data/database/repository/room.repository.ts b/newback/src/data/database/repository/room.repository.ts
index 099bc737f..4db96ee92 100644
--- a/newback/src/data/database/repository/room.repository.ts
+++ b/newback/src/data/database/repository/room.repository.ts
@@ -1,12 +1,8 @@
 import {Injectable} from '@nestjs/common';
 import {InjectModel} from '@nestjs/sequelize';
-import {UserModel} from '@/data/database/model/user.model';
-import {UserAuthModel} from '@/data/database/model/user.auth.model';
-import {SignUpRequest} from '@/data/types/dto/dto';
-import {UserProfileModel} from '@/data/database/model/user.profile.model';
-import {UserSettingsModel} from '@/data/database/model/user.settings.model';
 import {RoomModel} from '@/data/database/model/room.model';
 import {RoomUsersModel} from '@/data/database/model/room.users.model';
+import {Transaction} from 'sequelize';
 
 
 @Injectable()
@@ -17,11 +13,11 @@ export class RoomRepository {
   ) {
   }
 
-  public async createRoomUser(roomId: number, userId: number) {
+  public async createRoomUser(roomId: number, userId: number, transaction: Transaction) {
     await this.roomUsersModel.create({
       roomId,
       userId,
       notifications: false,
-    })
+    }, {transaction})
   }
 }
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/data/database/repository/user.repository.ts
index 80e78102d..3bbbd947e 100644
--- a/newback/src/data/database/repository/user.repository.ts
+++ b/newback/src/data/database/repository/user.repository.ts
@@ -9,6 +9,7 @@ import {
 import {UserProfileModel} from '@/data/database/model/user.profile.model';
 import {UserSettingsModel} from '@/data/database/model/user.settings.model';
 import {VerificationModel} from '@/data/database/model/verification.model';
+import {Transaction} from 'sequelize';
 
 
 @Injectable()
@@ -22,47 +23,51 @@ export class UserRepository {
   ) {
   }
 
-  public async createUser(data: SignUpRequest): Promise<number> {
+  public async createUser(data: SignUpRequest, transaction: Transaction): Promise<number> {
     let userModel = await this.userModel.create({
       username: data.username,
       lastTimeOnline: new Date(),
       sex: data.sex
-    })
+    }, {transaction})
     await Promise.all([
       this.userProfileModel.create({
         id: userModel.id
-      }),
+      }, {transaction}),
       this.userAuthModel.create({
         password: data.password,
         email: data.email,
         id: userModel.id
-      }),
+      }, {transaction}),
       this.userSettingsModel.create({
         id: userModel.id
-      })
+      }, {transaction})
     ])
     return userModel.id;
   }
 
-  public async checkUserExistByUserName(username: string): Promise<boolean> {
+  public async checkUserExistByUserName(username: string, transaction?: Transaction): Promise<boolean> {
     return await this.userModel.findOne({
       where: {username},
+      transaction
     }) != null
   }
 
-   public async createVerification(email: string, userId: number, token: string): Promise<void> {
+  public async createVerification(email: string, userId: number, token: string, transaction?: Transaction): Promise<void> {
     let verification = await this.verificationModel.create({
       type: VerificationType.REGISTER,
       email,
       userId,
       token,
+    }, {
+      transaction
     });
-    await this.userAuthModel.update( {
+    await this.userAuthModel.update({
       emailVerificationId: verification.id,
     }, {
       where: {
         id: userId,
-      }
+      },
+      transaction
     })
   }
 
diff --git a/newback/src/data/redis/RedisService.ts b/newback/src/data/redis/RedisService.ts
index ac85e7d21..7f57f4451 100644
--- a/newback/src/data/redis/RedisService.ts
+++ b/newback/src/data/redis/RedisService.ts
@@ -1,5 +1,4 @@
 import {Injectable} from '@nestjs/common';
-import {SignUpRequest} from '@/data/types/dto/dto';
 import {REDIS_SESSIONS_KEY} from '@/data/utils/consts';
 import {
   InjectRedis,
diff --git a/newback/src/main.ts b/newback/src/main.ts
index f38db42a0..1dd3f24d4 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -6,7 +6,6 @@ import {
   Logger,
   ValidationPipe
 } from '@nestjs/common';
-import {LoggerModule} from '@/modules/logger/logger.module';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule, {
diff --git a/newback/src/modules/auth/auth.controller.ts b/newback/src/modules/auth/auth.controller.ts
index cfb88cf9a..905096ae7 100644
--- a/newback/src/modules/auth/auth.controller.ts
+++ b/newback/src/modules/auth/auth.controller.ts
@@ -1,7 +1,7 @@
 import {
   Body,
-  ConflictException,
   Controller,
+  Ip,
   Logger,
   Post
 } from '@nestjs/common';
@@ -16,7 +16,8 @@ export class AuthController {
   constructor(
     private readonly appService: AuthService,
     private readonly logger: Logger
-  ) {}
+  ) {
+  }
 
   @Post('/auth')
   public auth(@Body() body: LoginRequestValidator): string {
@@ -24,8 +25,8 @@ export class AuthController {
   }
 
   @Post('/register')
-  public register(@Body() body: SignUpRequestValidator): SignUpResponse {
-    return this.appService.registerUser(body);
+  public async register(@Body() body: SignUpRequestValidator, @Ip() ip): Promise<SignUpResponse> {
+    return this.appService.registerUser(body, ip);
   }
 
 
diff --git a/newback/src/modules/auth/auth.module.spec.ts b/newback/src/modules/auth/auth.module.spec.ts
index c55a7b6be..fda24377b 100644
--- a/newback/src/modules/auth/auth.module.spec.ts
+++ b/newback/src/modules/auth/auth.module.spec.ts
@@ -85,7 +85,7 @@ describe('AuthModule', () => {
         "statusCode": 400,
       });
     });
-  it('should throw an error if user exists', async() => {
+    it('should throw an error if user exists', async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
 
       const {body} = await request()
diff --git a/newback/src/modules/auth/auth.module.ts b/newback/src/modules/auth/auth.module.ts
index 296bfb122..8d0288455 100644
--- a/newback/src/modules/auth/auth.module.ts
+++ b/newback/src/modules/auth/auth.module.ts
@@ -1,15 +1,16 @@
-import {
-  Module
-} from '@nestjs/common';
-import { AuthController } from '@/modules/auth/auth.controller';
-import { AuthService } from '@/modules/auth/auth.service';
+import {Module} from '@nestjs/common';
+import {AuthController} from '@/modules/auth/auth.controller';
+import {AuthService} from '@/modules/auth/auth.service';
 import {DatabaseModule} from '@/data/database/database.module';
 import {PasswordService} from '@/modules/password/password.service';
 import {RedisService} from '@/data/redis/RedisService';
+import {EmailModule} from '@/modules/email.render/email.module';
+import {SequelizeModule} from '@nestjs/sequelize';
 
 @Module({
-  imports: [DatabaseModule],
+  imports: [DatabaseModule, EmailModule, SequelizeModule],
   controllers: [AuthController],
   providers: [AuthService, PasswordService, RedisService],
 })
-export class AuthModule {}
+export class AuthModule {
+}
diff --git a/newback/src/modules/auth/auth.service.ts b/newback/src/modules/auth/auth.service.ts
index 0fd565648..1ac40df37 100644
--- a/newback/src/modules/auth/auth.service.ts
+++ b/newback/src/modules/auth/auth.service.ts
@@ -1,14 +1,20 @@
 import {
   ConflictException,
-  Injectable
+  Injectable,
+  Logger
 } from '@nestjs/common';
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {PasswordService} from '@/modules/password/password.service';
-import {SignUpRequest} from '@/data/types/dto/dto';
+import {
+  SignUpRequest,
+  SignUpResponse
+} from '@/data/types/dto/dto';
 import {RoomRepository} from '@/data/database/repository/room.repository';
 import {ALL_ROOM_ID} from '@/data/utils/consts';
 import {RedisService} from '@/data/redis/RedisService';
-import {EmailService} from '@/modules/email/email.service';
+import {EmailSenderService} from '@/modules/email.render/email.sender.service';
+import {Transaction} from 'sequelize';
+import {Sequelize} from 'sequelize-typescript';
 
 @Injectable()
 export class AuthService {
@@ -18,7 +24,9 @@ export class AuthService {
     private readonly roomRepository: RoomRepository,
     private readonly passwordService: PasswordService,
     private readonly redisService: RedisService,
-    private readonly emailService: EmailService,
+    private readonly emailService: EmailSenderService,
+    private readonly sequelize: Sequelize,
+    private readonly logger: Logger,
   ) {
   }
 
@@ -27,27 +35,30 @@ export class AuthService {
     return user.user.username;
   }
 
-  private async createUser(data: SignUpRequest) {
-    await this.validateUser(data.username);
-    if (data.email) {
-      await this.validateEmail(data.email)
+  public async sendVerificationEmail(email: string, userId: number, username: string, ip: string) {
+    try {
+      await this.sequelize.transaction(async(t) => {
+        let token = await this.passwordService.generateRandomString(32);
+        await this.userRepository.createVerification(email, userId, token, t)
+        await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ip)
+      });
+    } catch (e) {
+      this.logger.error(`Can't send email to userid ${userId} ${email} because ${e.message}`, e.stack, 'Mail')
     }
-    const password = await this.passwordService.createPassword(data.password);
-    let userId = await this.userRepository.createUser({...data, password})
-    await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId);
-    return userId;
+
   }
 
-  public async registerUser(data: SignUpRequest) {
-    let userId = await this.createUser(data);
-    let session = await this.passwordService.generateRandomString(32);
-    await this.redisService.saveSession(session, userId);
+  public async registerUser(data: SignUpRequest, ip: string): Promise<SignUpResponse> {
+    const {session, userId} = await this.sequelize.transaction(async(t) => {
+      let userId = await this.createUser(data, t);
+      let session = await this.passwordService.generateRandomString(32);
+      await this.redisService.saveSession(session, userId);
+      return {session, userId};
+    });
     if (data.email) {
-       let token = await this.passwordService.generateRandomString(32);
-       await this.userRepository.createVerification(data.email, userId, token)
-       await this.emailService.sendSignUpEmail(data.username, data.email, token)
+      void this.sendVerificationEmail(data.email, userId, data.username, ip);
     }
-    return session;
+    return {session};
   }
 
   public async validateEmail(email: string): Promise<void> {
@@ -57,10 +68,21 @@ export class AuthService {
     }
   }
 
-  public async validateUser(userName: string): Promise<void> {
-    let exist = await this.userRepository.checkUserExistByUserName(userName);
+  public async validateUser(userName: string, transaction?: Transaction): Promise<void> {
+    let exist = await this.userRepository.checkUserExistByUserName(userName, transaction);
     if (exist) {
       throw new ConflictException("User with this username already exist");
     }
   }
+
+  private async createUser(data: SignUpRequest, transaction: Transaction) {
+    await this.validateUser(data.username, transaction);
+    if (data.email) {
+      await this.validateEmail(data.email)
+    }
+    const password = await this.passwordService.createPassword(data.password);
+    let userId = await this.userRepository.createUser({...data, password}, transaction)
+    await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, transaction);
+    return userId;
+  }
 }
diff --git a/newback/src/modules/auth/validators/login.request.validator.ts b/newback/src/modules/auth/validators/login.request.validator.ts
index 84e84300c..20cc51911 100644
--- a/newback/src/modules/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/auth/validators/login.request.validator.ts
@@ -1,17 +1,8 @@
 import {
-  IsEmail,
-  IsEnum,
-  IsOptional,
   IsString,
-  Length,
   Matches,
 } from 'class-validator';
-import {
-  Gender,
-  LoginRequest,
-  SignUpRequest
-} from '@/data/types/dto/dto';
-import {config} from 'node-config-ts';
+import {LoginRequest} from '@/data/types/dto/dto';
 
 export class LoginRequestValidator implements LoginRequest {
   @IsString()
diff --git a/newback/src/modules/auth/validators/validate.user.request.validator.ts b/newback/src/modules/auth/validators/validate.user.request.validator.ts
index 6fe0bad3f..0da6a85ad 100644
--- a/newback/src/modules/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/auth/validators/validate.user.request.validator.ts
@@ -1,17 +1,9 @@
 import {
-  IsEmail,
-  IsEnum,
-  IsOptional,
   IsString,
   Length,
   Matches,
 } from 'class-validator';
-import {
-  Gender,
-  LoginRequest,
-  SignUpRequest,
-  ValidateUserRequest
-} from '@/data/types/dto/dto';
+import {ValidateUserRequest} from '@/data/types/dto/dto';
 import {config} from 'node-config-ts';
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {
diff --git a/newback/src/modules/email.render/email.module.ts b/newback/src/modules/email.render/email.module.ts
new file mode 100644
index 000000000..14a9ed093
--- /dev/null
+++ b/newback/src/modules/email.render/email.module.ts
@@ -0,0 +1,23 @@
+import {Module} from '@nestjs/common';
+import {MailerModule} from '@nestjs-modules/mailer';
+import {config} from 'node-config-ts';
+import {EmailSenderService} from '@/modules/email.render/email.sender.service';
+import {HtmlService} from '@/modules/html/html.service';
+
+
+@Module({
+  imports: [
+    MailerModule.forRoot({
+      transport: config.email
+    })
+  ],
+  providers: [
+    EmailSenderService,
+    HtmlService
+  ],
+  exports: [
+    EmailSenderService
+  ]
+})
+export class EmailModule {
+}
diff --git a/newback/src/modules/email.render/email.sender.service.ts b/newback/src/modules/email.render/email.sender.service.ts
new file mode 100644
index 000000000..bb399aa0a
--- /dev/null
+++ b/newback/src/modules/email.render/email.sender.service.ts
@@ -0,0 +1,47 @@
+import {
+	Injectable,
+	Logger
+} from '@nestjs/common';
+import {config} from 'node-config-ts';
+import {HtmlService} from '@/modules/html/html.service';
+import {MailerService} from '@nestjs-modules/mailer';
+
+@Injectable()
+export class EmailSenderService {
+  public constructor(
+    private readonly htmlService: HtmlService,
+    private readonly loggerService: Logger,
+    private readonly mailerService: MailerService
+  ) {
+  }
+
+  public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
+    const magicLink = `${config.frontend.address}/#/confirm_email?token=${token}`;
+    let issueReportLink = config.frontend.issueReportLink;
+    const text = `Hi ${username}, you have registered pychat` +
+      `\nTo complete your registration please click on the url bellow: ${magicLink}` +
+      `\n\nIf you find any bugs or propositions you can post them ${issueReportLink}`;
+
+    let signUpEmail = await this.htmlService.renderTemplate('sign_up_email', {
+      issueReportLink,
+      magicLink,
+      username,
+      btnText: "Confirm chat registration",
+    })
+    const html = await this.htmlService.renderTemplate('token_email', {
+      signUpEmail,
+      ip,
+      timeCreated: new Date().getTime(),
+      ipInfo
+    })
+    this.loggerService.log(`Sending verification email to userId ${userId} ${email}`)
+    await this.mailerService.sendMail({
+      to: email,
+      html,
+      text,
+      subject: 'Confirm pychat registration'
+    })
+
+  }
+
+}
diff --git a/newback/src/modules/email/email.service.ts b/newback/src/modules/email/email.service.ts
deleted file mode 100644
index 83d0516bf..000000000
--- a/newback/src/modules/email/email.service.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {Injectable} from '@nestjs/common';
-import {config} from 'node-config-ts';
-
-@Injectable()
-export class EmailService {
-  public constructor() {
-  }
-
-
-  public sendSignUpEmail(username: string, email: string, token) {
-		const link = `${config.frontend.address}/#/confirm_email?token=${token}`;
-		const text = `Hi ${username}, you have registered pychat` +
-						`\nTo complete your registration please click on the url bellow: ${link}` +
-						`\n\nIf you find any bugs or propositions you can post them ${config.frontend.issueReportLink}`;
-)
-		self.logger.info('Sending verification email to userId %s (email %s)', user.id, user.email)
-		yield self.__send_mail(
-			"Confirm chat registration",
-			text,
-			user.email,
-			html_message,
-			True
-		)
-
-  }
-
-  public async sendEmail(templateId: 'change_email' | 'change_password' | 'sign_up_email' | 'token_email', params: Record<string, string>): Promise<void> {
-    void 0;
-  }
-}
diff --git a/newback/src/modules/html/html.service.spec.ts b/newback/src/modules/html/html.service.spec.ts
index 24010478f..7983daf14 100644
--- a/newback/src/modules/html/html.service.spec.ts
+++ b/newback/src/modules/html/html.service.spec.ts
@@ -3,41 +3,46 @@ import {HtmlService} from '@/modules/html/html.service';
 describe('HtmlService', () => {
 
   describe('replaceTemplate', () => {
-    it('should replace single param',  () => {
+    it('should replace single param', () => {
       let service = new HtmlService();
       let result = service.replaceTemplate('aa {{ blah }} bbbb', {blah: 3})
       expect(result).toEqual('aa 3 bbbb');
     });
 
-     it('should replace multiple params',  () => {
+    it('should replace multiple params', () => {
       let service = new HtmlService();
       let result = service.replaceTemplate('aa {{ blah }} {{koko}}', {blah: 3, koko: 4})
       expect(result).toEqual('aa 3 4');
     });
 
-    it('should not fail when empty',  () => {
+    it('should not fail when empty', () => {
       let service = new HtmlService();
       let result = service.replaceTemplate('aa', {})
       expect(result).toEqual('aa');
     });
 
-     it('should throw an exception when param is missing',  () => {
+    it('should throw an exception when param is missing', () => {
       let service = new HtmlService();
       expect(() => service.replaceTemplate('aa {{ adas }}', {blah: 4})).toThrow(Error("Unable to render template. 'adas' is missing in {\"blah\":4}"))
     });
   });
   describe('renderTemplate', () => {
-    it('should replace single param', async () => {
+    it('should replace single param', async() => {
       let service = new HtmlService();
-      let result = await service.renderTemplate('token_email', {sign_up_email: 'include', timeCreated: 'now', 'ip': 'localhost', 'ipInfo': 'Chernihiv'})
-    expect(result).toEqual(`include
+      let result = await service.renderTemplate('token_email', {
+        signUpEmail: 'include',
+        timeCreated: 'now',
+        ip: 'localhost',
+        ipInfo: 'Chernihiv'
+      })
+      expect(result).toEqual(`include
 <p>
-    <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
+  <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
 </p>
 <p>
-    Link was generated now <br/>
-    IP: localhost<br/>
-    Chernihiv
+  Link was generated now <br/>
+  IP: localhost<br/>
+  Chernihiv
 </p>
 `);
     });
diff --git a/newback/src/modules/html/html.service.ts b/newback/src/modules/html/html.service.ts
index 355b32bb0..3999f25f5 100644
--- a/newback/src/modules/html/html.service.ts
+++ b/newback/src/modules/html/html.service.ts
@@ -1,25 +1,25 @@
 import {Injectable} from '@nestjs/common';
 import {readFile} from 'fs';
 import {promisify} from 'util';
-import {resolve} from "path";
+import {sep} from "path";
+
 @Injectable()
 export class HtmlService {
 
-
-  public replaceTemplate(content: string, params: Record<string, string|number>): string {
+  public replaceTemplate(content: string, params: Record<string, string | number>): string {
     const replaceHtmlRegex = /\{\{\s?(\w+)\s?\}\}/g;
     const html = content.replace(replaceHtmlRegex, (_, v) => {
       if (!params[v]) {
         throw Error(`Unable to render template. '${v}' is missing in ${JSON.stringify(params)}`)
       }
-     return params[v] as string
+      return params[v] as string
     });
     return html;
   }
 
-  public async renderTemplate(template: string, params: Record<string, string|number>) {
-    let filePath = resolve(__dirname, '..' , '..', 'templates',`${template}.html`);
+  public async renderTemplate(template: string, params: Record<string, string | number>) {
+    let filePath = ['src', 'templates', `${template}.html`].join(sep);
     const content = await promisify(readFile)(filePath, 'utf-8');
     return this.replaceTemplate(content, params);
-	}
+  }
 }
diff --git a/newback/src/modules/logger/interceptor.ts b/newback/src/modules/logger/interceptor.ts
index 333d540c1..3e2b1a863 100644
--- a/newback/src/modules/logger/interceptor.ts
+++ b/newback/src/modules/logger/interceptor.ts
@@ -16,6 +16,7 @@ import {catchError} from 'rxjs/operators';
 export class LoggingInterceptor implements NestInterceptor {
 
   private id: number = 0;
+
   constructor(private readonly logger: Logger) {
 
   }
diff --git a/newback/src/modules/logger/logger.module.ts b/newback/src/modules/logger/logger.module.ts
index 8346ea555..a38534b26 100644
--- a/newback/src/modules/logger/logger.module.ts
+++ b/newback/src/modules/logger/logger.module.ts
@@ -9,4 +9,5 @@ import {
   providers: [Logger],
   exports: [Logger]
 })
-export class LoggerModule {}
+export class LoggerModule {
+}
diff --git a/newback/src/templates/change_email.html b/newback/src/templates/change_email.html
index e29393540..89c2c71a9 100644
--- a/newback/src/templates/change_email.html
+++ b/newback/src/templates/change_email.html
@@ -1,7 +1,7 @@
 <h2 style="color: #102a80">Hello, {{ username }}!</h2>
 <p>You just changed your email to {{ email }}</p>
 <p>
-    on {{ timeCreated }} <br/>
-    IP: {{ ip }}<br/>
-    {{ ipInfo }}
-</p>
\ No newline at end of file
+  on {{ timeCreated }} <br/>
+  IP: {{ ip }}<br/>
+  {{ ipInfo }}
+</p>
diff --git a/newback/src/templates/change_password.html b/newback/src/templates/change_password.html
index a2b546148..5810c6938 100644
--- a/newback/src/templates/change_password.html
+++ b/newback/src/templates/change_password.html
@@ -1,7 +1,7 @@
 <h2 style="color: #102a80">Hello, {{ username }}!</h2>
 <p>You just changed your password, if it wasn't you we recommend to restore your account via email</p>
 <p>
-    on {{ timeCreated }} <br/>
-    IP: {{ ip }}<br/>
-    {{ ipInfo }}
-</p>
\ No newline at end of file
+  on {{ timeCreated }} <br/>
+  IP: {{ ip }}<br/>
+  {{ ipInfo }}
+</p>
diff --git a/newback/src/templates/sign_up_email.html b/newback/src/templates/sign_up_email.html
index 2d75d6399..e1fba2af5 100644
--- a/newback/src/templates/sign_up_email.html
+++ b/newback/src/templates/sign_up_email.html
@@ -1,7 +1,8 @@
 <h2 style="color: #102a80">Hello, {{ username }}!</h2>
-<p>{{ greetings }}</p>
+<p><p>You have registered in <b>Pychat</b>. If you find any bugs or propositions you can post them
+  <a href='{{ issueReportLink }}}'>here</a>. To complete your registration please click on the link below.</p></p>
 <div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
-    <a href="{{ magicLink }}" style="font-size: 20px;
+  <a href="{{ magicLink }}" style="font-size: 20px;
     line-height: 26px;
     border-top: 14px solid;
     border-bottom: 14px solid;
@@ -18,20 +19,20 @@ <h2 style="color: #102a80">Hello, {{ username }}!</h2>
     font-weight: normal;
     text-decoration: none;
     border-radius: 4px">
-       {{ btnText }}
-    </a>
+    {{ btnText }}
+  </a>
 </div>
 <div style="width: 100%; text-align: center">
-    <p style="font-size: 0.9rem;
+  <p style="font-size: 0.9rem;
     line-height: 20px;
     margin: 0 auto 5px;
     color: #aaa;
     text-align: center;
     max-width: 320px;
     word-break: break-word">You may copy/paste this link into your browser:</p>
-    <a href="{{ magicLink }}"
-        style="color: #439fe0;
+  <a href="{{ magicLink }}"
+     style="color: #439fe0;
         font-weight: normal;
         text-decoration: none;
         word-break: break-word">{{ magicLink }}</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/newback/src/templates/token_email.html b/newback/src/templates/token_email.html
index 734da4a18..6068498d3 100644
--- a/newback/src/templates/token_email.html
+++ b/newback/src/templates/token_email.html
@@ -1,9 +1,9 @@
-{{ sign_up_email }}
+{{ signUpEmail }}
 <p>
-    <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
+  <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
 </p>
 <p>
-    Link was generated {{ timeCreated }} <br/>
-    IP: {{ ip }}<br/>
-    {{ ipInfo }}
+  Link was generated {{ timeCreated }} <br/>
+  IP: {{ ip }}<br/>
+  {{ ipInfo }}
 </p>
diff --git a/newback/yarn.lock b/newback/yarn.lock
index b344e0367..4a6e377ff 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -186,7 +186,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
   integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
@@ -307,7 +307,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
   integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
@@ -551,6 +551,11 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
+"@jonkemp/package-utils@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@jonkemp/package-utils/-/package-utils-1.0.8.tgz#4bce132a18f34407a88bb15c28bd3ed3030c4776"
+  integrity sha512-bIcKnH5YmtTYr7S6J3J86dn/rFiklwRpOqbTOQ9C0WMmR9FKHVb3bxs2UYfqEmNb93O4nbA97sb6rtz33i9SyA==
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
@@ -589,6 +594,21 @@
   resolved "https://registry.yarnpkg.com/@nestjs-modules/ioredis/-/ioredis-1.0.0.tgz#4b2560f450047ea6cb044ebce5dd4363a24cc416"
   integrity sha512-4y35a1VtNS3+RofrLWdPe9FiEhpji05wdgnkO97VUu9kxFe8y2Ck5UorRsu3dDzYn5BdumHg8kB9Qbb220gxSg==
 
+"@nestjs-modules/mailer@^1.6.1":
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/@nestjs-modules/mailer/-/mailer-1.6.1.tgz#741a095e7450a19ec1925b733ce9b98bba0f51fb"
+  integrity sha512-ZfJFB3sIQyYr52g7HRUr3VOyZZSPBI+89hcm3hvLvP3flTJs/g98QbZxWR/mH2BzQVHdCAzlP98Qw/KQULPM4w==
+  dependencies:
+    glob "7.1.7"
+    inline-css "3.0.0"
+    preview-email "3.0.4"
+  optionalDependencies:
+    "@types/ejs" "^3.0.3"
+    "@types/pug" "2.0.5"
+    ejs "^3.1.2"
+    handlebars "^4.7.6"
+    pug "^3.0.1"
+
 "@nestjs/cli@^8.2.5":
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/@nestjs/cli/-/cli-8.2.5.tgz#02094177f4eac576d1a559b259d541393e49e0bb"
@@ -721,6 +741,14 @@
     consola "^2.15.0"
     node-fetch "^2.6.1"
 
+"@selderee/plugin-htmlparser2@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz#27e994afd1c2cb647ceb5406a185a5574188069d"
+  integrity sha512-J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA==
+  dependencies:
+    domhandler "^4.2.0"
+    selderee "^0.6.0"
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -834,6 +862,11 @@
   dependencies:
     "@types/ms" "*"
 
+"@types/ejs@^3.0.3":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.0.tgz#ab8109208106b5e764e5a6c92b2ba1c625b73020"
+  integrity sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA==
+
 "@types/eslint-scope@^3.7.3":
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
@@ -938,6 +971,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
   integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
 
+"@types/nodemailer@^6.4.4":
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.4.tgz#c265f7e7a51df587597b3a49a023acaf0c741f4b"
+  integrity sha512-Ksw4t7iliXeYGvIQcSIgWQ5BLuC/mljIEbjf615svhZL10PE9t+ei8O9gDaD3FPCasUJn9KTLwz2JFJyiiyuqw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -948,6 +988,11 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759"
   integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw==
 
+"@types/pug@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/pug/-/pug-2.0.5.tgz#69bc700934dd473c7ab97270bd2dbacefe562231"
+  integrity sha512-LOnASQoeNZMkzexRuyqcBBDZ6rS+rQxUMkmj5A0PkhhiSZivLIuz6Hxyr1mkGoEZEkk66faROmpMi4fFkrKsBA==
+
 "@types/qs@*":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
@@ -1250,7 +1295,7 @@ acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.1.1:
+acorn-walk@^8.1.1, acorn-walk@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -1265,7 +1310,7 @@ acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
   integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -1414,11 +1459,28 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-asap@^2.0.0:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
+assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
+ast-types@^0.13.2:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782"
+  integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==
+  dependencies:
+    tslib "^2.0.1"
+
+async@0.9.x:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1492,6 +1554,13 @@ babel-preset-jest@^27.5.1:
     babel-plugin-jest-hoist "^27.5.1"
     babel-preset-current-node-syntax "^1.0.0"
 
+babel-walk@3.0.0-canary-5:
+  version "3.0.0-canary-5"
+  resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11"
+  integrity sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==
+  dependencies:
+    "@babel/types" "^7.9.6"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -1502,6 +1571,11 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+batch@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+
 bcrypt@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-5.0.1.tgz#f1a2c20f208e2ccdceea4433df0c8b2c54ecdf71"
@@ -1558,6 +1632,11 @@ body-parser@1.20.0:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1674,7 +1753,7 @@ chalk@^2.0.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -1687,11 +1766,40 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
+character-parser@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A=
+  dependencies:
+    is-regex "^1.0.3"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+cheerio@^0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
+  integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.0"
+    entities "~1.1.1"
+    htmlparser2 "^3.9.1"
+    lodash.assignin "^4.0.9"
+    lodash.bind "^4.1.4"
+    lodash.defaults "^4.0.1"
+    lodash.filter "^4.4.0"
+    lodash.flatten "^4.2.0"
+    lodash.foreach "^4.3.0"
+    lodash.map "^4.4.0"
+    lodash.merge "^4.4.0"
+    lodash.pick "^4.2.1"
+    lodash.reduce "^4.4.0"
+    lodash.reject "^4.4.0"
+    lodash.some "^4.4.0"
+
 chokidar@3.5.3, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -1841,7 +1949,7 @@ commander@4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^2.20.0:
+commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -1876,6 +1984,14 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
+constantinople@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151"
+  integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==
+  dependencies:
+    "@babel/parser" "^7.6.0"
+    "@babel/types" "^7.6.1"
+
 content-disposition@0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -1968,11 +2084,38 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+css-rules@^1.0.9:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/css-rules/-/css-rules-1.1.0.tgz#404b8b1f77bd775f6c6902b7a7b534f5c016b07f"
+  integrity sha512-7L6krLIRwAEVCaVKyCEL6PQjQXUmf8DM9bWYKutlZd0DqOe0SiKIGQOkFb59AjDBb+3If7SDp3X8UlzDAgYSow==
+  dependencies:
+    cssom "^0.5.0"
+
+css-select@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+
 cssom@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
   integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
 
+cssom@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
+
 cssom@~0.3.6:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
@@ -1985,6 +2128,11 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
+data-uri-to-buffer@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
+  integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
+
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -1994,6 +2142,11 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
+dayjs@^1.10.4:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.0.tgz#009bf7ef2e2ea2d5db2e6583d2d39a4b5061e805"
+  integrity sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==
+
 debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2001,7 +2154,7 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2042,6 +2195,16 @@ define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
+degenerator@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235"
+  integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==
+  dependencies:
+    ast-types "^0.13.2"
+    escodegen "^1.8.1"
+    esprima "^4.0.0"
+    vm2 "^3.9.8"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -2120,6 +2283,11 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
+discontinuous-range@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+  integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
+
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -2127,6 +2295,46 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+doctypes@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+  integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=
+
+dom-serializer@0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
+  dependencies:
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
+
+dom-serializer@^1.0.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
+
+dom-serializer@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+  dependencies:
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
+
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
 domexception@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
@@ -2134,6 +2342,45 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+  dependencies:
+    domelementtype "1"
+
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
+  dependencies:
+    domelementtype "^2.2.0"
+
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^2.5.2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
 dot-prop@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -2151,6 +2398,13 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
+ejs@^3.1.2:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
+  integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
+  dependencies:
+    jake "^10.6.1"
+
 electron-to-chromium@^1.4.84:
   version "1.4.106"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a"
@@ -2171,6 +2425,11 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
+encoding-japanese@1.0.30:
+  version "1.0.30"
+  resolved "https://registry.yarnpkg.com/encoding-japanese/-/encoding-japanese-1.0.30.tgz#537c4d62881767925d601acb4c79fb14db81703a"
+  integrity sha512-bd/DFLAoJetvv7ar/KIpE3CNO8wEuyrt9Xuw6nSMiZ+Vrz/Q21BPsMHvARL2Wz6IKHKXgb+DWZqtRg1vql9cBg==
+
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -2186,6 +2445,16 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.2:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -2273,6 +2542,18 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escodegen@^1.8.1:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 escodegen@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -2394,7 +2675,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -2509,6 +2790,16 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
+extract-css@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-css/-/extract-css-2.0.1.tgz#34415305cf0dc6b18f7ce338e3b81af690d93cbf"
+  integrity sha512-DX3+27l6NIVYNidJjBJ4VU3Z5tk/0aEO/JJ6XEJIRPFum9kyA1PifPjnEa8Ztnv4DHNQg5EF27aypGz6s/fMdw==
+  dependencies:
+    batch "^0.6.1"
+    href-content "^2.0.1"
+    list-stylesheets "^1.2.10"
+    style-data "^1.4.8"
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -2568,6 +2859,18 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+file-uri-to-path@2:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba"
+  integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==
+
+filelist@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b"
+  integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==
+  dependencies:
+    minimatch "^3.0.4"
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -2604,6 +2907,11 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flat-util@^1.1.6:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/flat-util/-/flat-util-1.1.9.tgz#87095653dcf77226a3bc99f7157794c2335b2b08"
+  integrity sha512-BOTMw/6rbbxVjv5JQvwgGMc2/6wWGd2VeyTvnzvvE49VRjS0tTxLbry/QVP1yPw8SaAOBYsnixmzruXoqjdUHA==
+
 flatted@^3.1.0:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
@@ -2678,6 +2986,15 @@ fs-extra@10.0.1, fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -2700,6 +3017,14 @@ fsevents@^2.3.2, fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
+ftp@^0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
+  dependencies:
+    readable-stream "1.1.x"
+    xregexp "2.0.0"
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -2776,6 +3101,18 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-uri@3:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c"
+  integrity sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==
+  dependencies:
+    "@tootallnate/once" "1"
+    data-uri-to-buffer "3"
+    debug "4"
+    file-uri-to-path "2"
+    fs-extra "^8.1.0"
+    ftp "^0.3.10"
+
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -2795,6 +3132,18 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
+glob@7.1.7:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@7.2.0, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
@@ -2836,6 +3185,18 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+handlebars@^4.7.6:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -2883,11 +3244,23 @@ hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+he@1.2.0, he@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
 hexoid@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
   integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==
 
+href-content@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/href-content/-/href-content-2.0.1.tgz#d1fb136e5b4c99b8ef44e4a9fe14e8863c1a939f"
+  integrity sha512-5uiAmBCvzCFVu70kli3Hp0BONbAOfwGqR7jKolV+bAh174sIAZBL8DHfg5SnxAhId2mQmYgyL7Y62msnWJ34Xg==
+  dependencies:
+    remote-content "^3.0.0"
+
 html-encoding-sniffer@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
@@ -2900,6 +3273,40 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
+html-to-text@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/html-to-text/-/html-to-text-8.0.0.tgz#5848681a5a38d657a7bb58cf5006d1c29fe64ce3"
+  integrity sha512-fEtul1OerF2aMEV+Wpy+Ue20tug134jOY1GIudtdqZi7D0uTudB2tVJBKfVhTL03dtqeJoF8gk8EPX9SyMEvLg==
+  dependencies:
+    "@selderee/plugin-htmlparser2" "^0.6.0"
+    deepmerge "^4.2.2"
+    he "^1.2.0"
+    htmlparser2 "^6.1.0"
+    minimist "^1.2.5"
+    selderee "^0.6.0"
+
+htmlparser2@^3.9.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
+htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
+
 http-errors@1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
@@ -2922,7 +3329,7 @@ http-errors@2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
-http-proxy-agent@^4.0.1:
+http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
   integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
@@ -2931,7 +3338,7 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^5.0.0:
+https-proxy-agent@5, https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
   integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
@@ -2956,7 +3363,14 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.6.3:
+iconv-lite@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+iconv-lite@0.6.3, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -3007,11 +3421,24 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+inline-css@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/inline-css/-/inline-css-3.0.0.tgz#f8ddcffab5693ab15c7dd10b05d35aebda90f8c4"
+  integrity sha512-a+IE7oLaQqeVr3hMviekDDk94LA0+oZX8JEfJuXOm20diZAkOFrq/f/QZCEXpMK6qIbYr0nQNpsuioXQN1ZgXA==
+  dependencies:
+    cheerio "^0.22.0"
+    css-rules "^1.0.9"
+    extract-css "^2.0.0"
+    flat-util "^1.1.6"
+    pick-util "^1.1.3"
+    slick "^1.12.2"
+    specificity "^0.4.1"
+
 inquirer@7.3.3:
   version "7.3.3"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
@@ -3080,6 +3507,11 @@ ioredis@^5.0.4:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
+ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -3131,6 +3563,19 @@ is-date-object@^1.0.1:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-docker@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
+is-expression@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab"
+  integrity sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==
+  dependencies:
+    acorn "^7.1.1"
+    object-assign "^4.1.1"
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -3185,12 +3630,17 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
+is-promise@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
+
 is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
   integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
 
-is-regex@^1.1.4:
+is-regex@^1.0.3, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -3241,6 +3691,13 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-wsl@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -3303,6 +3760,16 @@ iterare@1.2.1:
   resolved "https://registry.yarnpkg.com/iterare/-/iterare-1.2.1.tgz#139c400ff7363690e33abffa33cbba8920f00042"
   integrity sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==
 
+jake@^10.6.1:
+  version "10.8.4"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz#f6a8b7bf90c6306f768aa82bb7b98bf4ca15e84a"
+  integrity sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA==
+  dependencies:
+    async "0.9.x"
+    chalk "^4.0.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
+
 jest-changed-files@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5"
@@ -3726,6 +4193,11 @@ jest@^27.5.1:
     import-local "^3.0.2"
     jest-cli "^27.5.1"
 
+js-stringify@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+  integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds=
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -3835,6 +4307,13 @@ jsonc-parser@3.0.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
   integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
 
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -3844,6 +4323,14 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jstransformer@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=
+  dependencies:
+    is-promise "^2.0.0"
+    promise "^7.0.1"
+
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -3870,11 +4357,31 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+libbase64@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-1.2.1.tgz#fb93bf4cb6d730f29b92155b6408d1bd2176a8c8"
+  integrity sha512-l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew==
+
+libmime@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/libmime/-/libmime-5.0.0.tgz#4759c76eb219985c5d4057b3a9359922194d9ff7"
+  integrity sha512-2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg==
+  dependencies:
+    encoding-japanese "1.0.30"
+    iconv-lite "0.6.2"
+    libbase64 "1.2.1"
+    libqp "1.1.0"
+
 libphonenumber-js@^1.9.43:
   version "1.9.50"
   resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.50.tgz#f5028a2c4cc47a69d69a0de3629afad97a613712"
   integrity sha512-cCzQPChw2XbordcO2LKiw5Htx5leHVfFk/EXkxNHqJfFo7Fndcb1kF5wPJpc316vCJhhikedYnVysMh3Sc7Ocw==
 
+libqp@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
+  integrity sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=
+
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -3885,6 +4392,21 @@ lines-logger@^2.1.2:
   resolved "https://registry.yarnpkg.com/lines-logger/-/lines-logger-2.1.2.tgz#85b619ee849938323615e40fa8cee76d24532de7"
   integrity sha512-pSn6qr2K0tf28TgrVMMQxinADrZP3xObxxUBlhTNWWRZToRtrjHihzW7UOKlOypKDDiP3uk/DRjd6dqQsg1coA==
 
+linkify-it@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
+list-stylesheets@^1.2.10:
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/list-stylesheets/-/list-stylesheets-1.2.10.tgz#9537ed1ef26d1013c41f3ad3b913dae7729380f4"
+  integrity sha512-F85Yx9GKLJwDr1T9U34FST5m6iIXhPzqD+MRDsljZsdmoEZwllZBDbkAVaa+EpLKrr6de+P4SRGNHwrWv6zMZA==
+  dependencies:
+    cheerio "^0.22.0"
+    pick-util "^1.1.4"
+
 loader-runner@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
@@ -3897,26 +4419,76 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash.defaults@^4.2.0:
+lodash.assignin@^4.0.9:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.bind@^4.1.4:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
+  integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=
+
+lodash.defaults@^4.0.1, lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
 
+lodash.filter@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
+  integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=
+
+lodash.flatten@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.foreach@^4.3.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+
 lodash.isarguments@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
   integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
 
+lodash.map@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
+  integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
+
 lodash.memoize@4.x:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.merge@^4.6.2:
+lodash.merge@^4.4.0, lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
+lodash.pick@^4.2.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+  integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
+
+lodash.reduce@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
+  integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=
+
+lodash.reject@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
+  integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=
+
+lodash.some@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
+  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
+
 lodash@4.17.21, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -3943,6 +4515,13 @@ lru-cache@^4.1.3:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -3967,6 +4546,30 @@ magic-string@0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
+mailparser@^3.1.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/mailparser/-/mailparser-3.4.0.tgz#249869bc5a41af9e0eabbf005197789442fbac9e"
+  integrity sha512-u2pfpLg+xr7m2FKDl+ohQhy2gMok1QZ+S9E5umS9ez5DSJWttrqSmBGswyj9F68pZMVTwbhLpBt7Kd04q/W4Vw==
+  dependencies:
+    encoding-japanese "1.0.30"
+    he "1.2.0"
+    html-to-text "8.0.0"
+    iconv-lite "0.6.3"
+    libmime "5.0.0"
+    linkify-it "3.0.3"
+    mailsplit "5.3.1"
+    nodemailer "6.7.0"
+    tlds "1.224.0"
+
+mailsplit@5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/mailsplit/-/mailsplit-5.3.1.tgz#dd6d5c20a7b8a767fe9c9649dfcb26ee04f84c36"
+  integrity sha512-o6R6HCzqWYmI2/IYlB+v2IMPgYqC2EynmagZQICAhR7zAq0CO6fPcsO6CrYmVuYT+SSwvLAEZR5WniohBELcAA==
+  dependencies:
+    libbase64 "1.2.1"
+    libmime "5.0.0"
+    libqp "1.1.0"
+
 make-dir@^3.0.0, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -3991,6 +4594,13 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
+mediaquery-text@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mediaquery-text/-/mediaquery-text-1.2.0.tgz#266f7ca5a339c81ef17dc80f219a46e4a610ebce"
+  integrity sha512-cJyRqgYQi+hsYhRkyd5le0s4LsEPvOB7r+6X3jdEELNqVlM9mRIgyUPg9BzF+PuTqQH1ZekgIjYVOeWSXWq35Q==
+  dependencies:
+    cssom "^0.5.0"
+
 memfs@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
@@ -4065,7 +4675,7 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@1.2.6, minimist@^1.2.0, minimist@^1.2.6:
+minimist@1.2.6, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
@@ -4109,6 +4719,11 @@ moment@*, "moment@>= 2.9.0", moment@^2.29.1:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
   integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
+moo@^0.5.0, moo@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
+  integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -4169,16 +4784,31 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+nearley@^2.20.1:
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474"
+  integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==
+  dependencies:
+    commander "^2.19.0"
+    moo "^0.5.0"
+    railroad-diagrams "^1.0.0"
+    randexp "0.4.6"
+
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-neo-async@^2.6.2:
+neo-async@^2.6.0, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+netmask@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
+  integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
+
 node-addon-api@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
@@ -4225,6 +4855,16 @@ node-releases@^2.0.2:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
   integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
 
+nodemailer@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.0.tgz#86614722c4e0c33d1b5b02aecb90d6d629932b0d"
+  integrity sha512-AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw==
+
+nodemailer@^6.5.0, nodemailer@^6.7.3:
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.3.tgz#b73f9a81b9c8fa8acb4ea14b608f5e725ea8e018"
+  integrity sha512-KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==
+
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -4254,6 +4894,13 @@ npmlog@^5.0.1:
     gauge "^3.0.0"
     set-blocking "^2.0.0"
 
+nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+  dependencies:
+    boolbase "~1.0.0"
+
 nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -4344,6 +4991,14 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
+open@7:
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
+  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
+  dependencies:
+    is-docker "^2.0.0"
+    is-wsl "^2.1.1"
+
 optional@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/optional/-/optional-0.1.4.tgz#cdb1a9bedc737d2025f690ceeb50e049444fd5b3"
@@ -4420,6 +5075,30 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+pac-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz#b718f76475a6a5415c2efbe256c1c971c84f635e"
+  integrity sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+    get-uri "3"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "5"
+    pac-resolver "^5.0.0"
+    raw-body "^2.2.0"
+    socks-proxy-agent "5"
+
+pac-resolver@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.0.tgz#1d717a127b3d7a9407a16d6e1b012b13b9ba8dc0"
+  integrity sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==
+  dependencies:
+    degenerator "^3.0.1"
+    ip "^1.1.5"
+    netmask "^2.0.1"
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -4442,6 +5121,14 @@ parse5@6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
+parseley@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/parseley/-/parseley-0.7.0.tgz#9949e3a0ed05c5072adb04f013c2810cf49171a8"
+  integrity sha512-xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw==
+  dependencies:
+    moo "^0.5.1"
+    nearley "^2.20.1"
+
 parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -4487,6 +5174,13 @@ pg-connection-string@^2.5.0:
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
   integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
 
+pick-util@^1.1.3, pick-util@^1.1.4:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/pick-util/-/pick-util-1.1.5.tgz#514b11b1a49486d30c805a23125003a360175b6d"
+  integrity sha512-H0MaM8T7wpQ/azvB12ChZw7kpSFzjsgv3Z+N7fUWnL1McTGSEeroCngcK4eOPiFQq08rAyKX3hadcAB1kUqfXA==
+  dependencies:
+    "@jonkemp/package-utils" "^1.0.8"
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@@ -4543,11 +5237,31 @@ pretty-format@^27.0.0, pretty-format@^27.5.1:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
+preview-email@3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/preview-email/-/preview-email-3.0.4.tgz#3405c014dcd6890e1618f18d1b2973db71e7e60f"
+  integrity sha512-g9jbnFHI8QfQAcKeCsZpSzMJT/CeGuJoV311R/NLS6PTsalJkMKkUeirSJJgMJBUYOGJLrhM7MsNVWgk1b13BA==
+  dependencies:
+    dayjs "^1.10.4"
+    debug "^4.3.1"
+    mailparser "^3.1.0"
+    nodemailer "^6.5.0"
+    open "7"
+    pug "^3.0.2"
+    uuid "^8.3.2"
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+promise@^7.0.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
 prompts@^2.0.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
@@ -4564,6 +5278,25 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-5.0.0.tgz#d31405c10d6e8431fde96cba7a0c027ce01d633b"
+  integrity sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==
+  dependencies:
+    agent-base "^6.0.0"
+    debug "4"
+    http-proxy-agent "^4.0.0"
+    https-proxy-agent "^5.0.0"
+    lru-cache "^5.1.1"
+    pac-proxy-agent "^5.0.0"
+    proxy-from-env "^1.0.0"
+    socks-proxy-agent "^5.0.0"
+
+proxy-from-env@^1.0.0, proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -4574,6 +5307,109 @@ psl@^1.1.33:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
+pug-attrs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41"
+  integrity sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==
+  dependencies:
+    constantinople "^4.0.1"
+    js-stringify "^1.0.2"
+    pug-runtime "^3.0.0"
+
+pug-code-gen@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz#ad190f4943133bf186b60b80de483100e132e2ce"
+  integrity sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==
+  dependencies:
+    constantinople "^4.0.1"
+    doctypes "^1.1.0"
+    js-stringify "^1.0.2"
+    pug-attrs "^3.0.0"
+    pug-error "^2.0.0"
+    pug-runtime "^3.0.0"
+    void-elements "^3.1.0"
+    with "^7.0.0"
+
+pug-error@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5"
+  integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==
+
+pug-filters@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e"
+  integrity sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==
+  dependencies:
+    constantinople "^4.0.1"
+    jstransformer "1.0.0"
+    pug-error "^2.0.0"
+    pug-walk "^2.0.0"
+    resolve "^1.15.1"
+
+pug-lexer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-5.0.1.tgz#ae44628c5bef9b190b665683b288ca9024b8b0d5"
+  integrity sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==
+  dependencies:
+    character-parser "^2.2.0"
+    is-expression "^4.0.0"
+    pug-error "^2.0.0"
+
+pug-linker@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-4.0.0.tgz#12cbc0594fc5a3e06b9fc59e6f93c146962a7708"
+  integrity sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==
+  dependencies:
+    pug-error "^2.0.0"
+    pug-walk "^2.0.0"
+
+pug-load@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-3.0.0.tgz#9fd9cda52202b08adb11d25681fb9f34bd41b662"
+  integrity sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==
+  dependencies:
+    object-assign "^4.1.1"
+    pug-walk "^2.0.0"
+
+pug-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-6.0.0.tgz#a8fdc035863a95b2c1dc5ebf4ecf80b4e76a1260"
+  integrity sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==
+  dependencies:
+    pug-error "^2.0.0"
+    token-stream "1.0.0"
+
+pug-runtime@^3.0.0, pug-runtime@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-3.0.1.tgz#f636976204723f35a8c5f6fad6acda2a191b83d7"
+  integrity sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==
+
+pug-strip-comments@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz#f94b07fd6b495523330f490a7f554b4ff876303e"
+  integrity sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==
+  dependencies:
+    pug-error "^2.0.0"
+
+pug-walk@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe"
+  integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==
+
+pug@^3.0.1, pug@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.2.tgz#f35c7107343454e43bc27ae0ff76c731b78ea535"
+  integrity sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==
+  dependencies:
+    pug-code-gen "^3.0.2"
+    pug-filters "^4.0.0"
+    pug-lexer "^5.0.1"
+    pug-linker "^4.0.0"
+    pug-load "^3.0.0"
+    pug-parser "^6.0.0"
+    pug-runtime "^3.0.1"
+    pug-strip-comments "^2.0.0"
+
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -4609,11 +5445,24 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+railroad-diagrams@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
+  integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
+
 ramda@^0.27.0:
   version "0.27.2"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.2.tgz#84463226f7f36dc33592f6f4ed6374c48306c3f1"
   integrity sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==
 
+randexp@0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
+  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
+  dependencies:
+    discontinuous-range "1.0.0"
+    ret "~0.1.10"
+
 randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -4636,7 +5485,7 @@ raw-body@2.4.3:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-body@2.5.1:
+raw-body@2.5.1, raw-body@^2.2.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
   integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
@@ -4674,7 +5523,7 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.4.0, readable-stream@^3.6.0:
+readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -4719,6 +5568,15 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
+remote-content@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remote-content/-/remote-content-3.0.0.tgz#78ac5d0723f8ddae0561774edb03edc23b9f585c"
+  integrity sha512-/hjCYVqWY/jYR07ptEJpClnYrGedSQ5AxCrEeMb3NlrxTgUK/7+iCOReE3z1QMYm3UL7sJX3o7cww/NC6UgyhA==
+  dependencies:
+    proxy-from-env "^1.1.0"
+    superagent "^7.0.2"
+    superagent-proxy "^3.0.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -4751,7 +5609,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.1.6, resolve@^1.20.0:
+resolve@^1.1.6, resolve@^1.15.1, resolve@^1.20.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -4768,6 +5626,11 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
 retry-as-promised@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-5.0.0.tgz#f4ecc25133603a2d2a7aff4a128691d7bc506d54"
@@ -4842,6 +5705,13 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+selderee@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/selderee/-/selderee-0.6.0.tgz#f3bee66cfebcb6f33df98e4a1df77388b42a96f7"
+  integrity sha512-ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg==
+  dependencies:
+    parseley "^0.7.0"
+
 semver@7.x, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b"
@@ -4984,6 +5854,33 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slick@^1.12.2:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz#bd048ddb74de7d1ca6915faa4a57570b3550c2d7"
+  integrity sha1-vQSN23TefRymkV+qSldXCzVQwtc=
+
+smart-buffer@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
+socks-proxy-agent@5, socks-proxy-agent@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e"
+  integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "4"
+    socks "^2.3.3"
+
+socks@^2.3.3:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
+  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.2.0"
+
 source-map-support@0.5.21, source-map-support@^0.5.6, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
@@ -5012,6 +5909,11 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
+specificity@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
+  integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -5172,7 +6074,24 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-superagent@^7.1.0:
+style-data@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/style-data/-/style-data-1.4.8.tgz#820d946812e4e8cdd3875a25cb839052e9059b92"
+  integrity sha512-RBJD+YQef4PzYKqC4PQEjDvyX709mwEClYg9u0A5EPXqdSkN2BtMnF/tW7EtS9Q0FnBF+lrWsK5+bEKqA+++Dg==
+  dependencies:
+    cheerio "^0.22.0"
+    mediaquery-text "^1.2.0"
+    pick-util "^1.1.4"
+
+superagent-proxy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/superagent-proxy/-/superagent-proxy-3.0.0.tgz#e1a17ccba25883599e18d2974020fe83ee7d95d1"
+  integrity sha512-wAlRInOeDFyd9pyonrkJspdRAxdLrcsZ6aSnS+8+nu4x1aXbz6FWSTT9M6Ibze+eG60szlL7JA8wEIV7bPWuyQ==
+  dependencies:
+    debug "^4.3.2"
+    proxy-agent "^5.0.0"
+
+superagent@^7.0.2, superagent@^7.1.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.2.tgz#71393141edd086ccf2544a29a4a609e46b7911f3"
   integrity sha512-o9/fP6dww7a4xmEF5a484o2rG34UUGo8ztDlv7vbCWuqPhpndMi0f7eXxdlryk5U12Kzy46nh8eNpLAJ93Alsg==
@@ -5328,6 +6247,11 @@ through@^2.3.6:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
+tlds@1.224.0:
+  version "1.224.0"
+  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.224.0.tgz#dc9a5b0bda0708af0302114f6e24458770c5af01"
+  integrity sha512-Jgdc8SEijbDFUsmCn6Wk/f7E6jBLFZOG3U1xK0amGSfEH55Xx97ItUS/d2NngsuApjn11UeWCWj8Um3VRhseZQ==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -5357,6 +6281,11 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
+token-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
+  integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=
+
 toposort-class@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988"
@@ -5455,7 +6384,7 @@ tsconfig-paths@3.14.1, tsconfig-paths@^3.9.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.1, tslib@^2.1.0:
+tslib@2.3.1, tslib@^2.0.1, tslib@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -5531,6 +6460,16 @@ typescript@^4.6.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
   integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
 
+uc.micro@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+
+uglify-js@^3.1.4:
+  version "3.15.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.4.tgz#fa95c257e88f85614915b906204b9623d4fa340d"
+  integrity sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==
+
 unbox-primitive@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
@@ -5541,7 +6480,7 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
-universalify@^0.1.2:
+universalify@^0.1.0, universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -5607,6 +6546,19 @@ vary@^1, vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
+vm2@^3.9.8:
+  version "3.9.9"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.9.tgz#c0507bc5fbb99388fad837d228badaaeb499ddc5"
+  integrity sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-walk "^8.2.0"
+
+void-elements@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+  integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
+
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
@@ -5759,6 +6711,16 @@ windows-release@^4.0.0:
   dependencies:
     execa "^4.0.2"
 
+with@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/with/-/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac"
+  integrity sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==
+  dependencies:
+    "@babel/parser" "^7.9.6"
+    "@babel/types" "^7.9.6"
+    assert-never "^1.2.1"
+    babel-walk "3.0.0-canary-5"
+
 wkx@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz#c6c37019acf40e517cc6b94657a25a3d4aa33e8c"
@@ -5771,6 +6733,11 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -5810,6 +6777,11 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
+xregexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
+
 xtend@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -5825,6 +6797,11 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

From 4064fcdb59fc9ff5006a98c904ba8e992e7d379f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 03:08:49 +0300
Subject: [PATCH 012/221] added auth and some test

---
 frontend/src/ts/types/backend                 |  1 +
 newback/.gitignore                            |  2 +-
 newback/jest.config.ts                        |  6 ++-
 newback/package.json                          |  1 +
 newback/src/data/database/database.module.ts  |  3 +-
 .../database/repository/room.repository.ts    |  2 +-
 newback/src/data/redis/RedisService.ts        |  2 +-
 newback/src/modules/app/app.module.ts         |  3 +-
 newback/src/modules/auth/auth.module.spec.ts  | 46 +++++++++++++++++--
 newback/src/modules/auth/auth.module.ts       |  3 +-
 10 files changed, 57 insertions(+), 12 deletions(-)
 create mode 120000 frontend/src/ts/types/backend

diff --git a/frontend/src/ts/types/backend b/frontend/src/ts/types/backend
new file mode 120000
index 000000000..3f6330a4b
--- /dev/null
+++ b/frontend/src/ts/types/backend
@@ -0,0 +1 @@
+../../../../common/
\ No newline at end of file
diff --git a/newback/.gitignore b/newback/.gitignore
index ef314b4c1..f17e0e9f0 100644
--- a/newback/.gitignore
+++ b/newback/.gitignore
@@ -3,6 +3,6 @@ yarn-error.log
 dist
 # exclude everything
 config/migration/*
-
+coverage
 # exception to the rule
 !config/migration/.gitkeep
diff --git a/newback/jest.config.ts b/newback/jest.config.ts
index 726f03b30..3c8f317df 100644
--- a/newback/jest.config.ts
+++ b/newback/jest.config.ts
@@ -23,10 +23,14 @@ export default async(): Promise<Config.InitialOptions> => {
     ],
     "coveragePathIgnorePatterns": [
       "/node_modules/",
+      "/coverage/",
+      "/ormconfig.ts",
+      "/jest.config.ts",
       "/dist/",
+      ".module.ts$",
       ".dto.ts$"
     ],
-    "coverageDirectory": "../coverage",
+    "coverageDirectory": "./coverage",
     "testEnvironment": "node",
     moduleNameMapper,
   }
diff --git a/newback/package.json b/newback/package.json
index d48d42485..c0882f8d4 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -9,6 +9,7 @@
     "migrate": "ts-node  -r tsconfig-paths/register ./src/migration.runner.ts ",
     "build": "nest build",
     "start": "nest start",
+    "test": "jest --coverage --runInBand --detectOpenHandles --testTimeout=10000 --passWithNoTests",
     "start:dev": "node --inspect=0.0.0.0 dist/src/main",
     "start:debug": "nest start --debug --watch"
   },
diff --git a/newback/src/data/database/database.module.ts b/newback/src/data/database/database.module.ts
index b135bcf43..031edfdb8 100644
--- a/newback/src/data/database/database.module.ts
+++ b/newback/src/data/database/database.module.ts
@@ -22,6 +22,7 @@ import {VerificationModel} from '@/data/database/model/verification.model';
 import {Logger} from '@nestjs/common/services/logger.service';
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {RoomRepository} from '@/data/database/repository/room.repository';
+import {Sequelize} from 'sequelize-typescript';
 
 const repositories = [
   UserRepository,
@@ -32,7 +33,7 @@ const repositories = [
   imports: [
     SequelizeModule.forRootAsync({
       inject: [Logger],
-      useFactory: (logger: Logger) => generateConfig((sql) => logger.debug(sql)),
+      useFactory: (logger: Logger) => generateConfig((sql) => logger.debug(sql, 'sql')),
     }),
     SequelizeModule.forFeature([
       ChannelModel,
diff --git a/newback/src/data/database/repository/room.repository.ts b/newback/src/data/database/repository/room.repository.ts
index 4db96ee92..dfd0183ed 100644
--- a/newback/src/data/database/repository/room.repository.ts
+++ b/newback/src/data/database/repository/room.repository.ts
@@ -13,7 +13,7 @@ export class RoomRepository {
   ) {
   }
 
-  public async createRoomUser(roomId: number, userId: number, transaction: Transaction) {
+  public async createRoomUser(roomId: number, userId: number, transaction: Transaction): Promise<void> {
     await this.roomUsersModel.create({
       roomId,
       userId,
diff --git a/newback/src/data/redis/RedisService.ts b/newback/src/data/redis/RedisService.ts
index 7f57f4451..f41a3daec 100644
--- a/newback/src/data/redis/RedisService.ts
+++ b/newback/src/data/redis/RedisService.ts
@@ -14,7 +14,7 @@ export class RedisService {
   }
 
 
-  public async saveSession(session: string, userId: number) {
+  public async saveSession(session: string, userId: number): Promise<void> {
     await this.redis.hset(REDIS_SESSIONS_KEY, session, userId);
   }
 
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 4e830fd3a..ddbc33db1 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -8,14 +8,13 @@ import {RedisModule} from '@nestjs-modules/ioredis';
 import {config} from 'node-config-ts';
 
 @Module({
-  imports: [AuthModule, DatabaseModule, LoggerModule, RedisModule.forRoot({
+  imports: [AuthModule, LoggerModule, RedisModule.forRoot({
     config: {
       host: config.redis.host,
       port: config.redis.port,
       db: config.redis.database,
     }
   })],
-  exports: [DatabaseModule],
   providers: [
     {
       provide: APP_INTERCEPTOR,
diff --git a/newback/src/modules/auth/auth.module.spec.ts b/newback/src/modules/auth/auth.module.spec.ts
index fda24377b..7043dfc41 100644
--- a/newback/src/modules/auth/auth.module.spec.ts
+++ b/newback/src/modules/auth/auth.module.spec.ts
@@ -10,22 +10,57 @@ import {AuthController} from '@/modules/auth/auth.controller';
 import {LoggerModule} from '@/modules/logger/logger.module';
 import {PasswordService} from '@/modules/password/password.service';
 import {UserRepository} from '@/data/database/repository/user.repository';
+import {RoomRepository} from '@/data/database/repository/room.repository';
+import {RedisService} from '@/data/redis/RedisService';
+import {EmailSenderService} from '@/modules/email.render/email.sender.service';
+import {
+  MailerModule,
+  MailerService
+} from '@nestjs-modules/mailer';
+import {Sequelize} from 'sequelize-typescript';
+import {HtmlService} from '@/modules/html/html.service';
 
 describe('AuthModule', () => {
   let app: INestApplication;
   let request: () => supertest.SuperTest<supertest.Test>;
   let userRepository: UserRepository;
+  let roomRepository: RoomRepository;
+  let redisService: RedisService;
+  let sequelize: Sequelize;
+  let mailerService: MailerService;
   beforeEach(async() => {
 
     userRepository = {} as UserRepository;
+    roomRepository = {} as RoomRepository;
+    redisService = {} as RedisService;
+    sequelize = {} as Sequelize;
+    mailerService = {} as MailerService;
     const moduleFixture = await Test.createTestingModule({
-      imports: [LoggerModule],
+      imports: [
+        LoggerModule,
+      ],
       providers: [
+        {provide: MailerService, useValue: mailerService},
+        {provide: Sequelize, useValue: sequelize},
         AuthService,
+        HtmlService,
+        EmailSenderService,
+        {
+          provide: MailerService,
+          useValue: mailerService,
+        },
+        {
+          provide: RedisService,
+          useValue: redisService,
+        },
         {
           provide: UserRepository,
           useValue: userRepository,
         },
+        {
+          provide: RoomRepository,
+          useValue: roomRepository,
+        },
         Logger,
         PasswordService,
       ],
@@ -47,13 +82,18 @@ describe('AuthModule', () => {
 
   describe('signup', () => {
     it('validate request', async() => {
+     sequelize.transaction = (resolve) =>resolve();
+     userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+     userRepository.createUser = jest.fn().mockResolvedValue(3);
+     roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+     redisService.saveSession = jest.fn().mockResolvedValue(undefined)
       const {body} = await request()
         .post('/register').send({
           username: 'a',
           password: 'as$'
         });
 
-      await expect(body).toStrictEqual({'a': 3});
+      await expect(body).toMatchObject({session: expect.any(String)});
     });
   });
   describe('validate user', () => {
@@ -95,7 +135,7 @@ describe('AuthModule', () => {
 
       await expect(body).toStrictEqual({
         "error": "Conflict",
-        "message": "This user already exist",
+        "message": "User with this username already exist",
         "statusCode": 409,
       });
     });
diff --git a/newback/src/modules/auth/auth.module.ts b/newback/src/modules/auth/auth.module.ts
index 8d0288455..2e9a7216e 100644
--- a/newback/src/modules/auth/auth.module.ts
+++ b/newback/src/modules/auth/auth.module.ts
@@ -5,10 +5,9 @@ import {DatabaseModule} from '@/data/database/database.module';
 import {PasswordService} from '@/modules/password/password.service';
 import {RedisService} from '@/data/redis/RedisService';
 import {EmailModule} from '@/modules/email.render/email.module';
-import {SequelizeModule} from '@nestjs/sequelize';
 
 @Module({
-  imports: [DatabaseModule, EmailModule, SequelizeModule],
+  imports: [DatabaseModule, EmailModule],
   controllers: [AuthController],
   providers: [AuthService, PasswordService, RedisService],
 })

From aa7bafacfed9505ae5b4b831d00f1dac3c1d79b3 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 03:39:05 +0300
Subject: [PATCH 013/221] Auth works

---
 common/dto.ts                                 | 11 +++++-
 newback/src/data/database/model/user.model.ts |  6 +++
 .../database/repository/room.repository.ts    |  2 +-
 .../database/repository/user.repository.ts    | 20 ++++++++--
 newback/src/modules/auth/auth.controller.ts   | 15 +++++---
 newback/src/modules/auth/auth.service.ts      | 38 ++++++++++++++++---
 .../validators/login.request.validator.ts     | 11 ++++++
 7 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/common/dto.ts b/common/dto.ts
index 50ff656b9..4889d0b11 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -1,6 +1,7 @@
 export interface LoginRequest {
   username: string;
   password: string;
+  email: string;
 }
 
 export interface ValidateUserRequest {
@@ -18,10 +19,18 @@ export interface SignUpRequest {
   sex?: Gender;
 }
 
-export interface SignUpResponse {
+interface SessionResponse {
   session: string;
 }
 
+export interface SignInResponse extends SessionResponse {
+
+}
+
+export interface SignUpResponse extends SessionResponse{
+
+}
+
 // ISO/IEC 5218 1 male, 2 - female
 export enum Gender {
   MALE = 'MALE',
diff --git a/newback/src/data/database/model/user.model.ts b/newback/src/data/database/model/user.model.ts
index 4413eb44c..64f522a9b 100644
--- a/newback/src/data/database/model/user.model.ts
+++ b/newback/src/data/database/model/user.model.ts
@@ -1,12 +1,15 @@
 import {
   Column,
   DataType,
+  HasOne,
   Model,
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {Gender} from '@/data/types/dto/dto';
 import {config} from 'node-config-ts';
+import {UserSettingsModel} from '@/data/database/model/user.settings.model';
+import {UserAuthModel} from '@/data/database/model/user.auth.model';
 
 
 @Injectable()
@@ -32,6 +35,9 @@ export class UserModel extends Model<UserModel> {
   })
   public username: string;
 
+  @HasOne(() => UserAuthModel, 'id')
+  public userAuth: UserAuthModel;
+
   @Column({
     type: DataType.ENUM(...Object.keys(Gender)),
     allowNull: false,
diff --git a/newback/src/data/database/repository/room.repository.ts b/newback/src/data/database/repository/room.repository.ts
index dfd0183ed..633d6f3e6 100644
--- a/newback/src/data/database/repository/room.repository.ts
+++ b/newback/src/data/database/repository/room.repository.ts
@@ -18,6 +18,6 @@ export class RoomRepository {
       roomId,
       userId,
       notifications: false,
-    }, {transaction})
+    }, {transaction, raw: true})
   }
 }
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/data/database/repository/user.repository.ts
index 3bbbd947e..d23a62a65 100644
--- a/newback/src/data/database/repository/user.repository.ts
+++ b/newback/src/data/database/repository/user.repository.ts
@@ -28,19 +28,19 @@ export class UserRepository {
       username: data.username,
       lastTimeOnline: new Date(),
       sex: data.sex
-    }, {transaction})
+    }, {transaction, raw: true,})
     await Promise.all([
       this.userProfileModel.create({
         id: userModel.id
-      }, {transaction}),
+      }, {transaction, raw: true,}),
       this.userAuthModel.create({
         password: data.password,
         email: data.email,
         id: userModel.id
-      }, {transaction}),
+      }, {transaction, raw: true,}),
       this.userSettingsModel.create({
         id: userModel.id
-      }, {transaction})
+      }, {transaction, raw: true,})
     ])
     return userModel.id;
   }
@@ -48,6 +48,7 @@ export class UserRepository {
   public async checkUserExistByUserName(username: string, transaction?: Transaction): Promise<boolean> {
     return await this.userModel.findOne({
       where: {username},
+      raw: true,
       transaction
     }) != null
   }
@@ -59,6 +60,7 @@ export class UserRepository {
       userId,
       token,
     }, {
+      raw: true,
       transaction
     });
     await this.userAuthModel.update({
@@ -74,6 +76,7 @@ export class UserRepository {
   public async checkUserExistByEmail(email: string): Promise<boolean> {
     return await this.userAuthModel.findOne({
       where: {email},
+      raw: true,
     }) != null
   }
 
@@ -86,4 +89,13 @@ export class UserRepository {
     })
   }
 
+  public async getUserByUserName(username: string): Promise<UserModel | null> {
+    return this.userModel.findOne({
+      where: {username},
+      include: [
+        'userAuth',
+      ],
+    })
+  }
+
 }
diff --git a/newback/src/modules/auth/auth.controller.ts b/newback/src/modules/auth/auth.controller.ts
index 905096ae7..f8629f77b 100644
--- a/newback/src/modules/auth/auth.controller.ts
+++ b/newback/src/modules/auth/auth.controller.ts
@@ -9,30 +9,33 @@ import {AuthService} from '@/modules/auth/auth.service';
 import {LoginRequestValidator} from '@/modules/auth/validators/login.request.validator';
 import {SignUpRequestValidator} from '@/modules/auth/validators/sign.up.request.validator';
 import {ValidateUserRequestValidator} from '@/modules/auth/validators/validate.user.request.validator';
-import {SignUpResponse} from '@/data/types/dto/dto';
+import {
+  SignInResponse,
+  SignUpResponse
+} from '@/data/types/dto/dto';
 
 @Controller()
 export class AuthController {
   constructor(
-    private readonly appService: AuthService,
+    private readonly authservice: AuthService,
     private readonly logger: Logger
   ) {
   }
 
   @Post('/auth')
-  public auth(@Body() body: LoginRequestValidator): string {
-    return 'asd';
+  public async auth(@Body() body: LoginRequestValidator): Promise<SignInResponse> {
+    return this.authservice.authorize(body);
   }
 
   @Post('/register')
   public async register(@Body() body: SignUpRequestValidator, @Ip() ip): Promise<SignUpResponse> {
-    return this.appService.registerUser(body, ip);
+    return this.authservice.registerUser(body, ip);
   }
 
 
   @Post('/validate_user')
   public async validateUser(@Body() body: ValidateUserRequestValidator): Promise<void> {
-    await this.appService.validateUser(body.username);
+    await this.authservice.validateUser(body.username);
   }
 
 
diff --git a/newback/src/modules/auth/auth.service.ts b/newback/src/modules/auth/auth.service.ts
index 1ac40df37..3aac75fde 100644
--- a/newback/src/modules/auth/auth.service.ts
+++ b/newback/src/modules/auth/auth.service.ts
@@ -1,11 +1,14 @@
 import {
   ConflictException,
   Injectable,
-  Logger
+  Logger,
+  UnauthorizedException
 } from '@nestjs/common';
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {PasswordService} from '@/modules/password/password.service';
 import {
+  LoginRequest,
+  SignInResponse,
   SignUpRequest,
   SignUpResponse
 } from '@/data/types/dto/dto';
@@ -15,6 +18,7 @@ import {RedisService} from '@/data/redis/RedisService';
 import {EmailSenderService} from '@/modules/email.render/email.sender.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
+import {LoginRequestValidator} from '@/modules/auth/validators/login.request.validator';
 
 @Injectable()
 export class AuthService {
@@ -30,9 +34,26 @@ export class AuthService {
   ) {
   }
 
-  public async authorize(email: string): Promise<string> {
-    let user = await this.userRepository.getUserByEmail(email);
-    return user.user.username;
+  public async authorize(body: LoginRequest): Promise<SignInResponse> {
+    let password, userId;
+    if (body.email) {
+      const result = await this.userRepository.getUserByEmail(body.email);
+      userId = result.user.id;
+      password = result?.password;
+    } else {
+      const result = await this.userRepository.getUserByUserName(body.username);
+      userId = result.id;
+      password = result?.userAuth?.password;
+    }
+    if (!password) {
+       throw new ConflictException("User with login doesn't exists");
+    }
+    let matches = await this.passwordService.checkPassword(body.password, password);
+    if (!matches) {
+      throw new UnauthorizedException("Invalid password");
+    }
+    const session = await this.createAndSaveSession(userId);
+    return {session}
   }
 
   public async sendVerificationEmail(email: string, userId: number, username: string, ip: string) {
@@ -51,8 +72,7 @@ export class AuthService {
   public async registerUser(data: SignUpRequest, ip: string): Promise<SignUpResponse> {
     const {session, userId} = await this.sequelize.transaction(async(t) => {
       let userId = await this.createUser(data, t);
-      let session = await this.passwordService.generateRandomString(32);
-      await this.redisService.saveSession(session, userId);
+      let session = await this.createAndSaveSession(userId);
       return {session, userId};
     });
     if (data.email) {
@@ -61,6 +81,12 @@ export class AuthService {
     return {session};
   }
 
+  private async createAndSaveSession(userId: number) {
+    let session = await this.passwordService.generateRandomString(32);
+    await this.redisService.saveSession(session, userId);
+    return session;
+  }
+
   public async validateEmail(email: string): Promise<void> {
     let exist = await this.userRepository.checkUserExistByEmail(email);
     if (exist) {
diff --git a/newback/src/modules/auth/validators/login.request.validator.ts b/newback/src/modules/auth/validators/login.request.validator.ts
index 20cc51911..8d544bb25 100644
--- a/newback/src/modules/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/auth/validators/login.request.validator.ts
@@ -1,16 +1,27 @@
 import {
+  IsEmail,
   IsString,
   Matches,
+  ValidateIf,
 } from 'class-validator';
 import {LoginRequest} from '@/data/types/dto/dto';
 
 export class LoginRequestValidator implements LoginRequest {
   @IsString()
+  @ValidateIf(o => !o.email)
   @Matches(/^\S+$/, {
     message: `Username can't contain whitespaces`
   })
   public username: string;
 
+  @IsString()
+  @IsEmail()
+  @Matches(/^\S+$/, {
+    message: `email can't contain whitespaces`
+  })
+  @ValidateIf(o => !o.username)
+  public email: string;
+
   @IsString()
   @Matches(/^\S+$/, {
     message: `Password can't contain whitespaces`

From bdc8c85f4314d135eef2f2a911f47f906cbcaadc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 03:52:32 +0300
Subject: [PATCH 014/221] Fixed auth

---
 newback/src/modules/auth/auth.service.ts                  | 8 +++++---
 .../modules/auth/validators/login.request.validator.ts    | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/newback/src/modules/auth/auth.service.ts b/newback/src/modules/auth/auth.service.ts
index 3aac75fde..4e57089dd 100644
--- a/newback/src/modules/auth/auth.service.ts
+++ b/newback/src/modules/auth/auth.service.ts
@@ -18,7 +18,6 @@ import {RedisService} from '@/data/redis/RedisService';
 import {EmailSenderService} from '@/modules/email.render/email.sender.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
-import {LoginRequestValidator} from '@/modules/auth/validators/login.request.validator';
 
 @Injectable()
 export class AuthService {
@@ -38,11 +37,11 @@ export class AuthService {
     let password, userId;
     if (body.email) {
       const result = await this.userRepository.getUserByEmail(body.email);
-      userId = result.user.id;
+      userId = result?.user?.id;
       password = result?.password;
     } else {
       const result = await this.userRepository.getUserByUserName(body.username);
-      userId = result.id;
+      userId = result?.id;
       password = result?.userAuth?.password;
     }
     if (!password) {
@@ -58,8 +57,10 @@ export class AuthService {
 
   public async sendVerificationEmail(email: string, userId: number, username: string, ip: string) {
     try {
+      this.logger.debug(`Preparing for sending verification email to userId ${userId}`)
       await this.sequelize.transaction(async(t) => {
         let token = await this.passwordService.generateRandomString(32);
+        this.logger.log(`Generated token for userId ${userId}: ${token}`)
         await this.userRepository.createVerification(email, userId, token, t)
         await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ip)
       });
@@ -83,6 +84,7 @@ export class AuthService {
 
   private async createAndSaveSession(userId: number) {
     let session = await this.passwordService.generateRandomString(32);
+    this.logger.log(`Generated session for userId ${userId}: ${session}`)
     await this.redisService.saveSession(session, userId);
     return session;
   }
diff --git a/newback/src/modules/auth/validators/login.request.validator.ts b/newback/src/modules/auth/validators/login.request.validator.ts
index 8d544bb25..fd3dd7fa8 100644
--- a/newback/src/modules/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/auth/validators/login.request.validator.ts
@@ -7,19 +7,20 @@ import {
 import {LoginRequest} from '@/data/types/dto/dto';
 
 export class LoginRequestValidator implements LoginRequest {
+
+  @ValidateIf(o => !o.email || o.username)
   @IsString()
-  @ValidateIf(o => !o.email)
   @Matches(/^\S+$/, {
     message: `Username can't contain whitespaces`
   })
   public username: string;
 
+  @ValidateIf(o => !o.username || o.email)
   @IsString()
   @IsEmail()
   @Matches(/^\S+$/, {
     message: `email can't contain whitespaces`
   })
-  @ValidateIf(o => !o.username)
   public email: string;
 
   @IsString()

From e89d60505f3a16fe4ea3ab84731960257cd0e11c Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 12:33:35 +0300
Subject: [PATCH 015/221] fix test

---
 newback/package.json                          |   1 +
 newback/src/modules/auth/auth.controller.ts   |   2 +-
 newback/src/modules/auth/auth.module.spec.ts  | 107 ++++++++++++------
 .../validators/sign.up.request.validator.ts   |   1 +
 newback/yarn.lock                             |  20 ++++
 5 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/newback/package.json b/newback/package.json
index c0882f8d4..a010354d8 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -22,6 +22,7 @@
     "@nestjs/swagger": "^5.2.1",
     "@types/bcrypt": "^5.0.0",
     "@types/nodemailer": "^6.4.4",
+    "@types/supertest": "^2.0.12",
     "bcrypt": "^5.0.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
diff --git a/newback/src/modules/auth/auth.controller.ts b/newback/src/modules/auth/auth.controller.ts
index f8629f77b..bdd841713 100644
--- a/newback/src/modules/auth/auth.controller.ts
+++ b/newback/src/modules/auth/auth.controller.ts
@@ -1,6 +1,7 @@
 import {
   Body,
   Controller,
+  HttpCode,
   Ip,
   Logger,
   Post
@@ -38,5 +39,4 @@ export class AuthController {
     await this.authservice.validateUser(body.username);
   }
 
-
 }
diff --git a/newback/src/modules/auth/auth.module.spec.ts b/newback/src/modules/auth/auth.module.spec.ts
index 7043dfc41..3a647732d 100644
--- a/newback/src/modules/auth/auth.module.spec.ts
+++ b/newback/src/modules/auth/auth.module.spec.ts
@@ -14,7 +14,6 @@ import {RoomRepository} from '@/data/database/repository/room.repository';
 import {RedisService} from '@/data/redis/RedisService';
 import {EmailSenderService} from '@/modules/email.render/email.sender.service';
 import {
-  MailerModule,
   MailerService
 } from '@nestjs-modules/mailer';
 import {Sequelize} from 'sequelize-typescript';
@@ -22,19 +21,14 @@ import {HtmlService} from '@/modules/html/html.service';
 
 describe('AuthModule', () => {
   let app: INestApplication;
-  let request: () => supertest.SuperTest<supertest.Test>;
-  let userRepository: UserRepository;
-  let roomRepository: RoomRepository;
-  let redisService: RedisService;
-  let sequelize: Sequelize;
-  let mailerService: MailerService;
-  beforeEach(async() => {
+  let request: supertest.SuperTest<supertest.Test>;
+  let userRepository: UserRepository = {} as UserRepository;
+  let roomRepository: RoomRepository = {} as RoomRepository;
+  let redisService: RedisService = {} as RedisService;
+  let sequelize: Sequelize = {} as Sequelize;
+  let mailerService: MailerService = {} as MailerService;
 
-    userRepository = {} as UserRepository;
-    roomRepository = {} as RoomRepository;
-    redisService = {} as RedisService;
-    sequelize = {} as Sequelize;
-    mailerService = {} as MailerService;
+  beforeAll(async() => {
     const moduleFixture = await Test.createTestingModule({
       imports: [
         LoggerModule,
@@ -69,41 +63,91 @@ describe('AuthModule', () => {
     app = moduleFixture.createNestApplication();
     app.useGlobalPipes(new ValidationPipe());
     await app.init();
-
-    const requestToServer = supertest(app.getHttpServer());
-    request = (): supertest.SuperTest<supertest.Test> => requestToServer;
+    request = supertest(app.getHttpServer());
   });
 
   afterEach(() => {
     jest.clearAllMocks();
+    Object.keys(userRepository).forEach(key => delete userRepository[key]);
+    Object.keys(roomRepository).forEach(key => delete roomRepository[key]);
+    Object.keys(redisService).forEach(key => delete redisService[key]);
+    Object.keys(sequelize).forEach(key => delete sequelize[key]);
+    Object.keys(mailerService).forEach(key => delete mailerService[key]);
   });
 
-  afterAll(() => app.close());
+  afterAll(async() => {
+   await app.close()
+  });
 
   describe('signup', () => {
-    it('validate request', async() => {
+    it('returns session', async() => {
      sequelize.transaction = (resolve) =>resolve();
      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
      userRepository.createUser = jest.fn().mockResolvedValue(3);
      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
-      const {body} = await request()
+      const {body} = await request
         .post('/register').send({
           username: 'a',
           password: 'as$'
-        });
+        }).expect(201);
 
-      await expect(body).toMatchObject({session: expect.any(String)});
+      expect(body).toMatchObject({session: expect.any(String)});
+    });
+    it('throws an error if user exists', async() => {
+     sequelize.transaction = (resolve) =>resolve();
+     userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
+      const {body} = await request
+        .post('/register').send({
+          username: 'a',
+          password: 'as$'
+        }).expect(409,{
+        error: "Conflict",
+        message: "User with this username already exist",
+        statusCode: 409
+      });
+    });
+    it('throws an error if email exists', async() => {
+     sequelize.transaction = (resolve) =>resolve();
+     userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+     userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
+      const {body} = await request
+        .post('/register').send({
+          username: 'a',
+          password: 'as$',
+          email: 'death@gmail.com'
+        }).expect(409, {
+        error: "Conflict",
+        message: "User with this email already exist",
+        statusCode: 409
+      });
     });
   });
   describe('validate user', () => {
+
+    it('should return ok', async() => {
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      await request
+        .post('/validate_user').send({
+          username: 'a',
+        }).expect(201,{});
+    });
+   it('should error if user exists', async() => {
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
+      await request
+        .post('/validate_user').send({
+          username: 'a',
+        }).expect(409,{
+        "error": "Conflict",
+        "message": "User with this username already exist",
+        "statusCode": 409,
+      });
+    });
     it('should give error on invalid character for username', async() => {
-      const {body} = await request()
+      await request
         .post('/validate_user').send({
           username: '%',
-        });
-
-      await expect(body).toStrictEqual({
+        }).expect(400,{
         "error": "Bad Request",
         "message": [
           "Username can only contain latin characters, numbers and symbols '-' '_'",
@@ -112,12 +156,10 @@ describe('AuthModule', () => {
       });
     });
     it('should give error if username has great length', async() => {
-      const {body} = await request()
+      await request
         .post('/validate_user').send({
           username: '1234567890123456789',
-        });
-
-      await expect(body).toStrictEqual({
+        }).expect(400, {
         "error": "Bad Request",
         "message": [
           "Username should be 1-16 characters",
@@ -127,13 +169,10 @@ describe('AuthModule', () => {
     });
     it('should throw an error if user exists', async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
-
-      const {body} = await request()
+      await request
         .post('/validate_user').send({
           username: 'asd',
-        });
-
-      await expect(body).toStrictEqual({
+        }).expect(409, {
         "error": "Conflict",
         "message": "User with this username already exist",
         "statusCode": 409,
diff --git a/newback/src/modules/auth/validators/sign.up.request.validator.ts b/newback/src/modules/auth/validators/sign.up.request.validator.ts
index 9f45ec69b..af9969b8c 100644
--- a/newback/src/modules/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/auth/validators/sign.up.request.validator.ts
@@ -5,6 +5,7 @@ import {
   IsString,
   Length,
   Matches,
+  ValidateIf,
 } from 'class-validator';
 import {
   Gender,
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 4a6e377ff..778d6e550 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -855,6 +855,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cookiejar@*":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8"
+  integrity sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==
+
 "@types/debug@^4.1.7":
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
@@ -1026,6 +1031,21 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
+"@types/superagent@*":
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.15.tgz#63297de457eba5e2bc502a7609426c4cceab434a"
+  integrity sha512-mu/N4uvfDN2zVQQ5AYJI/g4qxn2bHB6521t1UuH09ShNWjebTqN0ZFuYK9uYjcgmI0dTQEs+Owi1EO6U0OkOZQ==
+  dependencies:
+    "@types/cookiejar" "*"
+    "@types/node" "*"
+
+"@types/supertest@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.12.tgz#ddb4a0568597c9aadff8dbec5b2e8fddbe8692fc"
+  integrity sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==
+  dependencies:
+    "@types/superagent" "*"
+
 "@types/validator@*", "@types/validator@^13.7.1":
   version "13.7.2"
   resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.2.tgz#a2114225d9be743fb154b06c29b8257aaca42922"

From fa914fc04831d2bec25094dc19a2629c1154e5e5 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 13:16:29 +0300
Subject: [PATCH 016/221] tes

---
 newback/package.json                         |   3 +-
 newback/src/modules/auth/auth.module.spec.ts | 170 +++++++++++++------
 newback/yarn.lock                            |   5 +
 3 files changed, 128 insertions(+), 50 deletions(-)

diff --git a/newback/package.json b/newback/package.json
index a010354d8..199ff3714 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -58,6 +58,7 @@
     "ts-loader": "^9.2.8",
     "ts-node": "^10.7.0",
     "tsconfig-paths-jest": "^0.0.1",
-    "typescript": "^4.6.3"
+    "typescript": "^4.6.3",
+    "wait-for-expect": "^3.0.2"
   }
 }
diff --git a/newback/src/modules/auth/auth.module.spec.ts b/newback/src/modules/auth/auth.module.spec.ts
index 3a647732d..87634ec96 100644
--- a/newback/src/modules/auth/auth.module.spec.ts
+++ b/newback/src/modules/auth/auth.module.spec.ts
@@ -13,11 +13,10 @@ import {UserRepository} from '@/data/database/repository/user.repository';
 import {RoomRepository} from '@/data/database/repository/room.repository';
 import {RedisService} from '@/data/redis/RedisService';
 import {EmailSenderService} from '@/modules/email.render/email.sender.service';
-import {
-  MailerService
-} from '@nestjs-modules/mailer';
+import {MailerService} from '@nestjs-modules/mailer';
 import {Sequelize} from 'sequelize-typescript';
 import {HtmlService} from '@/modules/html/html.service';
+import waitForExpect from "wait-for-expect";
 
 describe('AuthModule', () => {
   let app: INestApplication;
@@ -76,16 +75,65 @@ describe('AuthModule', () => {
   });
 
   afterAll(async() => {
-   await app.close()
+    await app.close()
   });
 
-  describe('signup', () => {
+  describe('auth', () => {
+    it('should throw if user not exists', async() => {
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
+      await request
+        .post('/auth').send({
+          username: 'a',
+          password: 'as$'
+        }).expect(409, {
+          error: "Conflict",
+          message: "User with login doesn't exists",
+          statusCode: 409
+        });
+    });
+    it('should throw if password invalid', async() => {
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
+        userAuth: {
+          password: 's'
+        },
+        id: 3
+      })
+      const {body} = await request
+        .post('/auth').send({
+          username: 'a',
+          password: 'as$'
+        }).expect(401, {
+          error: "Unauthorized",
+          message: "Invalid password",
+          statusCode: 401
+        });
+    })
+    it('should return session', async() => {
+      let passwordService = app.get(PasswordService);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      let password = await passwordService.createPassword("koko");
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
+        userAuth: {
+          password: password
+        },
+        id: 3
+      })
+      const {body} = await request
+        .post('/auth').send({
+          username: 'a',
+          password: 'koko'
+        });
+      expect(body).toMatchObject({session: expect.any(String)});
+    })
+  });
+
+  describe('register', () => {
     it('returns session', async() => {
-     sequelize.transaction = (resolve) =>resolve();
-     userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-     userRepository.createUser = jest.fn().mockResolvedValue(3);
-     roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-     redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.createUser = jest.fn().mockResolvedValue(3);
+      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
       const {body} = await request
         .post('/register').send({
           username: 'a',
@@ -94,78 +142,102 @@ describe('AuthModule', () => {
 
       expect(body).toMatchObject({session: expect.any(String)});
     });
+    it('sends an email', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.createVerification =  jest.fn().mockResolvedValue(undefined);
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
+      userRepository.createUser = jest.fn().mockResolvedValue(3);
+      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      mailerService.sendMail = jest.fn();
+      let spy =  jest.spyOn(mailerService, 'sendMail').mockResolvedValue(true);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+      const {body} = await request
+        .post('/register').send({
+          username: 'a',
+          password: 'as$',
+          email: 'death@gmail.com'
+        }).expect(201);
+
+      expect(body).toMatchObject({session: expect.any(String)});
+      await waitForExpect(() => {
+        expect(spy).toHaveBeenCalledTimes(1);
+      }, 30); // 30ms is more than enough
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.any(String)}))
+
+    });
     it('throws an error if user exists', async() => {
-     sequelize.transaction = (resolve) =>resolve();
-     userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
       const {body} = await request
         .post('/register').send({
           username: 'a',
           password: 'as$'
-        }).expect(409,{
-        error: "Conflict",
-        message: "User with this username already exist",
-        statusCode: 409
-      });
+        }).expect(409, {
+          error: "Conflict",
+          message: "User with this username already exist",
+          statusCode: 409
+        });
     });
     it('throws an error if email exists', async() => {
-     sequelize.transaction = (resolve) =>resolve();
-     userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-     userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
       const {body} = await request
         .post('/register').send({
           username: 'a',
           password: 'as$',
           email: 'death@gmail.com'
         }).expect(409, {
-        error: "Conflict",
-        message: "User with this email already exist",
-        statusCode: 409
-      });
+          error: "Conflict",
+          message: "User with this email already exist",
+          statusCode: 409
+        });
     });
   });
-  describe('validate user', () => {
+  describe('validate_user', () => {
 
     it('should return ok', async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       await request
         .post('/validate_user').send({
           username: 'a',
-        }).expect(201,{});
+        }).expect(201, {});
     });
-   it('should error if user exists', async() => {
+    it('should error if user exists', async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
       await request
         .post('/validate_user').send({
           username: 'a',
-        }).expect(409,{
-        "error": "Conflict",
-        "message": "User with this username already exist",
-        "statusCode": 409,
-      });
+        }).expect(409, {
+          "error": "Conflict",
+          "message": "User with this username already exist",
+          "statusCode": 409,
+        });
     });
     it('should give error on invalid character for username', async() => {
       await request
         .post('/validate_user').send({
           username: '%',
-        }).expect(400,{
-        "error": "Bad Request",
-        "message": [
-          "Username can only contain latin characters, numbers and symbols '-' '_'",
-        ],
-        "statusCode": 400,
-      });
+        }).expect(400, {
+          "error": "Bad Request",
+          "message": [
+            "Username can only contain latin characters, numbers and symbols '-' '_'",
+          ],
+          "statusCode": 400,
+        });
     });
     it('should give error if username has great length', async() => {
       await request
         .post('/validate_user').send({
           username: '1234567890123456789',
         }).expect(400, {
-        "error": "Bad Request",
-        "message": [
-          "Username should be 1-16 characters",
-        ],
-        "statusCode": 400,
-      });
+          "error": "Bad Request",
+          "message": [
+            "Username should be 1-16 characters",
+          ],
+          "statusCode": 400,
+        });
     });
     it('should throw an error if user exists', async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
@@ -173,10 +245,10 @@ describe('AuthModule', () => {
         .post('/validate_user').send({
           username: 'asd',
         }).expect(409, {
-        "error": "Conflict",
-        "message": "User with this username already exist",
-        "statusCode": 409,
-      });
+          "error": "Conflict",
+          "message": "User with this username already exist",
+          "statusCode": 409,
+        });
     });
   });
 });
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 778d6e550..aeb07f963 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -6593,6 +6593,11 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
+wait-for-expect@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-3.0.2.tgz#d2f14b2f7b778c9b82144109c8fa89ceaadaa463"
+  integrity sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==
+
 walker@^1.0.7:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"

From 43107b6ef86e916b502e4c1a15db7547a761871c Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 22:20:27 +0300
Subject: [PATCH 017/221] Aded more auth test and fe and be methods

---
 common/dto.ts                                 |  49 ++++-
 frontend/build/development.json               |   6 +-
 frontend/build/vite.config.ts                 |   6 +-
 frontend/package.json                         |   1 +
 frontend/src/ts/classes/DatabaseWrapper.ts    |  16 +-
 frontend/src/ts/classes/DefaultStore.ts       |   5 +-
 frontend/src/ts/classes/Fetch.ts              | 186 +++++++++---------
 frontend/src/ts/classes/Http.ts               |   2 +-
 frontend/src/ts/classes/Xhr.ts                | 164 ---------------
 frontend/src/ts/instances/routerInstance.ts   |   5 -
 frontend/src/ts/main.ts                       |  15 +-
 frontend/src/ts/message_handlers/Api.ts       | 108 +++-------
 frontend/src/ts/types/converters.ts           |  46 +----
 frontend/src/ts/types/db.ts                   |   6 +-
 frontend/src/ts/types/dto.ts                  |  24 +--
 frontend/src/ts/types/env.d.ts                |   1 +
 frontend/src/ts/types/model.ts                |  11 +-
 frontend/src/ts/types/types.ts                |  11 +-
 frontend/src/vue/pages/ReportIssue.vue        | 121 ------------
 frontend/src/vue/pages/UserProfileInfo.vue    |   4 +-
 frontend/src/vue/singup/AuthPage.vue          |   5 +-
 frontend/src/vue/singup/CaptchaComponent.vue  |  58 ++++--
 frontend/src/vue/singup/Login.vue             |  22 ++-
 frontend/src/vue/singup/SignUp.vue            |  38 ++--
 frontend/yarn.lock                            |  58 +++++-
 newback/config/Config.d.ts                    |  23 ++-
 newback/config/default.json                   |  12 +-
 newback/config/env/local.json                 |   7 +
 newback/config/env/test.json                  |   3 +
 newback/package.json                          |   6 +-
 newback/src/data/database/model/user.model.ts |   5 +-
 newback/src/data/database/ormconfig.ts        |   2 +-
 .../database/repository/user.repository.ts    |  10 +
 newback/src/data/utils/consts.ts              |   1 +
 .../src/fixtures/google.response.fixture.json |  17 ++
 newback/src/main.ts                           |  17 +-
 .../src/modules/api/auth/auth.controller.ts   |  67 +++++++
 .../{ => api}/auth/auth.module.spec.ts        | 171 +++++++++++++---
 newback/src/modules/api/auth/auth.module.ts   |  30 +++
 .../modules/{ => api}/auth/auth.service.ts    |  38 +++-
 .../modules/api/auth/google.auth.service.ts   |  47 +++++
 .../auth}/password.service.ts                 |   0
 .../google.auth.reques.validator.ts           |  11 ++
 .../validators/login.request.validator.ts     |   8 +-
 .../validators/sign.up.request.validator.ts   |   6 +-
 .../validate.email.request.validator.ts       |  11 ++
 .../validate.user.request.validator.ts        |   6 +-
 newback/src/modules/app/app.module.ts         |  13 +-
 newback/src/modules/auth/auth.controller.ts   |  42 ----
 newback/src/modules/auth/auth.module.ts       |  15 --
 newback/src/modules/captcha/index.ts          |  48 +++++
 newback/src/modules/config/config.module.ts   |  17 ++
 newback/src/modules/config/config.service.ts  |  14 ++
 .../src/modules/email.render/email.module.ts  |   4 +-
 .../email.render/email.sender.service.ts      |  13 +-
 newback/src/modules/http/http.module.ts       |  19 ++
 newback/src/modules/http/http.service.ts      |  45 +++++
 newback/tsconfig.json                         |   1 +
 newback/yarn.lock                             | 169 ++++++++++++++--
 59 files changed, 1085 insertions(+), 781 deletions(-)
 delete mode 100644 frontend/src/ts/classes/Xhr.ts
 delete mode 100644 frontend/src/vue/pages/ReportIssue.vue
 create mode 100644 newback/config/env/local.json
 create mode 100644 newback/config/env/test.json
 create mode 100644 newback/src/fixtures/google.response.fixture.json
 create mode 100644 newback/src/modules/api/auth/auth.controller.ts
 rename newback/src/modules/{ => api}/auth/auth.module.spec.ts (61%)
 create mode 100644 newback/src/modules/api/auth/auth.module.ts
 rename newback/src/modules/{ => api}/auth/auth.service.ts (75%)
 create mode 100644 newback/src/modules/api/auth/google.auth.service.ts
 rename newback/src/modules/{password => api/auth}/password.service.ts (100%)
 create mode 100644 newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
 rename newback/src/modules/{ => api}/auth/validators/login.request.validator.ts (74%)
 rename newback/src/modules/{ => api}/auth/validators/sign.up.request.validator.ts (80%)
 create mode 100644 newback/src/modules/api/auth/validators/validate.email.request.validator.ts
 rename newback/src/modules/{ => api}/auth/validators/validate.user.request.validator.ts (68%)
 delete mode 100644 newback/src/modules/auth/auth.controller.ts
 delete mode 100644 newback/src/modules/auth/auth.module.ts
 create mode 100644 newback/src/modules/captcha/index.ts
 create mode 100644 newback/src/modules/config/config.module.ts
 create mode 100644 newback/src/modules/config/config.service.ts
 create mode 100644 newback/src/modules/http/http.module.ts
 create mode 100644 newback/src/modules/http/http.service.ts

diff --git a/common/dto.ts b/common/dto.ts
index 4889d0b11..d790baae0 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -1,15 +1,19 @@
-export interface LoginRequest {
-  username: string;
+export interface SignInRequest extends CaptchaRequest{
+  username?: string;
   password: string;
-  email: string;
+  email?: string;
 }
 
-export interface ValidateUserRequest {
-  username: string;
+export interface CaptchaRequest {
+  captcha?: string;
 }
 
-export interface ValidateUserResponse {
-  ok: boolean;
+export interface GoogleAuthRequest {
+  token: string;
+}
+
+export interface ValidateUserRequest {
+  username: string;
 }
 
 export interface SignUpRequest {
@@ -19,7 +23,7 @@ export interface SignUpRequest {
   sex?: Gender;
 }
 
-interface SessionResponse {
+export interface SessionResponse {
   session: string;
 }
 
@@ -27,10 +31,39 @@ export interface SignInResponse extends SessionResponse {
 
 }
 
+export interface OauthSessionResponse extends SessionResponse {
+  isNewAccount: boolean;
+  username: string;
+}
+
+export interface GoogleSignInResponse extends OauthSessionResponse {
+
+}
+
+export interface FacebookSignInResponse extends OauthSessionResponse {
+
+}
+
 export interface SignUpResponse extends SessionResponse{
 
 }
 
+export interface OkResponse {
+  ok: true;
+}
+
+export interface ValidateUserResponse extends OkResponse {
+
+}
+
+export interface ValidateEmailResponse extends OkResponse {
+
+}
+
+export interface ValidateUserEmailRequest {
+  email: string;
+}
+
 // ISO/IEC 5218 1 male, 2 - female
 export enum Gender {
   MALE = 'MALE',
diff --git a/frontend/build/development.json b/frontend/build/development.json
index 95fdee33e..2d604106a 100644
--- a/frontend/build/development.json
+++ b/frontend/build/development.json
@@ -3,9 +3,9 @@
   "IS_DEBUG": true,
   "ELECTRON_IGNORE_SSL": true,
   "PUBLIC_PATH": null,
-  "GOOGLE_OAUTH_2_CLIENT_ID": false,
-  "FACEBOOK_APP_ID": false,
-  "RECAPTCHA_PUBLIC_KEY": false,
+  "GOOGLE_OAUTH_2_CLIENT_ID": "620421656154-8boctt2h7h5meskhe7vh8aiargj0nae9.apps.googleusercontent.com",
+  "FACEBOOK_APP_ID": "894051850700207",
+  "RECAPTCHA_PUBLIC_KEY": "6LchGhwTAAAAAJwCRgfNKraWrFtCdKPFo0Ri8DLt",
   "AUTO_REGISTRATION": false,
   "ISSUES": false,
   "GIPHY_API_KEY": "thZMTtWsaBQAPDIAY461GzYTctuYIeIj",
diff --git a/frontend/build/vite.config.ts b/frontend/build/vite.config.ts
index b33ac8250..75181f870 100644
--- a/frontend/build/vite.config.ts
+++ b/frontend/build/vite.config.ts
@@ -15,6 +15,7 @@ import viteChecker from 'vite-plugin-checker'
 import {viteStaticCopy} from 'vite-plugin-static-copy'
 import viteCompression from 'vite-plugin-compression'
 import viteVisualizer from 'rollup-plugin-visualizer'
+import Inspector from "vite-plugin-vue-inspector";
 
 export default defineConfig(async({command, mode}) => {
   let key, cert, ca, gitHash;
@@ -47,6 +48,9 @@ export default defineConfig(async({command, mode}) => {
     },
     plugins: [
       vue(),
+      Inspector({
+        vue: 3,
+      }),
       ...(!process.env.VITE_LIGHT ? [
         viteChecker({
             typescript: !process.env.VITE_LIGHT,
@@ -128,7 +132,7 @@ export default defineConfig(async({command, mode}) => {
       },
     },
     server: {
-      port: 8080,
+      port: 443,
       https: {
         key,
         cert,
diff --git a/frontend/package.json b/frontend/package.json
index ff8717769..82e1395e3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -57,6 +57,7 @@
     "vite-plugin-checker": "^0.4.4",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-static-copy": "https://github.com/akoidan/vite-plugin-static-copy",
+    "vite-plugin-vue-inspector": "^0.3.0",
     "vue-tsc": "^0.33.9"
   },
   "dependencies": {
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 69257c950..ace8e4eba 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -20,10 +20,6 @@ import type {
   UserModel,
 } from "@/ts/types/model";
 import {
-  convertNumberToSex,
-  convertSexToNumber,
-  convertSexToString,
-  convertStringSexToNumber,
   convertToBoolean,
   getChannelDict,
   getRoomsBaseDict,
@@ -61,7 +57,7 @@ export default class DatabaseWrapper implements IStorage {
     if (!window.openDatabase) {
       throw Error("DatabaseWrapper not supported");
     }
-    this.db = window.openDatabase("v157", "", "Messages database", 10 * 1024 * 1024);
+    this.db = window.openDatabase("v158", "", "Messages database", 10 * 1024 * 1024);
     this.logger = loggerFactory.getLoggerColor("db", "#753e01");
   }
 
@@ -71,7 +67,7 @@ export default class DatabaseWrapper implements IStorage {
       let t: SQLTransaction = await new Promise<SQLTransaction>((resolve, reject) => {
         this.db.changeVersion(this.db.version, "1.0", resolve, reject);
       });
-      t = await this.runSql(t, "CREATE TABLE user (id integer primary key, user text, sex integer NOT NULL CHECK (sex IN (0,1,2)), deleted boolean NOT NULL CHECK (deleted IN (0,1)), country_code text, country text, region text, city text, thumbnail text, last_time_online integer)");
+      t = await this.runSql(t, "CREATE TABLE user (id integer primary key, user text, sex text NOT NULL CHECK (sex IN ('MALE', 'FEMALE','OTHER')), deleted boolean NOT NULL CHECK (deleted IN (0,1)), country_code text, country text, region text, city text, thumbnail text, last_time_online integer)");
       t = await this.runSql(t, "CREATE TABLE channel (id integer primary key, name text, deleted boolean NOT NULL CHECK (deleted IN (0,1)), creator INTEGER REFERENCES user(id))");
       t = await this.runSql(t, "CREATE TABLE room (id integer primary key, name text, p2p boolean NOT NULL CHECK (p2p IN (0,1)), notifications boolean NOT NULL CHECK (notifications IN (0,1)), volume integer, deleted boolean NOT NULL CHECK (deleted IN (0,1)), channel_id INTEGER REFERENCES channel(id), is_main_in_channel boolean NOT NULL CHECK (is_main_in_channel IN (0,1)), creator INTEGER REFERENCES user(id))");
       t = await this.runSql(t, "CREATE TABLE message (id integer primary key, time integer, content text, symbol text, deleted boolean NOT NULL CHECK (deleted IN (0,1)), edited integer, room_id integer REFERENCES room(id), user_id integer REFERENCES user(id), status text, parent_message_id INTEGER REFERENCES message(id) ON UPDATE CASCADE, thread_messages_count INTEGER)");
@@ -246,7 +242,7 @@ export default class DatabaseWrapper implements IStorage {
   public getInsertUser(user: UserModel): QueryObject {
     return [
       "insert or replace into user (id, user, sex, deleted, country_code, country, region, city, last_time_online, thumbnail) values (?, ?, ?, 0, ?, ?, ?, ?, ?, ?)",
-      [user.id, user.user, convertSexToNumber(user.sex), user.location.countryCode, user.location.country, user.location.region, user.location.city, user.lastTimeOnline, user.image],
+      [user.id, user.user, user.sex, user.location.countryCode, user.location.country, user.location.region, user.location.city, user.lastTimeOnline, user.image],
     ];
   }
 
@@ -271,7 +267,7 @@ export default class DatabaseWrapper implements IStorage {
 
   public setUserProfile(user: CurrentUserInfoModel) {
     this.write((t) => {
-      this.executeSql(t, "insert or replace into profile (user_id, user, name, city, surname, email, birthday, contacts, sex, image) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [user.userId, user.user, user.name, user.city, user.surname, user.email, user.birthday, user.contacts, convertStringSexToNumber(user.sex), user.image])();
+      this.executeSql(t, "insert or replace into profile (user_id, user, name, city, surname, email, birthday, contacts, sex, image) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [user.userId, user.user, user.name, user.city, user.surname, user.email, user.birthday, user.contacts, user.sex, user.image])();
     });
   }
 
@@ -517,7 +513,7 @@ export default class DatabaseWrapper implements IStorage {
       const user: UserModel = {
         id: u.id,
         lastTimeOnline: u.last_time_online,
-        sex: convertNumberToSex(u.sex),
+        sex: u.sex,
         image: u.thumbnail,
         user: u.user,
         location: {
@@ -562,7 +558,7 @@ export default class DatabaseWrapper implements IStorage {
 
   private getProfileModel(dbProfile: ProfileDB): CurrentUserInfoModel {
     return {
-      sex: convertSexToString(dbProfile.sex),
+      sex: dbProfile.sex,
       contacts: dbProfile.contacts,
       image: dbProfile.image,
       birthday: dbProfile.birthday,
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index 44c8ff35b..c78311f8a 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -12,7 +12,7 @@ import type {
   PastingTextAreaElement,
   RoomDictModel,
   SendingFileTransfer,
-  SexModelString,
+
   UserDictModel,
 } from "@/ts/types/model";
 import {
@@ -79,6 +79,7 @@ import {
   Mutation,
   VuexModule,
 } from "vuex-module-decorators";
+import {Gender} from '@/ts/types/backend/dto';
 
 const logger = loggerFactory.getLogger("store");
 
@@ -885,7 +886,7 @@ export class DefaultStore extends VuexModule {
   }
 
   @Mutation
-  public setUser(user: {id: number; sex: SexModelString; user: string; image: string}) {
+  public setUser(user: {id: number; sex: Gender; user: string; image: string}) {
     this.allUsersDict[user.id].user = user.user;
     this.allUsersDict[user.id].sex = user.sex;
     this.allUsersDict[user.id].image = user.image;
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index 93fd94d00..0c08fd45f 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -1,99 +1,97 @@
-import type {SessionHolder} from "@/ts/types/types";
+import type {
+  GetData,
+  PostData,
+  SessionHolder,
+} from "@/ts/types/types";
+import Http from "@/ts/classes/Http";
+import {XHR_API_URL} from "@/ts/utils/runtimeConsts";
 
-/**
- * @param params : object dict of params or DOM form
- * @param callback : function calls on response
- * @param url : string url to post
- * @param formData : form in canse form is used
- *
- */
+export default class Fetch extends Http {
+  public constructor(sessionHolder: SessionHolder) {
+    super(sessionHolder);
+  }
 
-export default class Fetch /* Extends Http*/ {
-  public constructor(apiUrl: string, sessionHolder: SessionHolder) {
-    // Super(apiUrl, sessionHolder);
+  public async doGet<T>(url: string, d?: GetData): Promise<T> {
+    if (d?.process) {
+      debugger
+      throw Error("Unable to handle process");
+    }
+    if (d?.baseUrl) {
+      debugger
+      throw Error("Unable to handle baseUrl");
+    }
+    const fileUrl = `${d?.baseUrl ?? XHR_API_URL}${url}`;
+    let headers: Record<string, string> = {
+      'Content-Type': 'application/json'
+    };
+    if (!d?.baseUrl) {
+      headers['session_id'] = this.sessionHolder.session!;
+    }
+    try {
+      let response = await fetch(fileUrl, {
+        method: "GET",
+        mode: 'cors',
+        headers
+      });
+      let body = await response.json();
+      if (response.ok) {
+        return body as T;
+      }
+      if (typeof body.message === 'string') {
+        throw Error(body.message)
+      } else if (body?.message?.length && typeof  body.message[0] === 'string') {
+        throw Error(body.message[0])
+      } else if (typeof body.error === 'string') {
+        throw Error(body.error)
+      } else {
+        throw Error("Network error");
+      }
+    } catch (e) {
+      debugger
+      throw new Error(e as any);
+    }
   }
 
-  //
-  // /**
-  //  * Loads file from server on runtime */
-  // Public doGet<T>(fileUrl: string, callback: ErrorCB<T>, isJsonDecoded: boolean = false) {
-  //   FileUrl = this.getUrl(fileUrl);
-  //   This.httpLogger.log('GET out {}', fileUrl)();
-  //   Let regexRes = /\.(\w+)(\?.*)?$/.exec(fileUrl);
-  //   Let fileType = regexRes != null && regexRes.length === 3 ? regexRes[1] : null;
-  //   Let xobj = new XMLHttpRequest();
-  //   // special for IE
-  //   If (xobj.overrideMimeType) {
-  //     Xobj.overrideMimeType('application/json');
-  //   }
-  //   Xobj.open('GET', fileUrl, true); // Replace 'my_data' with the path to your file
-  //
-  //   Xobj.onreadystatechange = this.getOnreadystatechange<T>(
-  //       Xobj,
-  //       FileUrl,
-  //       IsJsonDecoded || fileType === 'json',
-  //       'GET',
-  //       Callback
-  //   );
-  //   Xobj.send(null);
-  // }
-  //
-  // Async asyncPost<T>(d: PostData<T>) {
-  //   Let config: RequestInit = {
-  //     Cache: 'no-cache',
-  //     Headers: {
-  //       'session-id': this.sessionHolder.session
-  //     },
-  //   };
-  //   If (d.isJsonEncoded) {
-  //     Config.headers['Content-Type'] = 'application/json';
-  //   } else {
-  //     Let body;
-  //     Let logOut: string = '';
-  //     Body = d.formData ? d.formData : new FormData();
-  //     If (d.params) {
-  //       For (let key in d.params) {
-  //         Body.append(key, d.params[key]);
-  //       }
-  //     }
-  //     If (body.entries) {
-  //       Let entries = body.entries();
-  //       If (entries && entries.next) {
-  //         Let d;
-  //         While (d = entries.next()) {
-  //           If (d.done) {
-  //             Break;
-  //           }
-  //           LogOut += `${d.value[0]}= ${d.value[1]};`;
-  //         }
-  //       }
-  //     }
-  //   }
-  //   Await fetch(d.url, config);
-  // }
-  //
-  // DoPost<T>(d: PostData<T>): XMLHttpRequest {
-  //   Let r: XMLHttpRequest = new XMLHttpRequest();
-  //   R.onreadystatechange = this.getOnreadystatechange(r, d.url, d.isJsonDecoded, 'POST', d.cb);
-  //
-  //   Let url = this.getUrl(d.url);
-  //
-  //   R.open('POST', url, true);
-  //   Let data;
-  //   Let logOut: String = '';
-  //   If (d.isJsonEncoded) {
-  //     Data = JSON.stringify(d.params);
-  //     R.setRequestHeader('Content-Type', 'application/json');
-  //   } else {
-  //     /*Firefox doesn't accept null*/
-  //
-  //   }
-  //
-  //   This.httpLogger.log('POST out {} ::: {} ::: {}', url, d.params, logOut)();
-  //   If (d.process) {
-  //     D.process(r);
-  //   }
-  //   R.send(data);
-  //   Return r;
-  // }
+  public async doPost<T>(d: PostData): Promise<T> {
+    if (d?.process) {
+      debugger
+      throw Error("Unable to handle process");
+    }
+    const fileUrl = `${XHR_API_URL}${d.url}`;
+    let headers: Record<string, string> = {};
+    let signal = null;
+    if (d.onAbortController) {
+      const controller = new AbortController();
+      signal = controller.signal;
+      d.onAbortController(controller);
+    }
+    if (!d.formData) {
+      headers['Content-Type'] = 'application/json';
+      headers['session_id'] = this.sessionHolder.session!;
+    }
+    try {
+      let response = await fetch(fileUrl, {
+        method: "POST",
+        mode: 'cors',
+        signal,
+        body: d.params ? JSON.stringify(d.params) : d.formData,
+        headers
+      });
+      let body = await response.json();
+      if (response.ok) {
+        return body as T;
+      }
+      if (typeof body.message === 'string') {
+        throw Error(body.message)
+      } else if (body?.message?.length && typeof  body.message[0] === 'string') {
+        throw Error(body.message[0])
+      } else if (typeof body.error === 'string') {
+        throw Error(body.error)
+      } else {
+        throw Error("Network error");
+      }
+    } catch (e) {
+      throw new Error(e as any);
+    }
+  }
 }
diff --git a/frontend/src/ts/classes/Http.ts b/frontend/src/ts/classes/Http.ts
index 0f8a1bb3c..72380c8dd 100644
--- a/frontend/src/ts/classes/Http.ts
+++ b/frontend/src/ts/classes/Http.ts
@@ -16,7 +16,7 @@ export default abstract class Http {
     this.httpLogger = loggerFactory.getLogger("http");
   }
 
-  public abstract doGet<T>(d: GetData): Promise<T>;
+  public abstract doGet<T>(url: string, d?: GetData): Promise<T>;
 
   public abstract doPost<T>(d: PostData): Promise<T>;
 
diff --git a/frontend/src/ts/classes/Xhr.ts b/frontend/src/ts/classes/Xhr.ts
deleted file mode 100644
index a936cf0b6..000000000
--- a/frontend/src/ts/classes/Xhr.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import type {
-  GetData,
-  PostData,
-  SessionHolder,
-} from "@/ts/types/types";
-import {
-  CONNECTION_ERROR,
-  RESPONSE_SUCCESS,
-} from "@/ts/utils/consts";
-import Http from "@/ts/classes/Http";
-import {XHR_API_URL} from "@/ts/utils/runtimeConsts";
-
-/**
- * @param params : object dict of params or DOM form
- * @param callback : function calls on response
- * @param url : string url to post
- * @param formData : form in canse form is used
- *
- */
-
-export default class Xhr extends Http {
-  public constructor(sessionHolder: SessionHolder) {
-    super(sessionHolder);
-  }
-
-  /**
-   * Loads file from server on runtime
-   */
-  public async doGet<T>(d: GetData): Promise<T> {
-    return new Promise<T>((resolve, reject) => {
-      const fileUrl = `${d.baseUrl ?? XHR_API_URL}${d.url}`;
-      this.httpLogger.log("GET out {}", fileUrl)();
-      const xobj = new XMLHttpRequest();
-      // Special for IE
-      if (xobj.overrideMimeType) {
-        xobj.overrideMimeType("application/json");
-      }
-      xobj.open("GET", fileUrl, true); // Replace 'my_data' with the path to your file
-      if (!d.skipAuth) {
-        xobj.setRequestHeader("session_id", this.sessionHolder.session!);
-      }
-      xobj.onreadystatechange = this.getOnreadystatechange(
-        xobj,
-        d.isJsonDecoded || false,
-        d.checkOkString || false,
-        fileUrl,
-        undefined,
-        reject,
-        resolve,
-      );
-      xobj.send(null);
-    });
-  }
-
-  public async doPost<T>(d: PostData): Promise<T> {
-    return new Promise<T>((resolve, reject) => {
-      const r: XMLHttpRequest = new XMLHttpRequest();
-      r.onreadystatechange = this.getOnreadystatechange<T>(
-        r,
-        d.isJsonDecoded || false,
-        d.checkOkString || false,
-        d.url,
-        d.errorDescription,
-        reject,
-        resolve,
-      );
-
-      const url = `${XHR_API_URL}${d.url}`;
-      r.open("POST", url, true);
-      let data;
-      let logOut: string = "";
-      if (d.isJsonEncoded) {
-        data = JSON.stringify(d.params);
-        r.setRequestHeader("Content-Type", "application/json");
-      } else {
-        /* Firefox doesn't accept null*/
-        data = d.formData ? d.formData : new FormData();
-
-        if (d.params) {
-          for (const key in d.params) {
-            data.append(key, <Blob | string>d.params[key]); // TODO null putting?
-          }
-        }
-        if (data.entries) {
-          const entries = data.entries();
-          if (entries && entries.next) {
-            let d;
-            while (d = entries.next()) {
-              if (d.done) {
-                break;
-              }
-              // @ts-expect-error: next-line
-              logOut += `${d.value[0]}= ${d.value[1]};`;
-            }
-          }
-        }
-      }
-      r.setRequestHeader("session_id", this.sessionHolder.session!);
-
-      this.httpLogger.log("POST out {} ::: {} ::: {}", url, d.params, logOut)();
-      if (d.process) {
-        d.process(r);
-      }
-      r.send(data);
-
-      return r;
-    });
-  }
-
-  private getOnreadystatechange<T>(
-    r: XMLHttpRequest,
-    isJsonDecoded: boolean,
-    checkOkString: boolean,
-    url: string,
-    errorDescription: string | undefined,
-    reject: (error: string) => void,
-    resolve: (data: T) => void,
-  ): () => void {
-    return () => {
-      if (r.readyState === 4) {
-        if (r.status === 200) {
-          this.httpLogger.log("{} in {} ::: {};", "GET", url, r.response)();
-        } else {
-          this.httpLogger.error("{} out: {} ::: {}, status: {}", "GET", url, r.response, r.status)();
-        }
-
-        let error: string | null = null;
-        let data: T | null = null;
-        if (r.status === 0) {
-          error = CONNECTION_ERROR;
-        } else if (r.status === 200) {
-          if (isJsonDecoded) {
-            try {
-              data = JSON.parse(r.response);
-            } catch (e) {
-              error = `Unable to parse response ${e}`;
-            }
-          } else {
-            data = r.response;
-          }
-        } else if (r.status >= 400 && r.status < 500 && r.response) {
-          error = r.responseText;
-        } else if (r.status === 404) {
-          error = "Resource not found";
-        } else if (r.status === 500) {
-          error = "Server error";
-        } else {
-          error = "Unknown server error";
-        }
-        if (checkOkString && !error && r.response !== RESPONSE_SUCCESS) {
-          error = r.response || "Invalid response";
-        }
-        if (errorDescription && error) {
-          error = errorDescription + error;
-        }
-        if (error) {
-          reject(error);
-        } else {
-          resolve(<T>data); // If else data, could not be null there
-        }
-      }
-    };
-  }
-}
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 120df7bee..76133166e 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -11,7 +11,6 @@ import ResetPassword from "@/vue/singup/ResetPassword.vue";
 import Login from "@/vue/singup/Login.vue";
 import SignUp from "@/vue/singup/SignUp.vue";
 import UserProfile from "@/vue/pages/UserProfile.vue";
-import ReportIssue from "@/vue/pages/ReportIssue.vue";
 import UserProfileChangePassword from "@/vue/pages/UserProfileChangePassword.vue";
 import UserProfileImage from "@/vue/pages/UserProfileImage.vue";
 import UserProfileInfo from "@/vue/pages/UserProfileInfo.vue";
@@ -151,10 +150,6 @@ export function routerFactory(sub: Subscription) {
             component: CreatePrivateRoom,
             path: "/create-private-room",
           },
-          {
-            component: ReportIssue,
-            path: "/report-issue",
-          },
         ],
       }, {
         path: "/auth",
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index 7c2ea0502..f2e3c9af5 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -17,7 +17,6 @@ import loggerFactory from "@/ts/instances/loggerFactory";
 import sessionHolder from "@/ts/instances/sessionInstance";
 import type {App as VueApp} from "@vue/runtime-core";
 import type {PlatformUtil} from "@/ts/types/model";
-import Xhr from "@/ts/classes/Xhr";
 import "@/assets/icon.png"; // eslint-disable-line import/no-unassigned-import
 import WsHandler from "@/ts/message_handlers/WsHandler";
 import WsMessageHandler from "@/ts/message_handlers/WsMessageHandler";
@@ -43,6 +42,7 @@ import {
 } from "@/ts/utils/directives";
 import Subscription from "@/ts/classes/Subscription";
 import type {Router} from "vue-router";
+import Fetch from '@/ts/classes/Fetch';
 
 
 const logger: Logger = loggerFactory.getLoggerColor("main", "#007a70");
@@ -80,9 +80,6 @@ function bootstrapVue(
      no-underscore-dangle
      */
     const message = `Error occurred in ${vm?.$options?.__file}:${err}:\n${info}`;
-    if (store?.userSettings?.sendLogs && api) {
-      void api.sendLogs(`${vm?.$options?.__file}:${err}:${info}`, browserVersion, constants.GIT_HASH);
-    }
     /* eslint-enable
      @typescript-eslint/restrict-template-expressions,
      @typescript-eslint/restrict-template-expressions,
@@ -116,7 +113,7 @@ function init(): void {
   });
 
   const sub = new Subscription();
-  const xhr: Http = /* Window.fetch ? new Fetch(XHR_API_URL, sessionHolder) :*/ new Xhr(sessionHolder);
+  const xhr: Http = new Fetch(sessionHolder);
   const api: Api = new Api(xhr, sub);
 
   let storage;
@@ -146,19 +143,11 @@ function init(): void {
 
   window.onerror = function onerror(msg, url, linenumber, column, errorObj): boolean {
     const message = `Error occurred in ${url!}:${linenumber!}\n${JSON.stringify(msg)}`;
-    if (store?.userSettings?.sendLogs && api) {
-      void api.sendLogs(
-        `${url!}:${linenumber!}:${column ?? "?"}\n${JSON.stringify(msg)}\n\nOBJ:  ${JSON.stringify(errorObj) ?? "?"}`,
-        browserVersion,
-        constants.GIT_HASH,
-      );
-    }
     void store.growlError(message);
 
     return false;
   };
 
-
   window.GIT_VERSION = constants.GIT_HASH;
   if (constants.IS_DEBUG) {
     window.vue = vue;
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 29e36ac60..584b65296 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -23,7 +23,8 @@ import type {
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
-import {LoginRequest} from '@/ts/types/dto';
+import {SignInRequest} from '@/ts/types/dto';
+import {ValidateUserResponse} from '@/ts/types/backend/dto';
 
 export default class Api extends MessageHandler {
   protected readonly handlers: HandlerTypes<keyof Api, "*"> = {
@@ -43,27 +44,13 @@ export default class Api extends MessageHandler {
     this.xhr = xhr;
   }
 
-  public async login(body: LoginRequest): Promise<SessionResponse> {
+  public async login(body: SignInRequest): Promise<SessionResponse> {
     return this.xhr.doPost<SessionResponse>({
-      url: "/auth",
-      isJsonDecoded: true,
-      isJsonEncoded: true,
+      url: "/auth/sign-in",
       params: {...body}
     });
   }
 
-  public async sendLogs(issue: string, browser: string, version: string): Promise<void> {
-    const result: string = await this.xhr.doPost<string>({
-      url: "/report_issue",
-      params: {
-        issue,
-        browser,
-        version,
-      },
-      checkOkString: true,
-    });
-  }
-
   public async changePassword(old_password: string, password: string): Promise<void> {
     return this.xhr.doPost<void>({
       url: "/change_password",
@@ -71,7 +58,6 @@ export default class Api extends MessageHandler {
         old_password,
         password,
       },
-      checkOkString: true,
     });
   }
 
@@ -79,7 +65,6 @@ export default class Api extends MessageHandler {
     await this.xhr.doPost({
       url: "/logout",
       params: {registration_id},
-      errorDescription: "Error while logging out: ",
     });
   }
 
@@ -87,26 +72,13 @@ export default class Api extends MessageHandler {
     return this.xhr.doPost<void>({
       url: "/send_restore_password",
       formData: new FormData(form),
-      checkOkString: true,
     });
   }
 
-  public async register(form: HTMLFormElement): Promise<SessionResponse> {
+  public async register(data: SignInRequest): Promise<SessionResponse> {
     return this.xhr.doPost<SessionResponse>({
-      url: "/register",
-      isJsonDecoded: true,
-      formData: new FormData(form),
-    });
-  }
-
-  public async registerDict(password: string, username: string): Promise<SessionResponse> {
-    return this.xhr.doPost<SessionResponse>({
-      url: "/register",
-      isJsonDecoded: true,
-      params: {
-        username,
-        password,
-      },
+      url: "/auth/sign-up",
+      params: data as any,
     });
   }
 
@@ -118,20 +90,14 @@ export default class Api extends MessageHandler {
   ): Promise<MultiResponse> {
     let response!: MultiResponse;
     if ((/^\s*$/).exec(text)) {
-      response = await this.xhr.doGet<MultiResponse>({
-        isJsonDecoded: true,
-        skipAuth: true,
-        // https://developers.giphy.com/docs/api/endpoint#trending
-        url: `/gifs/trending?api_key=${GIPHY_API_KEY}&limit=${limit}&offset=${offset}`,
+      // https://developers.giphy.com/docs/api/endpoint#trending
+      response = await this.xhr.doGet<MultiResponse>(`/gifs/trending?api_key=${GIPHY_API_KEY}&limit=${limit}&offset=${offset}`, {
         baseUrl: GIPHY_URL,
         process,
       });
     } else {
-      response = await this.xhr.doGet<MultiResponse>({
-        isJsonDecoded: true,
-        skipAuth: true,
-        // https://developers.giphy.com/docs/api/endpoint#search
-        url: `/gifs/search?api_key=${GIPHY_API_KEY}&limit=12&q=${encodeURIComponent(text)}&offset=${offset}`,
+      // https://developers.giphy.com/docs/api/endpoint#search
+      response = await this.xhr.doGet<MultiResponse>(`/gifs/search?api_key=${GIPHY_API_KEY}&limit=12&q=${encodeURIComponent(text)}&offset=${offset}`, {
         baseUrl: GIPHY_URL,
         process,
       });
@@ -144,16 +110,12 @@ export default class Api extends MessageHandler {
   }
 
   public async getOauthStatus(): Promise<OauthStatus> {
-    return this.xhr.doGet<OauthStatus>({
-      url: "/oauth_status",
-      isJsonDecoded: true,
-    });
+    return this.xhr.doGet<OauthStatus>( "/oauth_status");
   }
 
   public async setGoogleOauth(token: string): Promise<void> {
     return this.xhr.doPost<void>({
       url: "/set_google_oauth",
-      checkOkString: true,
       params: {token},
     });
   }
@@ -161,15 +123,13 @@ export default class Api extends MessageHandler {
   public async setFacebookOauth(token: string): Promise<void> {
     return this.xhr.doPost<void>({
       url: "/set_facebook_oauth",
-      checkOkString: true,
       params: {token},
     });
   }
 
   public async googleAuth(token: string): Promise<OauthSessionResponse> {
     return this.xhr.doPost<OauthSessionResponse>({
-      url: "/google_auth",
-      isJsonDecoded: true,
+      url: "/auth/google-sign-in",
       params: {
         token,
       },
@@ -178,8 +138,7 @@ export default class Api extends MessageHandler {
 
   public async facebookAuth(token: string): Promise<OauthSessionResponse> {
     return this.xhr.doPost<OauthSessionResponse>({
-      url: "/facebook_auth",
-      isJsonDecoded: true,
+      url: "/api/facebook_sign_in",
       params: {
         token,
       },
@@ -194,8 +153,8 @@ export default class Api extends MessageHandler {
     await this.xhr.loadJs("https://connect.facebook.net/en_US/sdk.js");
   }
 
-  public async loadRecaptcha(): Promise<void> {
-    await this.xhr.loadJs("https://www.google.com/recaptcha/api.js");
+  public async loadRecaptcha(callbackId: string): Promise<void> {
+    await this.xhr.loadJs(`https://www.google.com/recaptcha/api.js?render=explicit&onload=${callbackId}`);
   }
 
   public async registerFCB(registration_id: string, agent: string, is_mobile: boolean): Promise<void> {
@@ -207,8 +166,6 @@ export default class Api extends MessageHandler {
           agent,
           is_mobile,
         },
-        isJsonEncoded: true,
-        checkOkString: true,
       });
       return;
     } catch (e) {
@@ -223,12 +180,11 @@ export default class Api extends MessageHandler {
     }
   }
 
-  public async validateUsername(username: string, process: (r: XMLHttpRequest) => void): Promise<void> {
+  public async validateUsername(username: string, onAbortController: (controller: AbortController) => void): Promise<ValidateUserResponse> {
     return this.xhr.doPost({
-      url: "/validate_user",
+      url: "/auth/validate-user",
       params: {username},
-      checkOkString: true,
-      process,
+      onAbortController,
     });
   }
 
@@ -239,27 +195,20 @@ export default class Api extends MessageHandler {
     return this.xhr.doPost<void>({
       url: "/upload_profile_image",
       formData: fd,
-      checkOkString: true,
     });
   }
 
   public async showProfile(id: number): Promise<ViewUserProfileDto> {
-    return this.xhr.doGet<ViewUserProfileDto>({
-      url: `/profile?id=${id}`,
-      isJsonDecoded: true,
-    });
+    return this.xhr.doGet<ViewUserProfileDto>(`/profile?id=${id}`);
   }
 
   public async changeEmail(token: string): Promise<string> {
-    return this.xhr.doGet<string>({
-      url: `/change_email?token=${token}`,
-    });
+    return this.xhr.doGet<string>(`/change_email?token=${token}`);
   }
 
   public async changeEmailLogin(email: string, password: string): Promise<void> {
     return this.xhr.doPost({
       url: "/change_email_login",
-      checkOkString: true,
       params: {
         email,
         password,
@@ -268,10 +217,7 @@ export default class Api extends MessageHandler {
   }
 
   public async confirmEmail(token: string): Promise<string> {
-    return this.xhr.doGet<string>({
-      url: `/confirm_email?token=${token}`,
-      checkOkString: true,
-    });
+    return this.xhr.doGet<string>(`/confirm_email?token=${token}`);
   }
 
   public async uploadFiles(files: UploadFile[], progress: (e: ProgressEvent) => void, setXhr: (e: XMLHttpRequest) => void): Promise<SaveFileResponse> {
@@ -282,7 +228,6 @@ export default class Api extends MessageHandler {
 
     return this.xhr.doPost<SaveFileResponse>({
       url: "/upload_file",
-      isJsonDecoded: true,
       formData: fd,
       process: (r) => {
         setXhr(r);
@@ -291,19 +236,17 @@ export default class Api extends MessageHandler {
     });
   }
 
-  public async validateEmail(email: string, process: (r: XMLHttpRequest) => void): Promise<void> {
+  public async validateEmail(email: string, onAbortController: (controller: AbortController) => void): Promise<void> {
     return this.xhr.doPost({
-      url: "/validate_email",
+      url: "/auth/validate-email",
       params: {email},
-      checkOkString: true,
-      process,
+      onAbortController,
     });
   }
 
   public async verifyToken(token: string): Promise<string> {
     const value: {message: string; restoreUser: string} = await this.xhr.doPost<{message: string; restoreUser: string}>({
       url: "/verify_token",
-      isJsonDecoded: true,
       params: {token},
     });
     if (value && value.message === RESPONSE_SUCCESS) {
@@ -319,7 +262,6 @@ export default class Api extends MessageHandler {
         token,
         password,
       },
-      checkOkString: true,
     });
   }
 
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index 23517d64e..0e758f9ea 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -9,7 +9,6 @@ import type {
   MessageStatus,
   RoomModel,
   RoomSettingsModel,
-  SexModelString,
   UserModel,
 } from "@/ts/types/model";
 import type {
@@ -19,7 +18,7 @@ import type {
   MessageModelDto,
   RoomDto,
   RoomNoUsersDto,
-  SexModelDto,
+  Gender,
   UserDto,
   UserProfileDtoWoImage,
   UserSettingsDto,
@@ -42,7 +41,7 @@ export function currentUserInfoModelToDto(userInfo: CurrentUserInfoModel): UserP
   return {...userInfo};
 }
 
-export function convertSex(dto: SexModelDto): SexModelString {
+export function convertSex(dto: Gender): Gender {
   return dto;
 }
 
@@ -58,17 +57,6 @@ export function convertLocation(dto: LocationDto | null): Location {
   return {...dto};
 }
 
-export function convertSexToNumber(m: SexModelString): number {
-  if (m === "Secret") {
-    return 0;
-  } else if (m === "Male") {
-    return 1;
-  } else if (m === "Female") {
-    return 2;
-  }
-  throw Error(`Unknown gender ${m}`);
-}
-
 export function getChannelDict(
   {
     channelName,
@@ -155,40 +143,10 @@ export function getRoomsBaseDict(
   };
 }
 
-export function convertNumberToSex(m: SexDB): SexModelString {
-  const newVar: Record<number, SexModelString> = {
-    0: "Secret",
-    1: "Male",
-    2: "Female",
-  };
-
-  return newVar[m];
-}
-
-export function convertSexToString(m: SexDB): SexModelString {
-  const newVar: Record<SexDB, SexModelString> = {
-    0: "Secret",
-    1: "Male",
-    2: "Female",
-  };
-
-  return newVar[m];
-}
-
 export function convertToBoolean(value: BooleanDB): boolean {
   return value === 1;
 }
 
-export function convertStringSexToNumber(m: SexModelString): SexDB {
-  const newVar: Record<SexModelString, SexDB> = {
-    Secret: 0,
-    Male: 1,
-    Female: 2,
-  };
-  return newVar[m];
-}
-
-
 export function messageModelToP2p(m: MessageModel): MessageP2pDto {
   return {
     content: m.content,
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index 3cc801a59..b9d2ff41e 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,5 +1,6 @@
 import type {LogLevel} from "lines-logger";
 import type {MessageStatus} from "@/ts/types/model";
+import {Gender} from '@/ts/types/backend/dto';
 
 export interface UserDB {
   id: number;
@@ -14,10 +15,7 @@ export interface UserDB {
   city: string;
 }
 
-export type SexDB =
-  0
-  | 1
-  | 2;
+export type SexDB = Gender;
 export type BooleanDB =
   0
   | 1;
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 92c2b0466..6f7f14b6a 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -5,24 +5,13 @@ import type {
   CurrentUserSettingsModel,
   MessageStatus,
   RoomDictModel,
-  SexModelString,
   UserModel,
 } from "@/ts/types/model";
 
 export * from './backend/dto';
 
-export interface SessionResponse {
-  session: string;
-}
-
-
 import type {LogLevel} from "lines-logger";
-
-export type SexModelDto =
-  "Female"
-  | "Male"
-  | "Secret";
-
+import {Gender} from '@/ts/types/backend/dto';
 
 export interface RoomNoUsersDto {
   channelId: number | null;
@@ -35,13 +24,6 @@ export interface RoomNoUsersDto {
   roomCreatorId: number;
 }
 
-
-
-export interface OauthSessionResponse extends SessionResponse {
-  isNewAccount: boolean;
-  username: string;
-}
-
 export interface RoomDto extends RoomNoUsersDto {
   users: number[];
 }
@@ -63,7 +45,7 @@ export interface UserDto {
   userId: number;
   userImage: string;
   lastTimeOnline: number;
-  sex: SexModelString;
+  sex: Gender;
 }
 
 export interface LocationDto {
@@ -108,7 +90,7 @@ export interface UserProfileDtoWoImage {
   email: string;
   birthday: string;
   contacts: string;
-  sex: SexModelDto;
+  sex: Gender;
   userId: number;
 }
 
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index 6f7dc210d..9c4d76bc8 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -24,6 +24,7 @@ declare global {
   interface Window {
     GIT_VERSION: string | undefined;
     vue: VueApp;
+    onloadrecaptcha: () => any;
     router: Router;
     api: Api;
     deferredPrompt: BeforeInstallPromptEvent;
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index b2dabbaac..3dff91623 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,4 +1,5 @@
 import type {LogLevel} from "lines-logger";
+import {Gender} from '@/ts/types/backend/dto';
 
 export enum GrowlType {
   SUCCESS = "col-success", INFO = "col-info", ERROR = "col-error",
@@ -37,7 +38,7 @@ export interface CurrentUserSettingsModel {
 }
 
 export interface GoogleCaptcha {
-  render(div: HTMLElement): void;
+  render(div: HTMLElement, options: any): void;
 
   reset(): void;
 }
@@ -63,18 +64,14 @@ export interface CurrentUserInfoWoImage {
   email: string;
   birthday: string;
   contacts: string;
-  sex: SexModelString;
+  sex: Gender;
 }
 
-export type SexModelString =
-  "Female"
-  | "Male"
-  | "Secret";
 
 export interface UserModel {
   user: string;
   id: number;
-  sex: SexModelString;
+  sex: Gender;
   image: string;
   lastTimeOnline: number;
   location: Location;
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index aa0da90d3..f5885a108 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -231,21 +231,12 @@ export interface PostData {
   url: string;
   params?: Record<string, Blob | boolean | number | string | null>;
   formData?: FormData;
-  isJsonEncoded?: boolean;
-  isJsonDecoded?: boolean;
-  checkOkString?: boolean;
-  errorDescription?: string;
-
+  onAbortController?: (controller: AbortController) => void;
   process?(R: XMLHttpRequest): void;
 }
 
 export interface GetData {
-  url: string;
-  isJsonDecoded?: boolean;
-  checkOkString?: boolean;
   baseUrl?: string;
-  skipAuth?: boolean;
-
   process?(R: XMLHttpRequest): void;
 }
 
diff --git a/frontend/src/vue/pages/ReportIssue.vue b/frontend/src/vue/pages/ReportIssue.vue
deleted file mode 100644
index ec13d55b3..000000000
--- a/frontend/src/vue/pages/ReportIssue.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <form
-    class="holder"
-    @submit.prevent="submit"
-  >
-    <table class="">
-      <tbody>
-        <tr>
-          <th><label for="reportIssueIssue">Git revision</label></th>
-          <td>
-            <input
-              :value="git"
-              class="input"
-              disabled
-              type="text"
-            />
-          </td>
-        </tr>
-        <tr>
-          <th><label for="reportIssueIssue">The problem you discovered:</label></th>
-          <td>
-            <textarea
-              id="reportIssueIssue"
-              ref="textarea"
-              v-model="issue"
-              class="input"
-              required
-              tabindex="-1"
-            />
-          </td>
-        </tr>
-        <tr>
-          <th><label for="reportIssueBrowserVersion">Affected browser:</label></th>
-          <td>
-            <input
-              id="reportIssueBrowserVersion"
-              v-model="browser"
-              class="input"
-              type="text"
-            />
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <app-submit
-      :running="running"
-      class="green-btn"
-      value="Submit Issue"
-    />
-  </form>
-</template>
-<script lang="ts">
-import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
-import AppSubmit from "@/vue/ui/AppSubmit.vue";
-import {GIT_HASH} from "@/ts/utils/consts";
-import {browserVersion} from "@/ts/utils/runtimeConsts";
-
-@Component({
-  name: "ReportIssue",
-  components: {AppSubmit},
-})
-export default class ReportIssue extends Vue {
-  public running: boolean = false;
-
-  public browser: string = browserVersion;
-
-  public issue: string = "";
-
-  public textAreaStyle: string = "";
-
-  @Ref()
-  private readonly textarea!: HTMLTextAreaElement;
-
-  public get git() {
-    return GIT_HASH;
-  }
-
-  @Watch("issue")
-  public fixStyle() {
-    const {textarea} = this;
-    textarea.style.height = "auto";
-    textarea.style.height = `${textarea.scrollHeight - 16}px`;
-  }
-
-  @ApplyGrowlErr({
-    runningProp: "running",
-    message: "Unable to submit issue",
-  })
-  public async submit() {
-    await this.$api.sendLogs(this.issue, this.browser, this.git);
-    this.$store.growlSuccess("Your issue has ben submitted");
-    this.$router.go(-1);
-  }
-}
-</script>
-
-<style lang="sass" scoped>
-@import "@/assets/sass/partials/abstract_classes"
-.holder
-  @extend %room-settings-holder
-  width: calc(100% - 100px)
-  max-width: 800px
-
-th
-  max-width: 160px
-
-th, td
-  padding: 4px
-
-th
-  text-align: right
-
-.input
-  @extend %big-input
-</style>
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index f6f660cb1..f370371d4 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -121,7 +121,6 @@ import {
   Vue,
 } from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
-import type {SexModelString} from "@/ts/types/model";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 import type {UserProfileDtoWoImage} from "@/ts/types/dto";
 
@@ -129,6 +128,7 @@ import {currentUserInfoModelToDto} from "@/ts/types/converters";
 import AppInputDate from "@/vue/ui/AppInputDate.vue";
 import type {SetUserProfileMessage} from "@/ts/types/messages/wsInMessages";
 import type {LogoutMessage} from "@/ts/types/messages/innerMessages";
+import {Gender} from '@/ts/types/backend/dto';
 
 @Component({
   name: "UserProfileInfo",
@@ -143,7 +143,7 @@ export default class UserProfileInfo extends Vue {
   @State
   public readonly userInfo!: CurrentUserInfoModel;
 
-  public sex: SexModelString[] = ["Male", "Female", "Secret"];
+  public sex: Gender[] = [Gender.MALE, Gender.FEMALE, Gender.OTHER];
 
   public model!: UserProfileDtoWoImage;
 
diff --git a/frontend/src/vue/singup/AuthPage.vue b/frontend/src/vue/singup/AuthPage.vue
index f4243a1f6..45eb3fe2e 100644
--- a/frontend/src/vue/singup/AuthPage.vue
+++ b/frontend/src/vue/singup/AuthPage.vue
@@ -38,7 +38,10 @@ export default class AuthPage extends Vue {
   @ApplyGrowlErr({message: "Auto-registration error"})
   public async created() {
     if (AUTO_REGISTRATION) {
-      const {session} = await this.$api.registerDict(this.getRandom(), this.getRandom());
+      const {session} = await this.$api.register({
+        username: this.getRandom(),
+        password: this.getRandom(),
+      });
       const message: LoginMessage = {
         action: "login",
         handler: "router",
diff --git a/frontend/src/vue/singup/CaptchaComponent.vue b/frontend/src/vue/singup/CaptchaComponent.vue
index 70fc7ab18..944452eff 100644
--- a/frontend/src/vue/singup/CaptchaComponent.vue
+++ b/frontend/src/vue/singup/CaptchaComponent.vue
@@ -7,7 +7,7 @@
           :src="ifIframeUrl"
         />
         <input
-          :value="value"
+          :value="token"
           name="g-recaptcha-response"
           type="hidden"
         />
@@ -16,9 +16,7 @@
       <div
         v-else
         ref="repactha"
-        :data-sitekey="captcha_key"
         class="g-recaptcha"
-        data-theme="dark"
       />
     </template>
   </div>
@@ -37,16 +35,20 @@ import {
   RECAPTCHA_PUBLIC_KEY,
 } from "@/ts/utils/consts";
 import type {GoogleCaptcha} from "@/ts/types/model";
+import {ref} from "vue";
+
+const captchaInited = ref(false)
 
-const captchaInited: boolean = false; // Don't init captcha again, if it was inited in another component
 let captchaId = 1; // Just random id to diff one comp fro another
 
+window.onloadrecaptcha = function () {
+  captchaInited.value = true;
+}
+
 @Component({name: "CaptchaComponent"})
 export default class CaptchaComponent extends Vue {
   public captcha_key: string = RECAPTCHA_PUBLIC_KEY || "";
 
-  public captchaInited: boolean = false; // If current component was initialized
-
   public resettingAllowed: boolean = false; // Prevent resetting on initial load
 
   public isIframe: boolean = window.location.protocol === "file:";
@@ -61,14 +63,16 @@ export default class CaptchaComponent extends Vue {
 
   public id = captchaId++;
 
-  @Prop() public value!: boolean;
+  @Prop() public loading!: boolean;
+
+  @Prop() public token!: string;
 
   public ifIframeUrl: string = CAPTCHA_IFRAME ? `${CAPTCHA_IFRAME}?site_key=${RECAPTCHA_PUBLIC_KEY}` : "";
 
   private event: ((E: MessageEvent) => void) | null = null;
 
   public get grecaptcha(): GoogleCaptcha {
-    if (window.grecaptcha) {
+    if (window.grecaptcha && (window.grecaptcha as any).reset) {
       return window.grecaptcha;
     }
     return {
@@ -79,7 +83,7 @@ export default class CaptchaComponent extends Vue {
     };
   }
 
-  @Watch("value")
+  @Watch("loading")
   public onValueChange(newValue: boolean, oldValue: boolean) {
     if (!newValue && newValue != oldValue) {
       if (this.resettingAllowed) {
@@ -87,7 +91,7 @@ export default class CaptchaComponent extends Vue {
           this.$logger.log("Resetting captcha")();
           this.iframe.contentWindow!.postMessage("reset-captcha", "*");
         } else {
-          this.grecaptcha.reset && this.grecaptcha.reset();
+          this.grecaptcha.reset();
         }
       }
       this.resettingAllowed = true;
@@ -95,9 +99,16 @@ export default class CaptchaComponent extends Vue {
     this.skipInitReset = false;
   }
 
+
+
   public renderCaptcha() {
-    this.$emit("input", false);
-    this.captchaInited = true;
+    this.$emit("update:loading", false);
+    this.grecaptcha.render(this.repactha, {
+      sitekey: this.captcha_key,
+      theme: 'dark',
+      callback: (response: string) => this.$emit("update:token", response),
+    })
+    captchaInited.value = true
   }
 
   public destroyed(): void {
@@ -108,6 +119,17 @@ export default class CaptchaComponent extends Vue {
     }
   }
 
+  get captchaInited() {
+    return captchaInited.value;
+  }
+
+  @Watch('captchaInited')
+  public async oncatpchaChange() {
+    if (captchaInited.value) {
+      this.renderCaptcha();
+    }
+  }
+
   public async created() {
     this.$logger.debug("initing captcha with key {}", RECAPTCHA_PUBLIC_KEY)();
     if (this.captcha_key) {
@@ -116,17 +138,17 @@ export default class CaptchaComponent extends Vue {
         this.event = (event: MessageEvent) => {
           this.$logger.log("On message {}", event)();
           if (event.data && event.data["g-recaptcha-response"]) {
-            this.captchaInited = true;
-            this.value = event.data["g-recaptcha-response"]; // TODO emitting prop
+            captchaInited.value = true;
+            this.$emit("update:loading", true);
+            this.$emit("update:token", event.data["g-recaptcha-response"]);
           }
         };
         window.addEventListener("message", this.event, false);
-      } else if (captchaInited) {
+      } else if (captchaInited.value) {
         this.renderCaptcha();
       } else {
-        this.$emit("input", true);
-        await this.$api.loadRecaptcha();
-        this.renderCaptcha();
+        this.$emit("update:loading", true);
+        await this.$api.loadRecaptcha('onloadrecaptcha');
       }
     }
   }
diff --git a/frontend/src/vue/singup/Login.vue b/frontend/src/vue/singup/Login.vue
index 952b40679..cf0f99baa 100644
--- a/frontend/src/vue/singup/Login.vue
+++ b/frontend/src/vue/singup/Login.vue
@@ -36,7 +36,7 @@
     </router-link>
     <div>
       <social-auth-sign-up/>
-      <captcha-component v-model="running"/>
+      <captcha-component v-model:loading="running" v-model:token="captcha"/>
       <app-submit
         :running="running"
         class="submit-button"
@@ -73,6 +73,7 @@ export default class Login extends Vue {
 
   public username: string = '';
   public password: string = '';
+  public captcha: string = '';
   public running: boolean = false;
 
   public created() {
@@ -84,10 +85,21 @@ export default class Login extends Vue {
     message: "Can't log in",
   })
   public async login() {
-    const {session} = await this.$api.login({
-      username: this.username,
-      password: this.password,
-    });
+    let response;
+    if (this.username?.includes('@')) {
+      response = await this.$api.login({
+        email: this.username,
+        password: this.password,
+      });
+    } else {
+      response = await this.$api.login({
+        username: this.username,
+        password: this.password,
+        captcha: this.captcha,
+      });
+    }
+    const {session} = response;
+
     const message: LoginMessage = {
       action: "login",
       handler: "router",
diff --git a/frontend/src/vue/singup/SignUp.vue b/frontend/src/vue/singup/SignUp.vue
index e770dfc71..a0d3eea62 100644
--- a/frontend/src/vue/singup/SignUp.vue
+++ b/frontend/src/vue/singup/SignUp.vue
@@ -1,7 +1,5 @@
 <template>
   <form
-    id="register-form"
-    ref="form"
     method="post"
     @submit.prevent="register"
   >
@@ -132,10 +130,10 @@ import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import RegisterFieldSet from "@/vue/singup/RegisterFieldSet.vue";
 import debounce from "lodash.debounce";
 import {IconColor} from "@/ts/types/types";
-import {SexModelString} from "@/ts/types/model";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import SocialAuthSignUp from "@/vue/singup/SocialAuthSignUp.vue";
 import {USERNAME_REGEX} from "@/ts/utils/consts";
+import {Gender} from '@/ts/types/backend/dto';
 
 @Component({
   name: "SignUp",
@@ -151,9 +149,6 @@ export default class SignUp extends Vue {
 
   running: boolean = false;
 
-  @Ref()
-  private form!: HTMLFormElement;
-
   created() {
     this.$store.setRegHeader("Create new account");
     this.debouncedValidateUserName = debounce(this.checkUserName, 500);
@@ -180,7 +175,7 @@ export default class SignUp extends Vue {
   debouncedValidateUserName!: Function;
 
 
-  private currentValidateUsernameRequest: XMLHttpRequest | null = null;
+  private currentValidateUsernameRequest: AbortController | null = null;
 
   async checkUserName(username: string) {
     if (this.currentValidateUsernameRequest) {
@@ -188,7 +183,7 @@ export default class SignUp extends Vue {
       this.currentValidateUsernameRequest = null;
     }
     try {
-      await this.$api.validateUsername(username, (r) => this.currentValidateUsernameRequest = r);
+      await this.$api.validateUsername(username, (r: AbortController) => this.currentValidateUsernameRequest = r);
       this.userCheckValue = IconColor.SUCCESS;
       this.userDescription = "Username is ok!";
       this.usernameValidity = "";
@@ -282,7 +277,7 @@ export default class SignUp extends Vue {
 
   debouncedValidateEmail!: Function;
 
-  private currentValidateEmailRequest: XMLHttpRequest | null = null;
+  private currentValidateEmailRequest: AbortController | null = null;
 
   async checkEmail(username: string) {
     if (this.currentValidateEmailRequest) {
@@ -290,7 +285,7 @@ export default class SignUp extends Vue {
       this.currentValidateEmailRequest = null;
     }
     try {
-      await this.$api.validateEmail(username, (r) => this.currentValidateEmailRequest = r);
+      await this.$api.validateEmail(username, (r:AbortController) => this.currentValidateEmailRequest = r);
       this.emailCheckValue = IconColor.SUCCESS;
       this.emailDescription = "Email is ok!";
       this.emailValidity = "";
@@ -339,8 +334,8 @@ export default class SignUp extends Vue {
   sexCheckValue: IconColor = IconColor.NOT_SET;
 
   @Watch("sex")
-  onSexChange(gender: SexModelString) {
-    if (gender == "Secret") {
+  onSexChange(gender: Gender) {
+    if (gender == Gender.OTHER) {
       this.sexDescription = "Need a help?";
       this.sexCheckValue = IconColor.WARN;
     } else {
@@ -349,13 +344,20 @@ export default class SignUp extends Vue {
     }
   }
 
-  @ApplyGrowlErr({runningProp: "running",
-    message: "Can't sign up"})
+  @ApplyGrowlErr({
+    runningProp: "running",
+    message: "Can't sign up"
+  })
   async register() {
-    const {session} = await this.$api.register(this.form);
-    const message: LoginMessage = {action: "login",
-                                   handler: "router",
-                                   session};
+    const {session} = await this.$api.register({
+      username: this.username,
+      password: this.password,
+    });
+    const message: LoginMessage = {
+      action: "login",
+      handler: "router",
+      session
+    };
     this.$messageBus.notify(message);
   }
 }
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 2aeb06244..ca787ceb4 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -361,6 +361,16 @@
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
+"@vue/compiler-core@3.2.32":
+  version "3.2.32"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.32.tgz#a0be08214c55ae48092b413d8b552c0573e3a883"
+  integrity sha512-bRQ8Rkpm/aYFElDWtKkTPHeLnX5pEkNxhPUcqu5crEJIilZH0yeFu/qUAcV4VfSE2AudNPkQSOwMZofhnuutmA==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/shared" "3.2.32"
+    estree-walker "^2.0.2"
+    source-map "^0.6.1"
+
 "@vue/compiler-dom@3.2.31", "@vue/compiler-dom@^3.2.27":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz#b1b7dfad55c96c8cc2b919cd7eb5fd7e4ddbf00e"
@@ -369,6 +379,14 @@
     "@vue/compiler-core" "3.2.31"
     "@vue/shared" "3.2.31"
 
+"@vue/compiler-dom@^3.2.31":
+  version "3.2.32"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.32.tgz#8ddae1ee463c18c5c3353c4716ec7c84ee29e5ad"
+  integrity sha512-maa3PNB/NxR17h2hDQfcmS02o1f9r9QIpN1y6fe8tWPrS1E4+q8MqrvDDQNhYVPd84rc3ybtyumrgm9D5Rf/kg==
+  dependencies:
+    "@vue/compiler-core" "3.2.32"
+    "@vue/shared" "3.2.32"
+
 "@vue/compiler-sfc@3.2.31", "@vue/compiler-sfc@^3.2.27":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz#d02b29c3fe34d599a52c5ae1c6937b4d69f11c2f"
@@ -455,6 +473,11 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.31.tgz#c90de7126d833dcd3a4c7534d534be2fb41faa4e"
   integrity sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==
 
+"@vue/shared@3.2.32":
+  version "3.2.32"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.32.tgz#1ca0c3b8c03a5e24129156e171df736b2c1d645f"
+  integrity sha512-bjcixPErUsAnTQRQX4Z5IQnICYjIfNCyCl8p29v1M6kfVzvwOICPw+dz48nNuWlTOOx2RHhzHdazJibE8GSnsw==
+
 "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -620,6 +643,14 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.1, chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -629,14 +660,6 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.1, chalk@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 character-parser@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
@@ -2002,6 +2025,13 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
+magic-string@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.1.tgz#ba9b651354fa9512474199acecf9c6dbe93f97fd"
+  integrity sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
 matcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
@@ -2612,7 +2642,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.6.1:
+shell-quote@^1.6.1, shell-quote@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
   integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
@@ -3005,6 +3035,16 @@ vite-plugin-compression@^0.5.1:
     fs-extra "^10.0.1"
     picocolors "^1.0.0"
 
+vite-plugin-vue-inspector@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/vite-plugin-vue-inspector/-/vite-plugin-vue-inspector-0.3.0.tgz#a1f2fb5d625f8d8fe4e4c5f7c5193c4d4b47caba"
+  integrity sha512-xyFMPZU8NOU4YYpGyruMGN3KX5pM8nXBdpIpQVMvfO6pgiqgdEzH6TJRQGZH7N85IWWCY/lR4QAZoAQNVIcUDg==
+  dependencies:
+    "@vue/compiler-dom" "^3.2.31"
+    chalk "4.1.2"
+    magic-string "^0.26.1"
+    shell-quote "^1.7.3"
+
 vite@^2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.1.tgz#84bce95fae210a7beb566a0af06246748066b48f"
diff --git a/newback/config/Config.d.ts b/newback/config/Config.d.ts
index fb4b488e1..fa4fdcb49 100644
--- a/newback/config/Config.d.ts
+++ b/newback/config/Config.d.ts
@@ -1,10 +1,12 @@
 /* tslint:disable */
 /* eslint-disable */
-declare module "node-config-ts" {
+declare module "node-ts-config" {
   interface IConfig {
     name: string
     application: Application
     settings: Settings
+    auth: Auth
+    recaptcha: Recaptcha
     email: Email
     redis: Redis
     frontend: Frontend
@@ -21,7 +23,6 @@ declare module "node-config-ts" {
   }
   interface Frontend {
     address: string
-    maxUserNameLength: number
     jsConsoleLogs: string
     maxMessageSize: number
     issueReportLink: string
@@ -39,17 +40,23 @@ declare module "node-config-ts" {
   interface Email {
     host: string
     port: number
-    secure: boolean
-    tls: Tls
-    auth: Auth
+    auth: Auth2
     from: string
   }
-  interface Auth {
+  interface Auth2 {
+    type: string
     user: string
     password: string
   }
-  interface Tls {
-    ciphers: string
+  interface Recaptcha {
+    publicKey: string
+    privateKey: string
+  }
+  interface Auth {
+    google: Google
+  }
+  interface Google {
+    clientId: string
   }
   interface Settings {
     wsIdCharLength: number
diff --git a/newback/config/default.json b/newback/config/default.json
index 77bad58d7..9a115d690 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -2,7 +2,7 @@
   "name": "pychat",
   "application": {
     "env": "default",
-    "port": 8889,
+    "port": 8888,
     "logLevel": "debug",
     "logOutput": "text",
     "crtPath": "../frontend/build/certs/server.crt.pem",
@@ -19,6 +19,15 @@
     "pingInterval": 300000,
     "clientNoServerPingCloseTimeout": 320000
   },
+  "auth": {
+    "google": {
+      "clientId": "620421656154-8boctt2h7h5meskhe7vh8aiargj0nae9.apps.googleusercontent.com"
+    }
+  },
+  "recaptcha": {
+    "publicKey": "6LchGhwTAAAAAJwCRgfNKraWrFtCdKPFo0Ri8DLt",
+    "privateKey": "6LchGhwTAAAAAIH_RuxyeJQn5Kv6XnHcLSc_68h_"
+  },
   "email": {
     "host": "smtp.gmail.com",
     "port": 587,
@@ -36,7 +45,6 @@
   },
   "frontend": {
     "address": "https://localhost:8080",
-    "maxUserNameLength": 16,
     "jsConsoleLogs": "debug",
     "maxMessageSize": 100000,
     "issueReportLink": "https://github.com/akoidan/pychat/issues/new",
diff --git a/newback/config/env/local.json b/newback/config/env/local.json
new file mode 100644
index 000000000..f6ea0830a
--- /dev/null
+++ b/newback/config/env/local.json
@@ -0,0 +1,7 @@
+{
+  "auth": {
+    "google": {
+      "clientId": "620421656154-8boctt2h7h5meskhe7vh8aiargj0nae9.apps.googleusercontent.com"
+    }
+  }
+}
diff --git a/newback/config/env/test.json b/newback/config/env/test.json
new file mode 100644
index 000000000..38174961f
--- /dev/null
+++ b/newback/config/env/test.json
@@ -0,0 +1,3 @@
+{
+  "recaptcha": null
+}
diff --git a/newback/package.json b/newback/package.json
index 199ff3714..ccba4be56 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/akoidan/pychat",
   "license": "MIT",
   "scripts": {
-    "generate-configs": "node node_modules/node-config-ts/bin/cli",
+    "generate-configs": "node-ts-config",
     "migrate": "ts-node  -r tsconfig-paths/register ./src/migration.runner.ts ",
     "build": "nest build",
     "start": "nest start",
@@ -21,16 +21,18 @@
     "@nestjs/sequelize": "^8.0.0",
     "@nestjs/swagger": "^5.2.1",
     "@types/bcrypt": "^5.0.0",
+    "@types/node-fetch": "^2.6.1",
     "@types/nodemailer": "^6.4.4",
     "@types/supertest": "^2.0.12",
     "bcrypt": "^5.0.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
+    "google-auth-library": "^7.14.1",
     "ioredis": "^5.0.4",
     "lines-logger": "^2.1.2",
     "mysql2": "^2.3.3",
-    "node-config-ts": "npm:node-config-ts-2",
     "node-db-migration": "^1.4.0",
+    "node-ts-config": "^1.0.4",
     "nodemailer": "^6.7.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7",
diff --git a/newback/src/data/database/model/user.model.ts b/newback/src/data/database/model/user.model.ts
index 64f522a9b..c22d5ddc6 100644
--- a/newback/src/data/database/model/user.model.ts
+++ b/newback/src/data/database/model/user.model.ts
@@ -7,9 +7,8 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {Gender} from '@/data/types/dto/dto';
-import {config} from 'node-config-ts';
-import {UserSettingsModel} from '@/data/database/model/user.settings.model';
 import {UserAuthModel} from '@/data/database/model/user.auth.model';
+import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
 
 
 @Injectable()
@@ -31,7 +30,7 @@ export class UserModel extends Model<UserModel> {
   @Column({
     allowNull: false,
     unique: true,
-    type: DataType.STRING(config.frontend.maxUserNameLength),
+    type: DataType.STRING(MAX_USERNAME_LENGTH),
   })
   public username: string;
 
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/data/database/ormconfig.ts
index 4f65066d2..926977471 100644
--- a/newback/src/data/database/ormconfig.ts
+++ b/newback/src/data/database/ormconfig.ts
@@ -1,5 +1,5 @@
 import type {SequelizeModuleOptions} from '@nestjs/sequelize';
-import {config} from 'node-config-ts';
+import {config} from 'node-ts-config';
 
 
 export function generateConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, 'ssl'> {
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/data/database/repository/user.repository.ts
index d23a62a65..4259594a6 100644
--- a/newback/src/data/database/repository/user.repository.ts
+++ b/newback/src/data/database/repository/user.repository.ts
@@ -45,6 +45,16 @@ export class UserRepository {
     return userModel.id;
   }
 
+  public async getUserMyAuthGoogle(googleId: string, transaction: Transaction): Promise<UserAuthModel> {
+    return this.userAuthModel.findOne({
+      where: {
+        googleId
+      },
+      include: 'user',
+      transaction
+    })
+  }
+
   public async checkUserExistByUserName(username: string, transaction?: Transaction): Promise<boolean> {
     return await this.userModel.findOne({
       where: {username},
diff --git a/newback/src/data/utils/consts.ts b/newback/src/data/utils/consts.ts
index 142842582..229996fc6 100644
--- a/newback/src/data/utils/consts.ts
+++ b/newback/src/data/utils/consts.ts
@@ -1,2 +1,3 @@
 export const ALL_ROOM_ID = 1;
 export const REDIS_SESSIONS_KEY = 'sessions';
+export const MAX_USERNAME_LENGTH = 16;
diff --git a/newback/src/fixtures/google.response.fixture.json b/newback/src/fixtures/google.response.fixture.json
new file mode 100644
index 000000000..fceb72462
--- /dev/null
+++ b/newback/src/fixtures/google.response.fixture.json
@@ -0,0 +1,17 @@
+{
+  "iss": "accounts.google.com",
+  "azp": "620421656154-xxxxxxxxxxxx.apps.googleusercontent.com",
+  "aud": "620421656154-8xxxxxxxxxxxx.apps.googleusercontent.com",
+  "sub": "22222222222222222",
+  "email": "death@gmail.com",
+  "email_verified": true,
+  "at_hash": "xxxxxxxxxxxx",
+  "name": "Andrew Superman",
+  "picture": "https://lh3.googleusercontent.com/a-/xxxxxxxxxxxx-xxxxxxxxxxxx",
+  "given_name": "Andrew",
+  "family_name": "Superman",
+  "locale": "en",
+  "iat": 1649783923,
+  "exp": 1649787523,
+  "jti": "xxxxxxxxxxxx"
+}
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 1dd3f24d4..1cf017348 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -1,16 +1,31 @@
 import {NestFactory} from '@nestjs/core';
 import {AppModule} from '@/modules/app/app.module';
-import {config} from 'node-config-ts';
+import {config} from 'node-ts-config';
 import {
   ConsoleLogger,
   Logger,
   ValidationPipe
 } from '@nestjs/common';
+import {readFile} from 'fs';
+import {promisify} from 'util';
 
 async function bootstrap() {
+  const key  = await promisify(readFile)(config.application.keyPath, 'utf-8');
+  const cert =await promisify(readFile)(config.application.crtPath, 'utf-8');
+
   const app = await NestFactory.create(AppModule, {
     logger: new ConsoleLogger(),
+    cors: {
+      allowedHeaders: ["x-requested-with", "session_id", "Content-Type"],
+      methods: ["POST", "GET", "OPTIONS"],
+      origin: "*"
+    },
+    httpsOptions: {
+       key,
+       cert
+    }
   });
+
   app.useGlobalPipes(new ValidationPipe());
   app.useLogger(app.get(Logger))
   await app.listen(config.application.port);
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
new file mode 100644
index 000000000..9342deb8d
--- /dev/null
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -0,0 +1,67 @@
+import {
+  Body,
+  Controller,
+  HttpCode,
+  Ip,
+  Logger,
+  Post,
+  UseGuards
+} from '@nestjs/common';
+import {AuthService} from '@/modules/api/auth/auth.service';
+import {LoginRequestValidator} from '@/modules/api/auth/validators/login.request.validator';
+import {SignUpRequestValidator} from '@/modules/api/auth/validators/sign.up.request.validator';
+import {ValidateUserRequestValidator} from '@/modules/api/auth/validators/validate.user.request.validator';
+import {
+  GoogleSignInResponse,
+  SignInResponse,
+  SignUpResponse,
+  ValidateUserEmailRequest,
+  ValidateUserResponse
+} from '@/data/types/dto/dto';
+import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.auth.reques.validator';
+import {CaptchaGuard} from '@/modules/captcha';
+import {ValidateEmailRequestValidator} from '@/modules/api/auth/validators/validate.email.request.validator';
+
+@Controller({
+  path: '/api/auth'
+})
+export class AuthController {
+  constructor(
+    private readonly authservice: AuthService,
+    private readonly logger: Logger
+  ) {
+  }
+
+  @UseGuards(CaptchaGuard)
+  @Post('/sign-in')
+  public async auth(@Body() body: LoginRequestValidator): Promise<SignInResponse> {
+    return this.authservice.authorize(body);
+  }
+
+  @Post('/google-sign-in')
+  public async googleAuth(@Body() body: GoogleAuthRequestValidator): Promise<GoogleSignInResponse> {
+    return this.authservice.authorizeGoogle(body);
+  }
+
+  @Post('/sign-up')
+  public async register(@Body() body: SignUpRequestValidator, @Ip() ip): Promise<SignUpResponse> {
+    return this.authservice.registerUser(body, ip);
+  }
+
+  @Post('/validate-email')
+  public async validateEmail(@Body() body: ValidateEmailRequestValidator): Promise<ValidateUserResponse> {
+    await this.authservice.validateEmail(body.email);
+    return {
+      ok: true
+    }
+  }
+
+  @Post('/validate-user')
+  public async validateUser(@Body() body: ValidateUserRequestValidator): Promise<ValidateUserResponse> {
+    await this.authservice.validateUser(body.username);
+    return {
+      ok: true
+    }
+  }
+
+}
diff --git a/newback/src/modules/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
similarity index 61%
rename from newback/src/modules/auth/auth.module.spec.ts
rename to newback/src/modules/api/auth/auth.module.spec.ts
index 87634ec96..2608822f0 100644
--- a/newback/src/modules/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -5,10 +5,10 @@ import {
 } from '@nestjs/common';
 import * as supertest from 'supertest';
 import {Test} from '@nestjs/testing';
-import {AuthService} from '@/modules/auth/auth.service';
-import {AuthController} from '@/modules/auth/auth.controller';
+import {AuthService} from '@/modules/api/auth/auth.service';
+import {AuthController} from '@/modules/api/auth/auth.controller';
 import {LoggerModule} from '@/modules/logger/logger.module';
-import {PasswordService} from '@/modules/password/password.service';
+import {PasswordService} from '@/modules/api/auth/password.service';
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {RoomRepository} from '@/data/database/repository/room.repository';
 import {RedisService} from '@/data/redis/RedisService';
@@ -17,6 +17,16 @@ import {MailerService} from '@nestjs-modules/mailer';
 import {Sequelize} from 'sequelize-typescript';
 import {HtmlService} from '@/modules/html/html.service';
 import waitForExpect from "wait-for-expect";
+import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
+import {OAuth2Client} from 'google-auth-library';
+import {HttpService} from '@/modules/http/http.service';
+import fetch from 'node-fetch';
+import * as googleResponseFixture from '@/fixtures/google.response.fixture.json';
+import {ConfigService} from '@/modules/config/config.service';
+import {
+  config,
+  IConfig
+} from 'node-ts-config';
 
 describe('AuthModule', () => {
   let app: INestApplication;
@@ -26,15 +36,46 @@ describe('AuthModule', () => {
   let redisService: RedisService = {} as RedisService;
   let sequelize: Sequelize = {} as Sequelize;
   let mailerService: MailerService = {} as MailerService;
-
+  let oauth2Client: OAuth2Client = {} as OAuth2Client;
+  let nodeApply: (...args) => void = () => {
+  };
+  let configService: ConfigService = {} as ConfigService;
   beforeAll(async() => {
+    //required to compile Guards like CaptchaGuard
+    configService.getConfig = jest.fn().mockReturnValue(config)
     const moduleFixture = await Test.createTestingModule({
       imports: [
         LoggerModule,
       ],
       providers: [
-        {provide: MailerService, useValue: mailerService},
-        {provide: Sequelize, useValue: sequelize},
+        {
+          provide: ConfigService,
+          useValue: configService,
+        },
+        {
+          provide: MailerService,
+          useValue: mailerService
+        },
+        {
+          provide: Sequelize,
+          useValue: sequelize
+        },
+        {
+          provide: HttpService,
+          inject: [Logger],
+          useFactory: (logger) => new HttpService(logger, new Proxy(() => {
+          }, {
+            apply: function (target: {}, thisArg: any, argArray: any[]): any {
+              return nodeApply(...argArray)
+            }
+          }) as typeof fetch)
+        },
+        {
+          provide: GoogleAuthService,
+          inject: [Logger],
+          useFactory: (logger) => new GoogleAuthService(logger, oauth2Client)
+        },
+        PasswordService,
         AuthService,
         HtmlService,
         EmailSenderService,
@@ -54,17 +95,20 @@ describe('AuthModule', () => {
           provide: RoomRepository,
           useValue: roomRepository,
         },
-        Logger,
-        PasswordService,
       ],
       controllers: [AuthController]
-    }).compile();
+    })
+      .compile();
     app = moduleFixture.createNestApplication();
     app.useGlobalPipes(new ValidationPipe());
     await app.init();
     request = supertest(app.getHttpServer());
   });
 
+  beforeEach(() => {
+    configService.getConfig = jest.fn().mockReturnValue(config)
+  })
+
   afterEach(() => {
     jest.clearAllMocks();
     Object.keys(userRepository).forEach(key => delete userRepository[key]);
@@ -72,17 +116,22 @@ describe('AuthModule', () => {
     Object.keys(redisService).forEach(key => delete redisService[key]);
     Object.keys(sequelize).forEach(key => delete sequelize[key]);
     Object.keys(mailerService).forEach(key => delete mailerService[key]);
+    Object.keys(oauth2Client).forEach(key => delete oauth2Client[key]);
+    nodeApply = () => {
+    };
+    Object.keys(configService).forEach(key => delete configService[key]);
+
   });
 
   afterAll(async() => {
     await app.close()
   });
 
-  describe('auth', () => {
+  describe('sign-in', () => {
     it('should throw if user not exists', async() => {
       userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
       await request
-        .post('/auth').send({
+        .post('/api/auth/sign-in').send({
           username: 'a',
           password: 'as$'
         }).expect(409, {
@@ -91,6 +140,49 @@ describe('AuthModule', () => {
           statusCode: 409
         });
     });
+    it('should throw exception that captcha missing', async() => {
+      configService.getConfig = jest.fn().mockReturnValue({
+        recaptcha: {
+          publicKey: "a",
+          privateKey: "a",
+        }
+      } as IConfig)
+      const {body} = await request
+        .post('/api/auth/sign-in').send({
+          username: 'a',
+          password: 'as$'
+        }).expect(400, {
+          statusCode: 400,
+          message: 'Captcha is missing',
+          error: 'Bad Request'
+        });
+    })
+    it('should go throw captcha when its presnt', async() => {
+      let passwordService = app.get(PasswordService);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      let password = await passwordService.createPassword("koko");
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
+        userAuth: {
+          password: password
+        },
+        id: 3
+      })
+      configService.getConfig = jest.fn().mockReturnValue({
+        recaptcha: {
+          publicKey: "a",
+          privateKey: "a",
+        }
+      } as IConfig);
+      nodeApply = jest.fn().mockReturnValue({json: jest.fn().mockResolvedValue({success: true})});
+      const {body} = await request
+        .post('/api/auth/sign-in').send({
+          username: 'a',
+          password: 'koko',
+          captcha: 'asd'
+        });
+      expect(body).toMatchObject({session: expect.any(String)});
+    })
+
     it('should throw if password invalid', async() => {
       userRepository.getUserByUserName = jest.fn().mockResolvedValue({
         userAuth: {
@@ -99,7 +191,7 @@ describe('AuthModule', () => {
         id: 3
       })
       const {body} = await request
-        .post('/auth').send({
+        .post('/api/auth/sign-in').send({
           username: 'a',
           password: 'as$'
         }).expect(401, {
@@ -119,7 +211,7 @@ describe('AuthModule', () => {
         id: 3
       })
       const {body} = await request
-        .post('/auth').send({
+        .post('/api/auth/sign-in').send({
           username: 'a',
           password: 'koko'
         });
@@ -127,7 +219,32 @@ describe('AuthModule', () => {
     })
   });
 
-  describe('register', () => {
+  describe('google-sign-in', () => {
+    it('should login if user exists', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue({
+        id: 1,
+        user: {
+          username: 'as'
+        }
+      });
+      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture)
+      });
+      const {body} = await request
+        .post('/api/auth/google-sign-in').send({
+          token: 'aasdasd',
+        }).expect(201);
+      expect(body).toMatchObject({
+        session: expect.any(String),
+        isNewAccount: false,
+        username: 'as'
+      })
+    });
+  });
+
+  describe('sign-up', () => {
     it('returns session', async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
@@ -135,7 +252,7 @@ describe('AuthModule', () => {
       roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
       redisService.saveSession = jest.fn().mockResolvedValue(undefined)
       const {body} = await request
-        .post('/register').send({
+        .post('/api/auth/sign-up').send({
           username: 'a',
           password: 'as$'
         }).expect(201);
@@ -144,16 +261,16 @@ describe('AuthModule', () => {
     });
     it('sends an email', async() => {
       sequelize.transaction = (resolve) => resolve();
-      userRepository.createVerification =  jest.fn().mockResolvedValue(undefined);
+      userRepository.createVerification = jest.fn().mockResolvedValue(undefined);
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
       userRepository.createUser = jest.fn().mockResolvedValue(3);
       roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
       mailerService.sendMail = jest.fn();
-      let spy =  jest.spyOn(mailerService, 'sendMail').mockResolvedValue(true);
+      let spy = jest.spyOn(mailerService, 'sendMail').mockResolvedValue(true);
       redisService.saveSession = jest.fn().mockResolvedValue(undefined)
       const {body} = await request
-        .post('/register').send({
+        .post('/api/auth/sign-up').send({
           username: 'a',
           password: 'as$',
           email: 'death@gmail.com'
@@ -170,7 +287,7 @@ describe('AuthModule', () => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
       const {body} = await request
-        .post('/register').send({
+        .post('/api/auth/sign-up').send({
           username: 'a',
           password: 'as$'
         }).expect(409, {
@@ -184,7 +301,7 @@ describe('AuthModule', () => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
       const {body} = await request
-        .post('/register').send({
+        .post('/api/auth/sign-up').send({
           username: 'a',
           password: 'as$',
           email: 'death@gmail.com'
@@ -195,19 +312,19 @@ describe('AuthModule', () => {
         });
     });
   });
-  describe('validate_user', () => {
+  describe('validate-user', () => {
 
     it('should return ok', async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       await request
-        .post('/validate_user').send({
+        .post('/api/auth/validate-user').send({
           username: 'a',
-        }).expect(201, {});
+        }).expect(201, {ok: true});
     });
     it('should error if user exists', async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
       await request
-        .post('/validate_user').send({
+        .post('/api/auth/validate-user').send({
           username: 'a',
         }).expect(409, {
           "error": "Conflict",
@@ -217,7 +334,7 @@ describe('AuthModule', () => {
     });
     it('should give error on invalid character for username', async() => {
       await request
-        .post('/validate_user').send({
+        .post('/api/auth/validate-user').send({
           username: '%',
         }).expect(400, {
           "error": "Bad Request",
@@ -229,7 +346,7 @@ describe('AuthModule', () => {
     });
     it('should give error if username has great length', async() => {
       await request
-        .post('/validate_user').send({
+        .post('/api/auth/validate-user').send({
           username: '1234567890123456789',
         }).expect(400, {
           "error": "Bad Request",
@@ -242,7 +359,7 @@ describe('AuthModule', () => {
     it('should throw an error if user exists', async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
       await request
-        .post('/validate_user').send({
+        .post('/api/auth/validate-user').send({
           username: 'asd',
         }).expect(409, {
           "error": "Conflict",
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
new file mode 100644
index 000000000..a0eeeb681
--- /dev/null
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -0,0 +1,30 @@
+import {
+  Logger,
+  Module
+} from '@nestjs/common';
+import {AuthController} from '@/modules/api/auth/auth.controller';
+import {AuthService} from '@/modules/api/auth/auth.service';
+import {DatabaseModule} from '@/data/database/database.module';
+import {RedisService} from '@/data/redis/RedisService';
+import {EmailModule} from '@/modules/email.render/email.module';
+import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
+import {PasswordService} from '@/modules/api/auth/password.service';
+import {OAuth2Client} from 'google-auth-library';
+import {config} from 'node-ts-config';
+import {HttpModule} from '@/modules/http/http.module';
+
+@Module({
+  imports: [DatabaseModule, EmailModule, HttpModule],
+  controllers: [AuthController],
+  providers: [AuthService, PasswordService, RedisService, {
+    provide: GoogleAuthService,
+    useFactory: (logger) => {
+      return new GoogleAuthService(logger, new OAuth2Client(
+        config.auth.google.clientId,
+      ))
+    },
+    inject: [Logger]
+  }],
+})
+export class AuthModule {
+}
diff --git a/newback/src/modules/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
similarity index 75%
rename from newback/src/modules/auth/auth.service.ts
rename to newback/src/modules/api/auth/auth.service.ts
index 4e57089dd..480260e93 100644
--- a/newback/src/modules/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -5,9 +5,11 @@ import {
   UnauthorizedException
 } from '@nestjs/common';
 import {UserRepository} from '@/data/database/repository/user.repository';
-import {PasswordService} from '@/modules/password/password.service';
+import {PasswordService} from '@/modules/api/auth/password.service';
 import {
-  LoginRequest,
+  GoogleAuthRequest,
+  GoogleSignInResponse,
+  SignInRequest,
   SignInResponse,
   SignUpRequest,
   SignUpResponse
@@ -18,6 +20,8 @@ import {RedisService} from '@/data/redis/RedisService';
 import {EmailSenderService} from '@/modules/email.render/email.sender.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
+import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
+import {TokenPayload} from 'google-auth-library';
 
 @Injectable()
 export class AuthService {
@@ -28,12 +32,40 @@ export class AuthService {
     private readonly passwordService: PasswordService,
     private readonly redisService: RedisService,
     private readonly emailService: EmailSenderService,
+    private readonly googleAuthService: GoogleAuthService,
     private readonly sequelize: Sequelize,
     private readonly logger: Logger,
   ) {
   }
 
-  public async authorize(body: LoginRequest): Promise<SignInResponse> {
+  public async authorizeGoogle(body: GoogleAuthRequest): Promise<GoogleSignInResponse> {
+    let a: TokenPayload = await this.googleAuthService.validate(body.token);
+   return this.sequelize.transaction(async(t) => {
+    let userAuth = await this.userRepository.getUserMyAuthGoogle(a.email, t)
+    if (userAuth) {
+      let session = await this.createAndSaveSession(userAuth.id);
+      return {session, isNewAccount: false, username: userAuth.user.username};
+    } else {
+
+    }
+   });
+
+    // let googleId = a.email;
+    // 	response.get('given_name'),
+		// 	response.get('family_name'),
+		// 	email=response.get('email'),
+		// 	picture=response.get('picture'),
+		// 	google_id=response.get('id')
+
+    // username = re.sub('[^0-9a-zA-Z-_]+', '-', email.rsplit('@')[0])[:15]
+    // if email:
+		// 		username = re.sub('[^0-9a-zA-Z-_]+', '-', email.rsplit('@')[0])[:15]
+		// 	else:
+		// 		username = f'{name}_{surname}'
+    return undefined as any;
+  }
+
+  public async authorize(body: SignInRequest): Promise<SignInResponse> {
     let password, userId;
     if (body.email) {
       const result = await this.userRepository.getUserByEmail(body.email);
diff --git a/newback/src/modules/api/auth/google.auth.service.ts b/newback/src/modules/api/auth/google.auth.service.ts
new file mode 100644
index 000000000..7084f8d30
--- /dev/null
+++ b/newback/src/modules/api/auth/google.auth.service.ts
@@ -0,0 +1,47 @@
+import { OAuth2Client, TokenPayload } from 'google-auth-library';
+import {
+  ForbiddenException,
+  Injectable,
+  Logger,
+} from '@nestjs/common';
+
+@Injectable()
+export class GoogleAuthService {
+
+  public constructor(
+    private readonly logger: Logger,
+    private readonly oauth2Client: OAuth2Client,
+  ) {
+
+  }
+
+  /**
+   * {
+   *    "iss": "accounts.google.com",
+   *    "azp": "620421656154-xxxxxxxxxxxxxxx.apps.googleusercontent.com",
+   *    "aud": "620421656154-xxxxxxxxxxxxxxx.apps.googleusercontent.com",
+   *    "sub": "12313131312312",
+   *    "email": "deathangel908@gmail.com",
+   *    "email_verified": true,
+   *    "at_hash": "xxxxxxxxxxxxxxx",
+   *    "name": "Andrew Koidan",
+   *    "picture": "https://lh3.googleusercontent.com/a-/xxxxxxx",
+   *    "given_name": "Andrew",
+   *    "family_name": "Koidan",
+   *    "locale": "en",
+   *    "iat": 1649759247,
+   *    "exp": 1649759247,
+   *    "jti": "xxxxxxxxxxxxxxxxxxxxxxxxx"
+   * }
+   * */
+  public async validate(idToken: string): Promise<TokenPayload> {
+    const response = await this.oauth2Client.verifyIdToken({
+      idToken,
+    });
+    const payload = response.getPayload()!;
+    if (!payload) {
+      throw new ForbiddenException('Invalid google credentials')
+    }
+    return payload;
+  }
+}
diff --git a/newback/src/modules/password/password.service.ts b/newback/src/modules/api/auth/password.service.ts
similarity index 100%
rename from newback/src/modules/password/password.service.ts
rename to newback/src/modules/api/auth/password.service.ts
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
new file mode 100644
index 000000000..3bd5b8af5
--- /dev/null
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -0,0 +1,11 @@
+
+
+import {IsString,} from 'class-validator';
+import {GoogleAuthRequest} from '@/data/types/dto/dto';
+
+export class GoogleAuthRequestValidator implements GoogleAuthRequest {
+
+  @IsString()
+  public token: string;
+
+}
diff --git a/newback/src/modules/auth/validators/login.request.validator.ts b/newback/src/modules/api/auth/validators/login.request.validator.ts
similarity index 74%
rename from newback/src/modules/auth/validators/login.request.validator.ts
rename to newback/src/modules/api/auth/validators/login.request.validator.ts
index fd3dd7fa8..c1220b671 100644
--- a/newback/src/modules/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/login.request.validator.ts
@@ -4,16 +4,16 @@ import {
   Matches,
   ValidateIf,
 } from 'class-validator';
-import {LoginRequest} from '@/data/types/dto/dto';
+import {SignInRequest} from '@/data/types/dto/dto';
 
-export class LoginRequestValidator implements LoginRequest {
+export class LoginRequestValidator implements SignInRequest {
 
   @ValidateIf(o => !o.email || o.username)
   @IsString()
   @Matches(/^\S+$/, {
     message: `Username can't contain whitespaces`
   })
-  public username: string;
+  public username?: string;
 
   @ValidateIf(o => !o.username || o.email)
   @IsString()
@@ -21,7 +21,7 @@ export class LoginRequestValidator implements LoginRequest {
   @Matches(/^\S+$/, {
     message: `email can't contain whitespaces`
   })
-  public email: string;
+  public email?: string;
 
   @IsString()
   @Matches(/^\S+$/, {
diff --git a/newback/src/modules/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
similarity index 80%
rename from newback/src/modules/auth/validators/sign.up.request.validator.ts
rename to newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index af9969b8c..9ca5dc8aa 100644
--- a/newback/src/modules/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -11,13 +11,13 @@ import {
   Gender,
   SignUpRequest,
 } from '@/data/types/dto/dto';
-import {config} from 'node-config-ts';
+import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
 
 export class SignUpRequestValidator implements SignUpRequest {
 
   @IsString()
-  @Length(1, config.frontend.maxUserNameLength, {
-    message: `Username should be 1-${config.frontend.maxUserNameLength} characters`
+  @Length(1, MAX_USERNAME_LENGTH, {
+    message: `Username should be 1-${MAX_USERNAME_LENGTH} characters`
   })
   @Matches(/[a-zA-Z-_0-9]+/, {
     message: `Username can only contain latin characters, numbers and symbols '-' '_'`
diff --git a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
new file mode 100644
index 000000000..2370dc421
--- /dev/null
+++ b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
@@ -0,0 +1,11 @@
+import {
+  IsEmail,
+  IsString,
+} from 'class-validator';
+import {ValidateUserEmailRequest} from '@/data/types/dto/dto';
+
+export class ValidateEmailRequestValidator implements ValidateUserEmailRequest {
+  @IsString()
+  @IsEmail()
+  public email: string;
+}
diff --git a/newback/src/modules/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
similarity index 68%
rename from newback/src/modules/auth/validators/validate.user.request.validator.ts
rename to newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index 0da6a85ad..f79c7f63a 100644
--- a/newback/src/modules/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -4,12 +4,12 @@ import {
   Matches,
 } from 'class-validator';
 import {ValidateUserRequest} from '@/data/types/dto/dto';
-import {config} from 'node-config-ts';
+import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {
   @IsString()
-  @Length(1, config.frontend.maxUserNameLength, {
-    message: `Username should be 1-${config.frontend.maxUserNameLength} characters`
+  @Length(1, MAX_USERNAME_LENGTH, {
+    message: `Username should be 1-${MAX_USERNAME_LENGTH} characters`
   })
   @Matches(/[a-zA-Z-_0-9]+/, {
     message: `Username can only contain latin characters, numbers and symbols '-' '_'`
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index ddbc33db1..a71129830 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -1,14 +1,17 @@
 import {Module} from '@nestjs/common';
-import {AuthModule} from '@/modules/auth/auth.module';
-import {DatabaseModule} from '@/data/database/database.module';
+import {AuthModule} from '@/modules/api/auth/auth.module';
 import {LoggingInterceptor} from '@/modules/logger/interceptor';
-import {APP_INTERCEPTOR} from '@nestjs/core';
+import {
+  APP_INTERCEPTOR,
+  RouterModule
+} from '@nestjs/core';
 import {LoggerModule} from '@/modules/logger/logger.module';
 import {RedisModule} from '@nestjs-modules/ioredis';
-import {config} from 'node-config-ts';
+import {config} from 'node-ts-config';
+import {ConfigModule} from '@/modules/config/config.module';
 
 @Module({
-  imports: [AuthModule, LoggerModule, RedisModule.forRoot({
+  imports: [AuthModule, LoggerModule, ConfigModule, RedisModule.forRoot({
     config: {
       host: config.redis.host,
       port: config.redis.port,
diff --git a/newback/src/modules/auth/auth.controller.ts b/newback/src/modules/auth/auth.controller.ts
deleted file mode 100644
index bdd841713..000000000
--- a/newback/src/modules/auth/auth.controller.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
-  Body,
-  Controller,
-  HttpCode,
-  Ip,
-  Logger,
-  Post
-} from '@nestjs/common';
-import {AuthService} from '@/modules/auth/auth.service';
-import {LoginRequestValidator} from '@/modules/auth/validators/login.request.validator';
-import {SignUpRequestValidator} from '@/modules/auth/validators/sign.up.request.validator';
-import {ValidateUserRequestValidator} from '@/modules/auth/validators/validate.user.request.validator';
-import {
-  SignInResponse,
-  SignUpResponse
-} from '@/data/types/dto/dto';
-
-@Controller()
-export class AuthController {
-  constructor(
-    private readonly authservice: AuthService,
-    private readonly logger: Logger
-  ) {
-  }
-
-  @Post('/auth')
-  public async auth(@Body() body: LoginRequestValidator): Promise<SignInResponse> {
-    return this.authservice.authorize(body);
-  }
-
-  @Post('/register')
-  public async register(@Body() body: SignUpRequestValidator, @Ip() ip): Promise<SignUpResponse> {
-    return this.authservice.registerUser(body, ip);
-  }
-
-
-  @Post('/validate_user')
-  public async validateUser(@Body() body: ValidateUserRequestValidator): Promise<void> {
-    await this.authservice.validateUser(body.username);
-  }
-
-}
diff --git a/newback/src/modules/auth/auth.module.ts b/newback/src/modules/auth/auth.module.ts
deleted file mode 100644
index 2e9a7216e..000000000
--- a/newback/src/modules/auth/auth.module.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {Module} from '@nestjs/common';
-import {AuthController} from '@/modules/auth/auth.controller';
-import {AuthService} from '@/modules/auth/auth.service';
-import {DatabaseModule} from '@/data/database/database.module';
-import {PasswordService} from '@/modules/password/password.service';
-import {RedisService} from '@/data/redis/RedisService';
-import {EmailModule} from '@/modules/email.render/email.module';
-
-@Module({
-  imports: [DatabaseModule, EmailModule],
-  controllers: [AuthController],
-  providers: [AuthService, PasswordService, RedisService],
-})
-export class AuthModule {
-}
diff --git a/newback/src/modules/captcha/index.ts b/newback/src/modules/captcha/index.ts
new file mode 100644
index 000000000..c49331b81
--- /dev/null
+++ b/newback/src/modules/captcha/index.ts
@@ -0,0 +1,48 @@
+import {
+	Injectable,
+	CanActivate,
+	ExecutionContext,
+	BadRequestException,
+	Logger,
+	UnauthorizedException,
+
+} from '@nestjs/common';
+
+import {
+	Recaptcha
+} from 'node-ts-config';
+
+import {ConfigService} from '@/modules/config/config.service';
+import {HttpService} from '@/modules/http/http.service';
+@Injectable()
+export class CaptchaGuard implements CanActivate {
+  constructor(
+    private readonly logger: Logger,
+		private readonly httpService: HttpService,
+		private readonly configService: ConfigService,
+  ) {
+  }
+
+  public async canActivate(
+    context: ExecutionContext,
+  ): Promise<boolean> {
+    if (!this.configService.getConfig().recaptcha) {
+      return true;
+    }
+    let captcha = context.switchToHttp().getRequest()?.body?.captcha;
+    let ip = context.switchToHttp().getRequest()?.ip
+    if (!captcha) {
+      throw new BadRequestException("Captcha is missing");
+    }
+
+		let response = await this.httpService.postUrlEncoded("https://www.google.com/recaptcha/api/siteverify", {
+			secret: this.configService.getConfig().recaptcha.privateKey,
+			response: captcha,
+			remoteip: ip
+		});
+		if (!response.success) {
+			throw new UnauthorizedException(response && response['error-codes'] ? `Captcha error: ${response['error-codes'][0]}` : 'Unable to validate captcha');
+		}
+		return true;
+  }
+}
diff --git a/newback/src/modules/config/config.module.ts b/newback/src/modules/config/config.module.ts
new file mode 100644
index 000000000..d8e1f9aa7
--- /dev/null
+++ b/newback/src/modules/config/config.module.ts
@@ -0,0 +1,17 @@
+import {
+  Global,
+  Module
+} from '@nestjs/common';
+import {ConfigService} from '@/modules/config/config.service';
+import {config} from 'node-ts-config';
+
+@Global()
+@Module({
+  providers: [{
+    provide: ConfigService,
+    useFactory: () => new ConfigService(config)
+  }],
+  exports: [ConfigService]
+})
+export class ConfigModule {
+}
diff --git a/newback/src/modules/config/config.service.ts b/newback/src/modules/config/config.service.ts
new file mode 100644
index 000000000..dd41b2835
--- /dev/null
+++ b/newback/src/modules/config/config.service.ts
@@ -0,0 +1,14 @@
+import {Injectable} from '@nestjs/common';
+import type {IConfig} from 'node-ts-config';
+
+@Injectable()
+export class ConfigService {
+
+  constructor(private readonly config: IConfig) {
+  }
+
+  public getConfig(): IConfig {
+    return this.config;
+  }
+
+}
diff --git a/newback/src/modules/email.render/email.module.ts b/newback/src/modules/email.render/email.module.ts
index 14a9ed093..4c6c9d1ed 100644
--- a/newback/src/modules/email.render/email.module.ts
+++ b/newback/src/modules/email.render/email.module.ts
@@ -1,6 +1,6 @@
 import {Module} from '@nestjs/common';
 import {MailerModule} from '@nestjs-modules/mailer';
-import {config} from 'node-config-ts';
+import {config} from 'node-ts-config';
 import {EmailSenderService} from '@/modules/email.render/email.sender.service';
 import {HtmlService} from '@/modules/html/html.service';
 
@@ -8,7 +8,7 @@ import {HtmlService} from '@/modules/html/html.service';
 @Module({
   imports: [
     MailerModule.forRoot({
-      transport: config.email
+      transport: config.email as any
     })
   ],
   providers: [
diff --git a/newback/src/modules/email.render/email.sender.service.ts b/newback/src/modules/email.render/email.sender.service.ts
index bb399aa0a..6b8ea57b8 100644
--- a/newback/src/modules/email.render/email.sender.service.ts
+++ b/newback/src/modules/email.render/email.sender.service.ts
@@ -2,22 +2,27 @@ import {
 	Injectable,
 	Logger
 } from '@nestjs/common';
-import {config} from 'node-config-ts';
 import {HtmlService} from '@/modules/html/html.service';
 import {MailerService} from '@nestjs-modules/mailer';
+import {ConfigService} from '@/modules/config/config.service';
 
 @Injectable()
 export class EmailSenderService {
   public constructor(
     private readonly htmlService: HtmlService,
     private readonly loggerService: Logger,
-    private readonly mailerService: MailerService
+    private readonly mailerService: MailerService,
+    private readonly configService: ConfigService
   ) {
   }
 
   public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
-    const magicLink = `${config.frontend.address}/#/confirm_email?token=${token}`;
-    let issueReportLink = config.frontend.issueReportLink;
+    if (!this.configService.getConfig().email) {
+        this.loggerService.warn(`Email to userId ${userId} ${email} won't be sent since email settings is not set in config`);
+        return
+    }
+    const magicLink = `${this.configService.getConfig().frontend.address}/#/confirm_email?token=${token}`;
+    let issueReportLink = this.configService.getConfig().frontend.issueReportLink;
     const text = `Hi ${username}, you have registered pychat` +
       `\nTo complete your registration please click on the url bellow: ${magicLink}` +
       `\n\nIf you find any bugs or propositions you can post them ${issueReportLink}`;
diff --git a/newback/src/modules/http/http.module.ts b/newback/src/modules/http/http.module.ts
new file mode 100644
index 000000000..16bc3a5d1
--- /dev/null
+++ b/newback/src/modules/http/http.module.ts
@@ -0,0 +1,19 @@
+import {
+  Global,
+  Logger,
+  Module
+} from '@nestjs/common';
+import {HttpService} from '@/modules/http/http.service';
+import fetch from 'node-fetch';
+
+@Global()
+@Module({
+  providers: [{
+    provide: HttpService,
+    useFactory: (logger) => new HttpService(logger, fetch),
+    inject: [Logger]
+  }],
+  exports: [HttpService]
+})
+export class HttpModule {
+}
diff --git a/newback/src/modules/http/http.service.ts b/newback/src/modules/http/http.service.ts
new file mode 100644
index 000000000..ff2c529ed
--- /dev/null
+++ b/newback/src/modules/http/http.service.ts
@@ -0,0 +1,45 @@
+import {
+  Injectable,
+  Logger
+} from '@nestjs/common';
+
+import type fetch from 'node-fetch';
+
+@Injectable()
+export class HttpService {
+  private requestId: number = 0;
+
+  constructor(
+    private readonly logger: Logger,
+    private readonly nodeFetch: typeof fetch,
+  ) {
+  }
+
+  private async post<T = Record<string, any>>(url, body: any, headers: Record<string, string>): Promise<T> {
+    let requestId = ++this.requestId;
+    this.logger.debug(`POST[${requestId}]: url='${url}'; data=${body}; headers=${JSON.stringify(headers)} `)
+    const response = await this.nodeFetch(url, {
+      method: 'post',
+      body,
+      headers
+    });
+    const responseBody = await response.json();
+    this.logger.debug(`POST[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`)
+    return responseBody;
+  }
+
+  public async postUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
+    const body = new URLSearchParams();
+    Object.entries(data).forEach(([k,v]) => {
+      body.append(k, v);
+    })
+    return this.post<T>(url, body, {})
+  }
+
+  public async postData<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
+    let body = JSON.stringify(data);
+    let headers = {'Content-Type': 'application/json'};
+    return this.post<T>(url, body, headers);
+  }
+
+}
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index b153e066c..e3bfec7c3 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -7,6 +7,7 @@
     "declaration": true,
     "removeComments": true,
     "emitDecoratorMetadata": true,
+    "resolveJsonModule": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "target": "es2017",
diff --git a/newback/yarn.lock b/newback/yarn.lock
index aeb07f963..a266495d1 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -609,6 +609,13 @@
     handlebars "^4.7.6"
     pug "^3.0.1"
 
+"@nestjs/axios@^0.0.7":
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/@nestjs/axios/-/axios-0.0.7.tgz#7f134636db13c2c1e8299365c7eceb73cd782b67"
+  integrity sha512-at8nj+1Nb8UleHcIN5QqZYeWX54m4m9s9gxzVE1qWy00neX2rg0+h2TfbWsnDi2tc23zIxqexanxMOJZbzO0CA==
+  dependencies:
+    axios "0.26.0"
+
 "@nestjs/cli@^8.2.5":
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/@nestjs/cli/-/cli-8.2.5.tgz#02094177f4eac576d1a559b259d541393e49e0bb"
@@ -971,6 +978,14 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
+"@types/node-fetch@^2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
+  integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
 "@types/node@*", "@types/node@^17.0.23":
   version "17.0.23"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
@@ -1284,6 +1299,13 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
 accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -1479,6 +1501,11 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+arrify@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+
 asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@@ -1506,6 +1533,13 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+axios@0.26.0:
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz#9a318f1c69ec108f8cd5f3c3d390366635e13928"
+  integrity sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==
+  dependencies:
+    follow-redirects "^1.14.8"
+
 axios@0.26.1:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
@@ -1586,7 +1620,7 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.1:
+base64-js@^1.3.0, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -1604,6 +1638,11 @@ bcrypt@^5.0.1:
     "@mapbox/node-pre-gyp" "^1.0.0"
     node-addon-api "^3.1.0"
 
+bignumber.js@^9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
+  integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -1702,6 +1741,11 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
@@ -2413,6 +2457,13 @@ dottie@^2.0.2:
   resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154"
   integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==
 
+ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -2715,6 +2766,11 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
 events@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
@@ -2801,6 +2857,11 @@ express@4.17.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+extend@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -2851,6 +2912,11 @@ fast-safe-stringify@2.1.1, fast-safe-stringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
 
+fast-text-encoding@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz#ec02ac8e01ab8a319af182dae2681213cfe9ce53"
+  integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==
+
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
@@ -3070,6 +3136,25 @@ gauge@^3.0.0:
     strip-ansi "^6.0.1"
     wide-align "^1.1.2"
 
+gaxios@^4.0.0:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22"
+  integrity sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA==
+  dependencies:
+    abort-controller "^3.0.0"
+    extend "^3.0.2"
+    https-proxy-agent "^5.0.0"
+    is-stream "^2.0.0"
+    node-fetch "^2.6.7"
+
+gcp-metadata@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.1.tgz#fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9"
+  integrity sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==
+  dependencies:
+    gaxios "^4.0.0"
+    json-bigint "^1.0.0"
+
 generate-function@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
@@ -3200,11 +3285,42 @@ globby@^11.0.4:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+google-auth-library@^7.14.1:
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.1.tgz#e3483034162f24cc71b95c8a55a210008826213c"
+  integrity sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA==
+  dependencies:
+    arrify "^2.0.0"
+    base64-js "^1.3.0"
+    ecdsa-sig-formatter "^1.0.11"
+    fast-text-encoding "^1.0.0"
+    gaxios "^4.0.0"
+    gcp-metadata "^4.2.0"
+    gtoken "^5.0.4"
+    jws "^4.0.0"
+    lru-cache "^6.0.0"
+
+google-p12-pem@^3.1.3:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz#123f7b40da204de4ed1fbf2fd5be12c047fc8b3b"
+  integrity sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==
+  dependencies:
+    node-forge "^1.3.1"
+
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+gtoken@^5.0.4:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz#deb7dc876abe002178e0515e383382ea9446d58f"
+  integrity sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==
+  dependencies:
+    gaxios "^4.0.0"
+    google-p12-pem "^3.1.3"
+    jws "^4.0.0"
+
 handlebars@^4.7.6:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
@@ -4276,6 +4392,13 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+json-bigint@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
+  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
+  dependencies:
+    bignumber.js "^9.0.0"
+
 json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -4351,6 +4474,23 @@ jstransformer@1.0.0:
     is-promise "^2.0.0"
     promise "^7.0.1"
 
+jwa@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
+  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"
+  integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==
+  dependencies:
+    jwa "^2.0.0"
+    safe-buffer "^5.0.1"
+
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -4834,16 +4974,6 @@ node-addon-api@^3.1.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
-"node-config-ts@npm:node-config-ts-2":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-config-ts-2/-/node-config-ts-2-1.0.0.tgz#349f5dd10e8de8d75f279e2a1e1148f782e77fbe"
-  integrity sha512-hnszqz2O74wrICiMsm+lIP8xVEeKrp48xebD6A8K7e5dEEOTa9HpUI5fvuXHLwiBwud3HeFGTuSutsKX4fTGKA==
-  dependencies:
-    json-to-ts "^1.6.0"
-    minimist "^1.2.0"
-    prettier "^1.19.1"
-    ramda "^0.27.0"
-
 node-db-migration@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/node-db-migration/-/node-db-migration-1.4.0.tgz#5616cca04f315fcb15121d60616233adc86db3c6"
@@ -4865,6 +4995,11 @@ node-fetch@^2.6.1, node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
+node-forge@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
+  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -4875,6 +5010,16 @@ node-releases@^2.0.2:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
   integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
 
+node-ts-config@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/node-ts-config/-/node-ts-config-1.0.4.tgz#32f9ce6dca832ec73a2c1fc5da80cffcc93e73d2"
+  integrity sha512-2fFgqfDr8GICONUGBUvn8dniVWRon/Q6tbWZcZHfNsCsThY+rSAoLiHw9AbXQVHvSm2cPchfFJMqYsOrsgQmMA==
+  dependencies:
+    json-to-ts "^1.6.0"
+    minimist "^1.2.0"
+    prettier "^1.19.1"
+    ramda "^0.27.0"
+
 nodemailer@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.0.tgz#86614722c4e0c33d1b5b02aecb90d6d629932b0d"
@@ -5694,7 +5839,7 @@ rxjs@^7, rxjs@^7.2.0:
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==

From 7dff725ad4d679699932cf5e93159ba3efaa6784 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 22:40:46 +0300
Subject: [PATCH 018/221] fixed files lns

---
 frontend/src/ts/types/backend                   |  1 -
 frontend/src/ts/types/backend.ts                |  1 +
 newback/src/data/types/dto                      |  1 -
 newback/src/data/types/frontend.ts              |  1 +
 newback/src/data/utils/helpers.spec.ts          | 17 +++++++++++++++++
 newback/src/data/utils/helpers.ts               |  5 +++++
 .../src/modules/api/auth/auth.module.spec.ts    | 17 +++++++++++++++++
 newback/src/modules/api/auth/auth.service.ts    | 13 +++++++++++--
 8 files changed, 52 insertions(+), 4 deletions(-)
 delete mode 120000 frontend/src/ts/types/backend
 create mode 120000 frontend/src/ts/types/backend.ts
 delete mode 120000 newback/src/data/types/dto
 create mode 120000 newback/src/data/types/frontend.ts
 create mode 100644 newback/src/data/utils/helpers.spec.ts
 create mode 100644 newback/src/data/utils/helpers.ts

diff --git a/frontend/src/ts/types/backend b/frontend/src/ts/types/backend
deleted file mode 120000
index 3f6330a4b..000000000
--- a/frontend/src/ts/types/backend
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/
\ No newline at end of file
diff --git a/frontend/src/ts/types/backend.ts b/frontend/src/ts/types/backend.ts
new file mode 120000
index 000000000..43385c905
--- /dev/null
+++ b/frontend/src/ts/types/backend.ts
@@ -0,0 +1 @@
+../../../../common/dto.ts
\ No newline at end of file
diff --git a/newback/src/data/types/dto b/newback/src/data/types/dto
deleted file mode 120000
index 3f6330a4b..000000000
--- a/newback/src/data/types/dto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/
\ No newline at end of file
diff --git a/newback/src/data/types/frontend.ts b/newback/src/data/types/frontend.ts
new file mode 120000
index 000000000..43385c905
--- /dev/null
+++ b/newback/src/data/types/frontend.ts
@@ -0,0 +1 @@
+../../../../common/dto.ts
\ No newline at end of file
diff --git a/newback/src/data/utils/helpers.spec.ts b/newback/src/data/utils/helpers.spec.ts
new file mode 100644
index 000000000..ec5289dc0
--- /dev/null
+++ b/newback/src/data/utils/helpers.spec.ts
@@ -0,0 +1,17 @@
+import {generateUserName} from '@/data/utils/helpers';
+
+describe('helper', () => {
+
+  describe('generateUserName', () => {
+    it('should remove email domain', () => {
+        expect(generateUserName('deathangel@gmail.com')).toEqual('deathangel')
+    });
+
+    it('should cut to 16 symbolx', () => {
+      expect(generateUserName('deathangasdfasfasdfsadfasdfel@gmail.com')).toHaveLength(16)
+    });
+    it('should replace multiple invalid chars', () => {
+      expect(generateUserName('f#8f))c@gmail.com')).toEqual('f-8f-c')
+    });
+  });
+})
diff --git a/newback/src/data/utils/helpers.ts b/newback/src/data/utils/helpers.ts
new file mode 100644
index 000000000..09db2036e
--- /dev/null
+++ b/newback/src/data/utils/helpers.ts
@@ -0,0 +1,5 @@
+import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
+
+export function generateUserName(email: string) {
+  return email.split('@')[0].replace(/[^0-9a-zA-Z-_]+/g, '-').substring(0, MAX_USERNAME_LENGTH);
+}
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 2608822f0..f6a2e92dd 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -242,6 +242,23 @@ describe('AuthModule', () => {
         username: 'as'
       })
     });
+    it('should create a new user when email is new', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
+      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture)
+      });
+      const {body} = await request
+        .post('/api/auth/google-sign-in').send({
+          token: 'aasdasd',
+        }).expect(201);
+      expect(body).toMatchObject({
+        session: expect.any(String),
+        isNewAccount: false,
+        username: 'as'
+      })
+    });
   });
 
   describe('sign-up', () => {
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 480260e93..228185e6e 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -15,13 +15,17 @@ import {
   SignUpResponse
 } from '@/data/types/dto/dto';
 import {RoomRepository} from '@/data/database/repository/room.repository';
-import {ALL_ROOM_ID} from '@/data/utils/consts';
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH
+} from '@/data/utils/consts';
 import {RedisService} from '@/data/redis/RedisService';
 import {EmailSenderService} from '@/modules/email.render/email.sender.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {TokenPayload} from 'google-auth-library';
+import {generateUserName} from '@/data/utils/helpers';
 
 @Injectable()
 export class AuthService {
@@ -38,6 +42,7 @@ export class AuthService {
   ) {
   }
 
+
   public async authorizeGoogle(body: GoogleAuthRequest): Promise<GoogleSignInResponse> {
     let a: TokenPayload = await this.googleAuthService.validate(body.token);
    return this.sequelize.transaction(async(t) => {
@@ -46,10 +51,14 @@ export class AuthService {
       let session = await this.createAndSaveSession(userAuth.id);
       return {session, isNewAccount: false, username: userAuth.user.username};
     } else {
-
+      let newUserName = generateUserName(a.email);
+      if (await this.userRepository.checkUserExistByUserName(newUserName)) {
+        newUserName = thi
+      }
     }
    });
 
+
     // let googleId = a.email;
     // 	response.get('given_name'),
 		// 	response.get('family_name'),

From 23714200bb00357cca18932f894cf3c243a6815a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 22:44:19 +0300
Subject: [PATCH 019/221] fixd links

---
 frontend/src/ts/classes/DefaultStore.ts    | 2 +-
 frontend/src/ts/message_handlers/Api.ts    | 2 +-
 frontend/src/ts/types/db.ts                | 2 +-
 frontend/src/ts/types/dto.ts               | 4 ++--
 frontend/src/ts/types/model.ts             | 2 +-
 frontend/src/vue/pages/UserProfileInfo.vue | 2 +-
 frontend/src/vue/singup/SignUp.vue         | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index c78311f8a..a0c977cd4 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -79,7 +79,7 @@ import {
   Mutation,
   VuexModule,
 } from "vuex-module-decorators";
-import {Gender} from '@/ts/types/backend/dto';
+import {Gender} from '@/ts/types/backend';
 
 const logger = loggerFactory.getLogger("store");
 
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 584b65296..e9fa52d81 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -24,7 +24,7 @@ import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
 import {SignInRequest} from '@/ts/types/dto';
-import {ValidateUserResponse} from '@/ts/types/backend/dto';
+import {ValidateUserResponse} from '@/ts/types/backend';
 
 export default class Api extends MessageHandler {
   protected readonly handlers: HandlerTypes<keyof Api, "*"> = {
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index b9d2ff41e..ce343616b 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,6 +1,6 @@
 import type {LogLevel} from "lines-logger";
 import type {MessageStatus} from "@/ts/types/model";
-import {Gender} from '@/ts/types/backend/dto';
+import {Gender} from '@/ts/types/backend';
 
 export interface UserDB {
   id: number;
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 6f7f14b6a..e2b6a04ac 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -8,10 +8,10 @@ import type {
   UserModel,
 } from "@/ts/types/model";
 
-export * from './backend/dto';
+export * from '@/ts/types/backend';
 
 import type {LogLevel} from "lines-logger";
-import {Gender} from '@/ts/types/backend/dto';
+import {Gender} from '@/ts/types/backend';
 
 export interface RoomNoUsersDto {
   channelId: number | null;
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 3dff91623..82181f3d9 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,5 +1,5 @@
 import type {LogLevel} from "lines-logger";
-import {Gender} from '@/ts/types/backend/dto';
+import {Gender} from '@/ts/types/backend';
 
 export enum GrowlType {
   SUCCESS = "col-success", INFO = "col-info", ERROR = "col-error",
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index f370371d4..932a02bd9 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -128,7 +128,7 @@ import {currentUserInfoModelToDto} from "@/ts/types/converters";
 import AppInputDate from "@/vue/ui/AppInputDate.vue";
 import type {SetUserProfileMessage} from "@/ts/types/messages/wsInMessages";
 import type {LogoutMessage} from "@/ts/types/messages/innerMessages";
-import {Gender} from '@/ts/types/backend/dto';
+import {Gender} from '@/ts/types/backend';
 
 @Component({
   name: "UserProfileInfo",
diff --git a/frontend/src/vue/singup/SignUp.vue b/frontend/src/vue/singup/SignUp.vue
index a0d3eea62..6a2ead6bf 100644
--- a/frontend/src/vue/singup/SignUp.vue
+++ b/frontend/src/vue/singup/SignUp.vue
@@ -133,7 +133,7 @@ import {IconColor} from "@/ts/types/types";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import SocialAuthSignUp from "@/vue/singup/SocialAuthSignUp.vue";
 import {USERNAME_REGEX} from "@/ts/utils/consts";
-import {Gender} from '@/ts/types/backend/dto';
+import {Gender} from '@/ts/types/backend';
 
 @Component({
   name: "SignUp",

From 41edae8101b0a8574701e59f82ae5fdd337da366 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 23:16:10 +0300
Subject: [PATCH 020/221] Google auth works

---
 common/dto.ts                                 | 15 +++--
 frontend/src/ts/message_handlers/Api.ts       |  7 +-
 .../migration-template/202204110326-init.sql  |  2 +-
 .../src/data/database/model/image.model.ts    |  2 +-
 .../src/data/database/model/message.model.ts  |  2 +-
 .../data/database/model/subscription.model.ts |  2 +-
 .../database/model/uploaded.file.model.ts     |  2 +-
 .../data/database/model/user.auth.model.ts    |  2 +-
 newback/src/data/database/model/user.model.ts |  2 +-
 .../database/model/user.settings.model.ts     |  2 +-
 .../data/database/model/verification.model.ts |  2 +-
 .../database/repository/user.repository.ts    | 24 +++++--
 .../src/modules/api/auth/auth.controller.ts   |  2 +-
 newback/src/modules/api/auth/auth.service.ts  | 66 +++++++++++--------
 .../google.auth.reques.validator.ts           |  2 +-
 .../validators/login.request.validator.ts     |  2 +-
 .../validators/sign.up.request.validator.ts   |  2 +-
 .../validate.email.request.validator.ts       |  2 +-
 .../validate.user.request.validator.ts        |  2 +-
 19 files changed, 84 insertions(+), 58 deletions(-)

diff --git a/common/dto.ts b/common/dto.ts
index d790baae0..468849492 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -31,18 +31,21 @@ export interface SignInResponse extends SessionResponse {
 
 }
 
-export interface OauthSessionResponse extends SessionResponse {
-  isNewAccount: boolean;
+
+interface TypeGeneratorForOauth1 extends SessionResponse{
+  isNewAccount: true;
   username: string;
 }
 
-export interface GoogleSignInResponse extends OauthSessionResponse {
-
+interface TypeGeneratorForOauth2 extends SessionResponse{
+  isNewAccount: false
 }
 
-export interface FacebookSignInResponse extends OauthSessionResponse {
+export type OauthSessionResponse = TypeGeneratorForOauth1 | TypeGeneratorForOauth2;
 
-}
+
+export type GoogleSignInResponse = OauthSessionResponse;
+export type FacebookSignInResponse = OauthSessionResponse;
 
 export interface SignUpResponse extends SessionResponse{
 
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index e9fa52d81..ecf5a8e6a 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -24,7 +24,10 @@ import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
 import {SignInRequest} from '@/ts/types/dto';
-import {ValidateUserResponse} from '@/ts/types/backend';
+import {
+  GoogleSignInResponse,
+  ValidateUserResponse
+} from '@/ts/types/backend';
 
 export default class Api extends MessageHandler {
   protected readonly handlers: HandlerTypes<keyof Api, "*"> = {
@@ -127,7 +130,7 @@ export default class Api extends MessageHandler {
     });
   }
 
-  public async googleAuth(token: string): Promise<OauthSessionResponse> {
+  public async googleAuth(token: string): Promise<GoogleSignInResponse> {
     return this.xhr.doPost<OauthSessionResponse>({
       url: "/auth/google-sign-in",
       params: {
diff --git a/newback/config/migration-template/202204110326-init.sql b/newback/config/migration-template/202204110326-init.sql
index 90bc4cc0d..0e2feb71a 100644
--- a/newback/config/migration-template/202204110326-init.sql
+++ b/newback/config/migration-template/202204110326-init.sql
@@ -224,7 +224,7 @@ CREATE TABLE `user_auth`
     `password`              VARCHAR(255) NOT NULL,
     `email`                 VARCHAR(255) UNIQUE,
     `facebook_id`           VARCHAR(255) UNIQUE,
-    `google_id`             DATETIME UNIQUE,
+    `google_id`             VARCHAR(255) UNIQUE,
     `email_verification_id` INTEGER,
     `created_at`            DATETIME     NOT NULL,
     `updated_at`            DATETIME     NOT NULL,
diff --git a/newback/src/data/database/model/image.model.ts b/newback/src/data/database/model/image.model.ts
index 493879770..c8232aa13 100644
--- a/newback/src/data/database/model/image.model.ts
+++ b/newback/src/data/database/model/image.model.ts
@@ -8,7 +8,7 @@ import {
   Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {ImageType} from '@/data/types/dto/dto';
+import {ImageType} from '@/data/types/frontend';
 import {MessageModel} from '@/data/database/model/message.model';
 
 const uniqueUserIdSymbMess = 'unique_image_symbol_message';
diff --git a/newback/src/data/database/model/message.model.ts b/newback/src/data/database/model/message.model.ts
index 98c930e53..c500fcd0f 100644
--- a/newback/src/data/database/model/message.model.ts
+++ b/newback/src/data/database/model/message.model.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {MessageStatus,} from '@/data/types/dto/dto';
+import {MessageStatus,} from '@/data/types/frontend';
 import {UserModel} from '@/data/database/model/user.model';
 import {RoomModel} from '@/data/database/model/room.model';
 
diff --git a/newback/src/data/database/model/subscription.model.ts b/newback/src/data/database/model/subscription.model.ts
index bb117732b..91f05e9f4 100644
--- a/newback/src/data/database/model/subscription.model.ts
+++ b/newback/src/data/database/model/subscription.model.ts
@@ -8,7 +8,7 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {UploadedFileChoices} from '@/data/types/dto/dto';
+import {UploadedFileChoices} from '@/data/types/frontend';
 import {IpAddressModel} from '@/data/database/model/ip.address.model';
 
 @Injectable()
diff --git a/newback/src/data/database/model/uploaded.file.model.ts b/newback/src/data/database/model/uploaded.file.model.ts
index 0c7df2067..6e7ae357a 100644
--- a/newback/src/data/database/model/uploaded.file.model.ts
+++ b/newback/src/data/database/model/uploaded.file.model.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UploadedFileChoices} from '@/data/types/dto/dto';
+import {UploadedFileChoices} from '@/data/types/frontend';
 import {UserModel} from '@/data/database/model/user.model';
 
 @Injectable()
diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/database/model/user.auth.model.ts
index 1e7bb23f3..5699919c3 100644
--- a/newback/src/data/database/model/user.auth.model.ts
+++ b/newback/src/data/database/model/user.auth.model.ts
@@ -46,7 +46,7 @@ export class UserAuthModel extends Model<UserAuthModel> {
   public facebookId: string;
 
   @Column({
-    type: DataType.DATE,
+    type: DataType.STRING,
     allowNull: true,
     unique: true,
   })
diff --git a/newback/src/data/database/model/user.model.ts b/newback/src/data/database/model/user.model.ts
index c22d5ddc6..f01f8114a 100644
--- a/newback/src/data/database/model/user.model.ts
+++ b/newback/src/data/database/model/user.model.ts
@@ -6,7 +6,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {Gender} from '@/data/types/dto/dto';
+import {Gender} from '@/data/types/frontend';
 import {UserAuthModel} from '@/data/database/model/user.auth.model';
 import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
 
diff --git a/newback/src/data/database/model/user.settings.model.ts b/newback/src/data/database/model/user.settings.model.ts
index ef70f7405..2f8dccad8 100644
--- a/newback/src/data/database/model/user.settings.model.ts
+++ b/newback/src/data/database/model/user.settings.model.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {Theme,} from '@/data/types/dto/dto';
+import {Theme,} from '@/data/types/frontend';
 import {UserModel} from '@/data/database/model/user.model';
 import {
   LogLevel,
diff --git a/newback/src/data/database/model/verification.model.ts b/newback/src/data/database/model/verification.model.ts
index 95d996bba..754523c39 100644
--- a/newback/src/data/database/model/verification.model.ts
+++ b/newback/src/data/database/model/verification.model.ts
@@ -8,7 +8,7 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/database/model/user.model';
-import {VerificationType} from '@/data/types/dto/dto';
+import {VerificationType} from '@/data/types/frontend';
 
 @Injectable()
 @Table({tableName: 'verification'})
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/data/database/repository/user.repository.ts
index 4259594a6..88de0210f 100644
--- a/newback/src/data/database/repository/user.repository.ts
+++ b/newback/src/data/database/repository/user.repository.ts
@@ -3,9 +3,9 @@ import {InjectModel} from '@nestjs/sequelize';
 import {UserModel} from '@/data/database/model/user.model';
 import {UserAuthModel} from '@/data/database/model/user.auth.model';
 import {
-  SignUpRequest,
+  Gender,
   VerificationType
-} from '@/data/types/dto/dto';
+} from '@/data/types/frontend';
 import {UserProfileModel} from '@/data/database/model/user.profile.model';
 import {UserSettingsModel} from '@/data/database/model/user.settings.model';
 import {VerificationModel} from '@/data/database/model/verification.model';
@@ -23,20 +23,31 @@ export class UserRepository {
   ) {
   }
 
-  public async createUser(data: SignUpRequest, transaction: Transaction): Promise<number> {
+  public async createUser(data: {
+    username: string;
+    password: string;
+    email?: string;
+    sex?: Gender;
+    name?: string;
+    surname?: string;
+    thumbnail?: string;
+    googleId?: string;
+  }, transaction: Transaction): Promise<number> {
     let userModel = await this.userModel.create({
       username: data.username,
       lastTimeOnline: new Date(),
-      sex: data.sex
+      sex: data.sex,
+      thumbnail: data.thumbnail
     }, {transaction, raw: true,})
     await Promise.all([
       this.userProfileModel.create({
-        id: userModel.id
+        id: userModel.id,
       }, {transaction, raw: true,}),
       this.userAuthModel.create({
         password: data.password,
         email: data.email,
-        id: userModel.id
+        id: userModel.id,
+        googleId: data.googleId,
       }, {transaction, raw: true,}),
       this.userSettingsModel.create({
         id: userModel.id
@@ -50,7 +61,6 @@ export class UserRepository {
       where: {
         googleId
       },
-      include: 'user',
       transaction
     })
   }
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 9342deb8d..86fc7aa12 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -17,7 +17,7 @@ import {
   SignUpResponse,
   ValidateUserEmailRequest,
   ValidateUserResponse
-} from '@/data/types/dto/dto';
+} from '@/data/types/frontend';
 import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.auth.reques.validator';
 import {CaptchaGuard} from '@/modules/captcha';
 import {ValidateEmailRequestValidator} from '@/modules/api/auth/validators/validate.email.request.validator';
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 228185e6e..526605508 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -7,13 +7,14 @@ import {
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {
+  Gender,
   GoogleAuthRequest,
   GoogleSignInResponse,
   SignInRequest,
   SignInResponse,
   SignUpRequest,
   SignUpResponse
-} from '@/data/types/dto/dto';
+} from '@/data/types/frontend';
 import {RoomRepository} from '@/data/database/repository/room.repository';
 import {
   ALL_ROOM_ID,
@@ -44,34 +45,43 @@ export class AuthService {
 
 
   public async authorizeGoogle(body: GoogleAuthRequest): Promise<GoogleSignInResponse> {
-    let a: TokenPayload = await this.googleAuthService.validate(body.token);
-   return this.sequelize.transaction(async(t) => {
-    let userAuth = await this.userRepository.getUserMyAuthGoogle(a.email, t)
-    if (userAuth) {
-      let session = await this.createAndSaveSession(userAuth.id);
-      return {session, isNewAccount: false, username: userAuth.user.username};
-    } else {
-      let newUserName = generateUserName(a.email);
-      if (await this.userRepository.checkUserExistByUserName(newUserName)) {
-        newUserName = thi
-      }
-    }
-   });
+    let googleResponse: TokenPayload = await this.googleAuthService.validate(body.token);
+    return this.sequelize.transaction(async(t) => {
+      let userAuth = await this.userRepository.getUserMyAuthGoogle(googleResponse.email, t)
+      if (userAuth) {
+        let session = await this.createAndSaveSession(userAuth.id);
+        let response: GoogleSignInResponse = {session, isNewAccount: false};
+        return response;
+      } else {
+        let username = generateUserName(googleResponse.email);
+        if (await this.userRepository.checkUserExistByEmail(googleResponse.email)) {
+          throw new ConflictException("User with this email already exist, but has no connected google account." +
+            " If this is you, please login as this user and connect this google profile in profile settings")
+        }
+        if (await this.userRepository.checkUserExistByUserName(username)) {
+          // the chance that there will be a user with same id is insignificant
+          username = await this.passwordService.generateRandomString(MAX_USERNAME_LENGTH);
+        }
+        this.logger.log(`Generates username='${username}' for email ${googleResponse.email}`);
+        const password = await this.passwordService.createPassword(await this.passwordService.generateRandomString(16));
 
+        let userId = await this.userRepository.createUser({
+          googleId: googleResponse.email,
+          password,
+          email: googleResponse.email,
+          username,
+          thumbnail: googleResponse.picture,
+          name: googleResponse.given_name,
+          surname: googleResponse.family_name,
+          sex: Gender.OTHER,
+        }, t)
+        await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
 
-    // let googleId = a.email;
-    // 	response.get('given_name'),
-		// 	response.get('family_name'),
-		// 	email=response.get('email'),
-		// 	picture=response.get('picture'),
-		// 	google_id=response.get('id')
-
-    // username = re.sub('[^0-9a-zA-Z-_]+', '-', email.rsplit('@')[0])[:15]
-    // if email:
-		// 		username = re.sub('[^0-9a-zA-Z-_]+', '-', email.rsplit('@')[0])[:15]
-		// 	else:
-		// 		username = f'{name}_{surname}'
-    return undefined as any;
+        let session = await this.createAndSaveSession(userId);
+        let response: GoogleSignInResponse = {session, isNewAccount: true, username};
+        return response;
+      }
+    });
   }
 
   public async authorize(body: SignInRequest): Promise<SignInResponse> {
@@ -86,7 +96,7 @@ export class AuthService {
       password = result?.userAuth?.password;
     }
     if (!password) {
-       throw new ConflictException("User with login doesn't exists");
+      throw new ConflictException("User with login doesn't exists");
     }
     let matches = await this.passwordService.checkPassword(body.password, password);
     if (!matches) {
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
index 3bd5b8af5..253f52bbf 100644
--- a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -1,7 +1,7 @@
 
 
 import {IsString,} from 'class-validator';
-import {GoogleAuthRequest} from '@/data/types/dto/dto';
+import {GoogleAuthRequest} from '@/data/types/frontend';
 
 export class GoogleAuthRequestValidator implements GoogleAuthRequest {
 
diff --git a/newback/src/modules/api/auth/validators/login.request.validator.ts b/newback/src/modules/api/auth/validators/login.request.validator.ts
index c1220b671..4f02ece2a 100644
--- a/newback/src/modules/api/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/login.request.validator.ts
@@ -4,7 +4,7 @@ import {
   Matches,
   ValidateIf,
 } from 'class-validator';
-import {SignInRequest} from '@/data/types/dto/dto';
+import {SignInRequest} from '@/data/types/frontend';
 
 export class LoginRequestValidator implements SignInRequest {
 
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index 9ca5dc8aa..7f12a0f2f 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -10,7 +10,7 @@ import {
 import {
   Gender,
   SignUpRequest,
-} from '@/data/types/dto/dto';
+} from '@/data/types/frontend';
 import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
 
 export class SignUpRequestValidator implements SignUpRequest {
diff --git a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
index 2370dc421..1c1cbfebd 100644
--- a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
@@ -2,7 +2,7 @@ import {
   IsEmail,
   IsString,
 } from 'class-validator';
-import {ValidateUserEmailRequest} from '@/data/types/dto/dto';
+import {ValidateUserEmailRequest} from '@/data/types/frontend';
 
 export class ValidateEmailRequestValidator implements ValidateUserEmailRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index f79c7f63a..4c5087959 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -3,7 +3,7 @@ import {
   Length,
   Matches,
 } from 'class-validator';
-import {ValidateUserRequest} from '@/data/types/dto/dto';
+import {ValidateUserRequest} from '@/data/types/frontend';
 import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {

From 6e4d96c146b57afd72f7ec9119d7e97a09025d35 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 23:33:03 +0300
Subject: [PATCH 021/221] Added tests to validate email

---
 .../src/modules/api/auth/auth.module.spec.ts  | 91 +++++++++++++++----
 1 file changed, 75 insertions(+), 16 deletions(-)

diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index f6a2e92dd..49830be59 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -239,13 +239,17 @@ describe('AuthModule', () => {
       expect(body).toMatchObject({
         session: expect.any(String),
         isNewAccount: false,
-        username: 'as'
       })
     });
-    it('should create a new user when email is new', async() => {
-      sequelize.transaction = (resolve) => resolve();
+    it('should create a new user when email is new and user with email not exist', async() => {
+      sequelize.transaction = (resolve) => resolve('transaction');
       redisService.saveSession = jest.fn().mockResolvedValue(undefined)
       userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.createUser = jest.fn().mockResolvedValue(3);
+      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      let createUserSpy = jest.spyOn(userRepository, 'createUser');
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
         getPayload: jest.fn().mockReturnValue(googleResponseFixture)
       });
@@ -255,8 +259,40 @@ describe('AuthModule', () => {
         }).expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
-        isNewAccount: false,
-        username: 'as'
+        isNewAccount: true,
+        username: 'death' // from fixture
+      })
+      expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
+       "email": "death@gmail.com",
+       "googleId": "death@gmail.com",
+       "name": "Andrew",
+       "password": expect.any(String),
+       "sex": "OTHER",
+       "surname": "Superman",
+       "thumbnail": "https://lh3.googleusercontent.com/a-/xxxxxxxxxxxx-xxxxxxxxxxxx",
+       "username": "death",
+      }), 'transaction')
+    });
+    it('should throw an error if email exists', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
+      // userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      // userRepository.createUser = jest.fn().mockResolvedValue(3);
+      // roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture)
+      });
+      const {body} = await request
+        .post('/api/auth/google-sign-in').send({
+          token: 'aasdasd',
+        }).expect(409);
+      expect(body).toMatchObject({
+        error: "Conflict",
+        statusCode: 409,
+        message: "User with this email already exist, but has no connected google account." +
+          " If this is you, please login as this user and connect this google profile in profile settings",
       })
     });
   });
@@ -329,6 +365,40 @@ describe('AuthModule', () => {
         });
     });
   });
+
+  describe('validate-email', () => {
+
+    it('should return ok', async() => {
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
+      await request
+        .post('/api/auth/validate-email').send({
+          email: 'blah@gmail.com',
+        }).expect(201, {ok: true});
+    });
+    it('should error if email exists', async() => {
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
+      await request
+        .post('/api/auth/validate-email').send({
+          email: 'exist@gmail.com',
+        }).expect(409, {
+          "error": "Conflict",
+          "message": "User with this email already exist",
+          "statusCode": 409,
+        });
+    });
+    it('should give error on invalid email', async() => {
+      await request
+        .post('/api/auth/validate-email').send({
+          email: 'invalidemail',
+        }).expect(400, {
+          "error": "Bad Request",
+          "message": [
+            'email must be an email',
+          ],
+          "statusCode": 400,
+        });
+    });
+  });
   describe('validate-user', () => {
 
     it('should return ok', async() => {
@@ -373,16 +443,5 @@ describe('AuthModule', () => {
           "statusCode": 400,
         });
     });
-    it('should throw an error if user exists', async() => {
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
-      await request
-        .post('/api/auth/validate-user').send({
-          username: 'asd',
-        }).expect(409, {
-          "error": "Conflict",
-          "message": "User with this username already exist",
-          "statusCode": 409,
-        });
-    });
   });
 });

From 858c4df5eb6fb156c7da75c21233614284abe270 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 12 Apr 2022 23:44:05 +0300
Subject: [PATCH 022/221] remove default.json

---
 .excludeMAIN                  |  1 +
 newback/config/default.json   | 19 -------------------
 newback/config/env/local.json |  7 -------
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 newback/config/env/local.json

diff --git a/.excludeMAIN b/.excludeMAIN
index 898fb8298..21e1a8693 100644
--- a/.excludeMAIN
+++ b/.excludeMAIN
@@ -21,3 +21,4 @@ backend/chat/settings.py
 backend/photos/*
 !backend/photos/.gitkeep
 frontend/build/production.json
+newback/config/env/default.json
diff --git a/newback/config/default.json b/newback/config/default.json
index 9a115d690..93a0d6f24 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -19,25 +19,6 @@
     "pingInterval": 300000,
     "clientNoServerPingCloseTimeout": 320000
   },
-  "auth": {
-    "google": {
-      "clientId": "620421656154-8boctt2h7h5meskhe7vh8aiargj0nae9.apps.googleusercontent.com"
-    }
-  },
-  "recaptcha": {
-    "publicKey": "6LchGhwTAAAAAJwCRgfNKraWrFtCdKPFo0Ri8DLt",
-    "privateKey": "6LchGhwTAAAAAIH_RuxyeJQn5Kv6XnHcLSc_68h_"
-  },
-  "email": {
-    "host": "smtp.gmail.com",
-    "port": 587,
-    "auth": {
-      "type": "login",
-      "user": "chat.django@gmail.com",
-      "password": "Ilovepython"
-    },
-    "from": "root@pychat.org"
-  },
   "redis": {
     "host": "localhost",
     "port": 6379,
diff --git a/newback/config/env/local.json b/newback/config/env/local.json
deleted file mode 100644
index f6ea0830a..000000000
--- a/newback/config/env/local.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "auth": {
-    "google": {
-      "clientId": "620421656154-8boctt2h7h5meskhe7vh8aiargj0nae9.apps.googleusercontent.com"
-    }
-  }
-}

From 2fd9334869af259d8ac6886184971d0172fbcc22 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 00:57:34 +0300
Subject: [PATCH 023/221] Added facebooksignin test

---
 common/dto.ts                                 |  4 +
 frontend/src/ts/message_handlers/Api.ts       |  2 +-
 newback/config/Config.d.ts                    | 52 ++++++-----
 newback/config/env/test.json                  |  3 +-
 .../database/repository/user.repository.ts    | 11 +++
 newback/src/data/types/api.ts                 |  5 +
 .../fixtures/facebook.get.token.response.json | 16 ++++
 .../fixtures/facebook.get.user.response.json  |  5 +
 .../src/modules/api/auth/auth.controller.ts   |  7 ++
 .../src/modules/api/auth/auth.module.spec.ts  | 92 +++++++++++++++++--
 newback/src/modules/api/auth/auth.module.ts   | 24 +++--
 newback/src/modules/api/auth/auth.service.ts  | 40 ++++++++
 .../modules/api/auth/facebook.auth.service.ts | 63 +++++++++++++
 .../modules/api/auth/google.auth.service.ts   |  6 +-
 .../facebook.auth.request.validator.ts        | 11 +++
 newback/src/modules/http/http.service.ts      | 20 ++++
 16 files changed, 318 insertions(+), 43 deletions(-)
 create mode 100644 newback/src/data/types/api.ts
 create mode 100644 newback/src/fixtures/facebook.get.token.response.json
 create mode 100644 newback/src/fixtures/facebook.get.user.response.json
 create mode 100644 newback/src/modules/api/auth/facebook.auth.service.ts
 create mode 100644 newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts

diff --git a/common/dto.ts b/common/dto.ts
index 468849492..925b135eb 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -12,6 +12,10 @@ export interface GoogleAuthRequest {
   token: string;
 }
 
+export interface FaceBookAuthRequest {
+  token: string;
+}
+
 export interface ValidateUserRequest {
   username: string;
 }
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index ecf5a8e6a..144ba7bc5 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -141,7 +141,7 @@ export default class Api extends MessageHandler {
 
   public async facebookAuth(token: string): Promise<OauthSessionResponse> {
     return this.xhr.doPost<OauthSessionResponse>({
-      url: "/api/facebook_sign_in",
+      url: "/auth/facebook-sign-in",
       params: {
         token,
       },
diff --git a/newback/config/Config.d.ts b/newback/config/Config.d.ts
index fa4fdcb49..0a75c345e 100644
--- a/newback/config/Config.d.ts
+++ b/newback/config/Config.d.ts
@@ -5,12 +5,37 @@ declare module "node-ts-config" {
     name: string
     application: Application
     settings: Settings
-    auth: Auth
-    recaptcha: Recaptcha
-    email: Email
     redis: Redis
     frontend: Frontend
     mysql: Mysql
+    auth: Auth
+    recaptcha: Recaptcha
+    email: Email
+  }
+  interface Email {
+    host: string
+    port: number
+    auth: Auth2
+    from: string
+  }
+  interface Auth2 {
+    type: string
+    user: string
+    password: string
+  }
+  interface Recaptcha {
+    publicKey: string
+    privateKey: string
+  }
+  interface Auth {
+    google: Google
+    facebook: Facebook
+  }
+  interface Facebook {
+    accessToken: string
+  }
+  interface Google {
+    clientId: string
   }
   interface Mysql {
     synchronize: boolean
@@ -37,27 +62,6 @@ declare module "node-ts-config" {
     port: number
     database: number
   }
-  interface Email {
-    host: string
-    port: number
-    auth: Auth2
-    from: string
-  }
-  interface Auth2 {
-    type: string
-    user: string
-    password: string
-  }
-  interface Recaptcha {
-    publicKey: string
-    privateKey: string
-  }
-  interface Auth {
-    google: Google
-  }
-  interface Google {
-    clientId: string
-  }
   interface Settings {
     wsIdCharLength: number
     allRedisRoom: string
diff --git a/newback/config/env/test.json b/newback/config/env/test.json
index 38174961f..c89d3ce9c 100644
--- a/newback/config/env/test.json
+++ b/newback/config/env/test.json
@@ -1,3 +1,4 @@
 {
-  "recaptcha": null
+  "recaptcha": null,
+  "email": {}
 }
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/data/database/repository/user.repository.ts
index 88de0210f..a6d151658 100644
--- a/newback/src/data/database/repository/user.repository.ts
+++ b/newback/src/data/database/repository/user.repository.ts
@@ -32,6 +32,7 @@ export class UserRepository {
     surname?: string;
     thumbnail?: string;
     googleId?: string;
+    facebookId?: string;
   }, transaction: Transaction): Promise<number> {
     let userModel = await this.userModel.create({
       username: data.username,
@@ -48,6 +49,7 @@ export class UserRepository {
         email: data.email,
         id: userModel.id,
         googleId: data.googleId,
+        facebookId: data.facebookId,
       }, {transaction, raw: true,}),
       this.userSettingsModel.create({
         id: userModel.id
@@ -65,6 +67,15 @@ export class UserRepository {
     })
   }
 
+  public async getUserMyAuthFacebook(facebookId: string, transaction: Transaction): Promise<UserAuthModel> {
+    return this.userAuthModel.findOne({
+      where: {
+        facebookId
+      },
+      transaction
+    })
+  }
+
   public async checkUserExistByUserName(username: string, transaction?: Transaction): Promise<boolean> {
     return await this.userModel.findOne({
       where: {username},
diff --git a/newback/src/data/types/api.ts b/newback/src/data/types/api.ts
new file mode 100644
index 000000000..e161dc05e
--- /dev/null
+++ b/newback/src/data/types/api.ts
@@ -0,0 +1,5 @@
+export interface FacebookGetUserResponse {
+  first_name: string;
+  last_name: string;
+  id: string;
+}
diff --git a/newback/src/fixtures/facebook.get.token.response.json b/newback/src/fixtures/facebook.get.token.response.json
new file mode 100644
index 000000000..e5df4e624
--- /dev/null
+++ b/newback/src/fixtures/facebook.get.token.response.json
@@ -0,0 +1,16 @@
+{
+  "data": {
+    "app_id": "894051850700207",
+    "type": "USER",
+    "application": "pychat",
+    "data_access_expires_at": 1657572316,
+    "expires_at": 1654980316,
+    "is_valid": true,
+    "issued_at": 1649796316,
+    "scopes": [
+      "email",
+      "public_profile"
+    ],
+    "user_id": "1096917160382471"
+  }
+}
diff --git a/newback/src/fixtures/facebook.get.user.response.json b/newback/src/fixtures/facebook.get.user.response.json
new file mode 100644
index 000000000..1a81bd4bc
--- /dev/null
+++ b/newback/src/fixtures/facebook.get.user.response.json
@@ -0,0 +1,5 @@
+{
+  "first_name": "Andrew",
+  "last_name": "Koidan",
+  "id": "1096917160382471"
+}
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 86fc7aa12..6e315053e 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -12,6 +12,7 @@ import {LoginRequestValidator} from '@/modules/api/auth/validators/login.request
 import {SignUpRequestValidator} from '@/modules/api/auth/validators/sign.up.request.validator';
 import {ValidateUserRequestValidator} from '@/modules/api/auth/validators/validate.user.request.validator';
 import {
+  FacebookSignInResponse,
   GoogleSignInResponse,
   SignInResponse,
   SignUpResponse,
@@ -21,6 +22,7 @@ import {
 import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.auth.reques.validator';
 import {CaptchaGuard} from '@/modules/captcha';
 import {ValidateEmailRequestValidator} from '@/modules/api/auth/validators/validate.email.request.validator';
+import {FacebookAuthRequestValidator} from '@/modules/api/auth/validators/facebook.auth.request.validator';
 
 @Controller({
   path: '/api/auth'
@@ -43,6 +45,11 @@ export class AuthController {
     return this.authservice.authorizeGoogle(body);
   }
 
+  @Post('/facebook-sign-in')
+  public async facebookAuh(@Body() body: FacebookAuthRequestValidator): Promise<FacebookSignInResponse> {
+    return this.authservice.authorizeFacebook(body);
+  }
+
   @Post('/sign-up')
   public async register(@Body() body: SignUpRequestValidator, @Ip() ip): Promise<SignUpResponse> {
     return this.authservice.registerUser(body, ip);
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 49830be59..d5887f507 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -22,11 +22,14 @@ import {OAuth2Client} from 'google-auth-library';
 import {HttpService} from '@/modules/http/http.service';
 import fetch from 'node-fetch';
 import * as googleResponseFixture from '@/fixtures/google.response.fixture.json';
+import * as facebookGetTokenResponseFixture from '@/fixtures/facebook.get.token.response.json';
+import * as facebookGetUserResponseFixture from '@/fixtures/facebook.get.user.response.json';
 import {ConfigService} from '@/modules/config/config.service';
 import {
   config,
   IConfig
 } from 'node-ts-config';
+import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
 
 describe('AuthModule', () => {
   let app: INestApplication;
@@ -79,6 +82,7 @@ describe('AuthModule', () => {
         AuthService,
         HtmlService,
         EmailSenderService,
+        FacebookAuthService,
         {
           provide: MailerService,
           useValue: mailerService,
@@ -263,14 +267,14 @@ describe('AuthModule', () => {
         username: 'death' // from fixture
       })
       expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
-       "email": "death@gmail.com",
-       "googleId": "death@gmail.com",
-       "name": "Andrew",
-       "password": expect.any(String),
-       "sex": "OTHER",
-       "surname": "Superman",
-       "thumbnail": "https://lh3.googleusercontent.com/a-/xxxxxxxxxxxx-xxxxxxxxxxxx",
-       "username": "death",
+        "email": "death@gmail.com",
+        "googleId": "death@gmail.com",
+        "name": "Andrew",
+        "password": expect.any(String),
+        "sex": "OTHER",
+        "surname": "Superman",
+        "thumbnail": "https://lh3.googleusercontent.com/a-/xxxxxxxxxxxx-xxxxxxxxxxxx",
+        "username": "death",
       }), 'transaction')
     });
     it('should throw an error if email exists', async() => {
@@ -297,6 +301,78 @@ describe('AuthModule', () => {
     });
   });
 
+  describe('facebook-sign-in', () => {
+    it('should login if user exists', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      nodeApply = jest.fn()
+        .mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)})
+        .mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
+      configService.getConfig = jest.fn().mockReturnValue({
+        auth: {
+          facebook: {
+            accessToken: "test"
+          }
+        }
+      } as IConfig)
+      userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue({
+        id: 1,
+        user: {
+          username: 'as'
+        }
+      });
+      const {body} = await request
+        .post('/api/auth/facebook-sign-in').send({
+          token: 'aasdasd',
+        }).expect(201);
+      expect(body).toMatchObject({
+        session: expect.any(String),
+        isNewAccount: false,
+      })
+    });
+    it('should create a new user when email is new and user with email not exist', async() => {
+      sequelize.transaction = (resolve) => resolve('transaction');
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+
+      nodeApply = jest.fn()
+        .mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)})
+        .mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
+      configService.getConfig = jest.fn().mockReturnValue({
+        auth: {
+          facebook: {
+            accessToken: "test"
+          }
+        }
+      } as IConfig)
+      userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue(null);
+
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.createUser = jest.fn().mockResolvedValue(3);
+      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      let createUserSpy = jest.spyOn(userRepository, 'createUser');
+      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture)
+      });
+      const {body} = await request
+        .post('/api/auth/facebook-sign-in').send({
+          token: 'aasdasd',
+        }).expect(201);
+      expect(body).toMatchObject({
+        session: expect.any(String),
+        isNewAccount: true,
+        username: 'Andrew_Koidan' // from fixture
+      })
+      expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
+        "facebookId": "1096917160382471",
+        "name": "Andrew",
+        "password": expect.any(String),
+        "sex": "OTHER",
+        "surname": "Koidan",
+        "username": "Andrew_Koidan"
+      }), 'transaction')
+    });
+  });
+
   describe('sign-up', () => {
     it('returns session', async() => {
       sequelize.transaction = (resolve) => resolve();
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index a0eeeb681..ff994a751 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -12,19 +12,27 @@ import {PasswordService} from '@/modules/api/auth/password.service';
 import {OAuth2Client} from 'google-auth-library';
 import {config} from 'node-ts-config';
 import {HttpModule} from '@/modules/http/http.module';
+import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
+import {ConfigService} from '@/modules/config/config.service';
 
 @Module({
   imports: [DatabaseModule, EmailModule, HttpModule],
   controllers: [AuthController],
-  providers: [AuthService, PasswordService, RedisService, {
-    provide: GoogleAuthService,
-    useFactory: (logger) => {
-      return new GoogleAuthService(logger, new OAuth2Client(
-        config.auth.google.clientId,
-      ))
+  providers: [
+    AuthService,
+    PasswordService,
+    RedisService,
+    FacebookAuthService,
+    {
+      provide: GoogleAuthService,
+      useFactory: (logger) => {
+        return new GoogleAuthService(logger, config.auth?.google?.clientId ? new OAuth2Client(
+          config.auth.google.clientId,
+        ): null)
+      },
+      inject: [Logger, ConfigService]
     },
-    inject: [Logger]
-  }],
+  ],
 })
 export class AuthModule {
 }
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 526605508..7bc1e0fea 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -7,6 +7,8 @@ import {
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {
+  FaceBookAuthRequest,
+  FacebookSignInResponse,
   Gender,
   GoogleAuthRequest,
   GoogleSignInResponse,
@@ -27,6 +29,8 @@ import {Sequelize} from 'sequelize-typescript';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {TokenPayload} from 'google-auth-library';
 import {generateUserName} from '@/data/utils/helpers';
+import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
+import {FacebookGetUserResponse} from '@/data/types/api';
 
 @Injectable()
 export class AuthService {
@@ -38,12 +42,48 @@ export class AuthService {
     private readonly redisService: RedisService,
     private readonly emailService: EmailSenderService,
     private readonly googleAuthService: GoogleAuthService,
+    private readonly facebookService: FacebookAuthService,
     private readonly sequelize: Sequelize,
     private readonly logger: Logger,
   ) {
   }
 
 
+  public async authorizeFacebook(body: FaceBookAuthRequest): Promise<FacebookSignInResponse> {
+    let fbResponse: FacebookGetUserResponse = await this.facebookService.validate(body.token);
+    return this.sequelize.transaction(async(t) => {
+      let userAuth = await this.userRepository.getUserMyAuthFacebook(fbResponse.id, t)
+      if (userAuth) {
+        let session = await this.createAndSaveSession(userAuth.id);
+        let response: GoogleSignInResponse = {session, isNewAccount: false};
+        return response;
+      } else {
+        let username = generateUserName(`${fbResponse.first_name}_${fbResponse.last_name}`);
+        if (await this.userRepository.checkUserExistByUserName(username)) {
+          // the chance that there will be a user with same id is insignificant
+          username = await this.passwordService.generateRandomString(MAX_USERNAME_LENGTH);
+        }
+        this.logger.log(`Generates username='${username}' for fbId ${fbResponse.id}`);
+        const password = await this.passwordService.createPassword(await this.passwordService.generateRandomString(16));
+
+        let userId = await this.userRepository.createUser({
+          password,
+          username,
+          name: fbResponse.first_name,
+          surname: fbResponse.last_name,
+          sex: Gender.OTHER,
+          facebookId: fbResponse.id
+        }, t)
+        await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
+
+        let session = await this.createAndSaveSession(userId);
+        let response: GoogleSignInResponse = {session, isNewAccount: true, username};
+        return response;
+      }
+    });
+  }
+
+
   public async authorizeGoogle(body: GoogleAuthRequest): Promise<GoogleSignInResponse> {
     let googleResponse: TokenPayload = await this.googleAuthService.validate(body.token);
     return this.sequelize.transaction(async(t) => {
diff --git a/newback/src/modules/api/auth/facebook.auth.service.ts b/newback/src/modules/api/auth/facebook.auth.service.ts
new file mode 100644
index 000000000..148372fc5
--- /dev/null
+++ b/newback/src/modules/api/auth/facebook.auth.service.ts
@@ -0,0 +1,63 @@
+import {TokenPayload} from 'google-auth-library';
+import {
+  BadRequestException,
+  Injectable,
+  InternalServerErrorException,
+  Logger,
+  ServiceUnavailableException,
+} from '@nestjs/common';
+import {HttpService} from '@/modules/http/http.service';
+import {ConfigService} from '@/modules/config/config.service';
+import {FacebookGetUserResponse} from '@/data/types/api';
+
+@Injectable()
+export class FacebookAuthService {
+
+  public constructor(
+    private readonly logger: Logger,
+    private readonly httpService: HttpService,
+    private readonly configService: ConfigService,
+  ) {
+
+  }
+
+  public async validate(idToken: string): Promise<FacebookGetUserResponse> {
+    let accessToken = this.configService.getConfig().auth?.facebook?.accessToken;
+    if (!accessToken) {
+      throw new ServiceUnavailableException("facebook access token is not specified");
+    }
+    const response = await this.httpService.getUrlEncoded(
+      'https://graph.facebook.com/debug_token',
+      {
+        input_token: idToken,
+        access_token: accessToken
+      }
+    );
+    if (!response?.data) {
+      throw new InternalServerErrorException("facebook api is down")
+    }
+    if (!response.data.is_valid) {
+      if (response.data.error) {
+        throw new BadRequestException(`facebook api error down error=${response.data.error.message} code=${response.data.error.code}`)
+      } else {
+        throw new InternalServerErrorException("invalid facebook response")
+      }
+    }
+    let userId = response.data.user_id;
+    this.logger.log(`got userId='${userId}' for facebookToken='${idToken}'`);
+    if (!userId) {
+      throw new InternalServerErrorException("invalid facebook response, userId is missing")
+    }
+    let facebookUser: FacebookGetUserResponse = await this.httpService.getUrlEncoded(`https://graph.facebook.com/${userId}`,
+      {
+        'access_token': accessToken,
+        'fields': ['email', 'first_name', 'last_name'].join(',')
+      }
+    )
+    if (!facebookUser.id) {
+      throw new InternalServerErrorException("invalid facebook response, id is missing")
+    }
+    this.logger.log(`got userid='${facebookUser.id}' for facebookToken='${idToken}'`);
+    return facebookUser;
+  }
+}
diff --git a/newback/src/modules/api/auth/google.auth.service.ts b/newback/src/modules/api/auth/google.auth.service.ts
index 7084f8d30..2e25eef79 100644
--- a/newback/src/modules/api/auth/google.auth.service.ts
+++ b/newback/src/modules/api/auth/google.auth.service.ts
@@ -3,6 +3,7 @@ import {
   ForbiddenException,
   Injectable,
   Logger,
+  ServiceUnavailableException,
 } from '@nestjs/common';
 
 @Injectable()
@@ -10,7 +11,7 @@ export class GoogleAuthService {
 
   public constructor(
     private readonly logger: Logger,
-    private readonly oauth2Client: OAuth2Client,
+    private readonly oauth2Client: OAuth2Client|null,
   ) {
 
   }
@@ -35,6 +36,9 @@ export class GoogleAuthService {
    * }
    * */
   public async validate(idToken: string): Promise<TokenPayload> {
+    if (!this.oauth2Client) {
+      throw new ServiceUnavailableException("google client id not specifed");
+    }
     const response = await this.oauth2Client.verifyIdToken({
       idToken,
     });
diff --git a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
new file mode 100644
index 000000000..6a83bd801
--- /dev/null
+++ b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
@@ -0,0 +1,11 @@
+import {IsString} from 'class-validator';
+import {
+  FaceBookAuthRequest,
+} from '@/data/types/frontend';
+
+export class FacebookAuthRequestValidator implements FaceBookAuthRequest {
+
+  @IsString()
+  public token: string;
+
+}
diff --git a/newback/src/modules/http/http.service.ts b/newback/src/modules/http/http.service.ts
index ff2c529ed..1dd8c04ce 100644
--- a/newback/src/modules/http/http.service.ts
+++ b/newback/src/modules/http/http.service.ts
@@ -28,6 +28,18 @@ export class HttpService {
     return responseBody;
   }
 
+   private async get<T = Record<string, any>>(url, headers: Record<string, string>): Promise<T> {
+    let requestId = ++this.requestId;
+    this.logger.debug(`GET[${requestId}]: url='${url}'; headers=${JSON.stringify(headers)} `)
+    const response = await this.nodeFetch(url, {
+      method: 'get',
+      headers
+    });
+    const responseBody = await response.json();
+    this.logger.debug(`GET[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`)
+    return responseBody;
+  }
+
   public async postUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
     const body = new URLSearchParams();
     Object.entries(data).forEach(([k,v]) => {
@@ -36,6 +48,14 @@ export class HttpService {
     return this.post<T>(url, body, {})
   }
 
+  public async getUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
+    const params = new URLSearchParams();
+    Object.entries(data).forEach(([k,v]) => {
+      params.append(k, v);
+    })
+    return this.get<T>(`${url}?${params.toString()}`, {})
+  }
+
   public async postData<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
     let body = JSON.stringify(data);
     let headers = {'Content-Type': 'application/json'};

From 734f2d6a8f0b66fa8efc4b86dca8954a133a993a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 03:29:12 +0300
Subject: [PATCH 024/221] Refactored email service added reset password works,
 test is left

---
 common/dto.ts                                 | 25 ++++++
 frontend/src/ts/message_handlers/Api.ts       | 41 ++++-----
 .../src/vue/singup/ApplyResetPassword.vue     | 18 +++-
 frontend/src/vue/singup/CaptchaComponent.vue  | 12 +--
 frontend/src/vue/singup/ResetPassword.vue     | 15 ++--
 .../database/repository/user.repository.ts    | 36 ++++++--
 .../rendered.send.restore.password.html       | 45 ++++++++++
 newback/src/fixtures/send.sign.up.email.html  | 46 ++++++++++
 .../src/modules/api/auth/auth.controller.ts   | 25 ++++++
 newback/src/modules/api/auth/auth.service.ts  | 84 ++++++++++++++++++-
 .../accept.token.request.validator.ts         | 26 ++++++
 .../send.restore.password.validator.ts        | 24 ++++++
 .../verify.token.request.validator.ts         | 13 +++
 .../email.render/email.sender.service.spec.ts | 68 +++++++++++++++
 .../email.render/email.sender.service.ts      | 61 ++++++++------
 newback/src/modules/html/html.service.ts      |  2 +-
 .../src/templates/change_password_start.html  | 45 ++++++++++
 .../src/templates/change_password_start.txt   |  4 +
 newback/src/templates/sign_up_email.html      | 10 ++-
 newback/src/templates/sign_up_email.txt       |  3 +
 newback/src/templates/token_email.html        |  9 --
 21 files changed, 528 insertions(+), 84 deletions(-)
 create mode 100644 newback/src/fixtures/rendered.send.restore.password.html
 create mode 100644 newback/src/fixtures/send.sign.up.email.html
 create mode 100644 newback/src/modules/api/auth/validators/accept.token.request.validator.ts
 create mode 100644 newback/src/modules/api/auth/validators/send.restore.password.validator.ts
 create mode 100644 newback/src/modules/api/auth/validators/verify.token.request.validator.ts
 create mode 100644 newback/src/modules/email.render/email.sender.service.spec.ts
 create mode 100644 newback/src/templates/change_password_start.html
 create mode 100644 newback/src/templates/change_password_start.txt
 create mode 100644 newback/src/templates/sign_up_email.txt
 delete mode 100644 newback/src/templates/token_email.html

diff --git a/common/dto.ts b/common/dto.ts
index 925b135eb..d6ca0734f 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -4,6 +4,31 @@ export interface SignInRequest extends CaptchaRequest{
   email?: string;
 }
 
+export interface SendRestorePasswordRequest extends CaptchaRequest {
+  username?: string;
+  email?: string;
+}
+
+export interface VerifyTokenRequest {
+  token: string;
+}
+
+export interface AcceptTokenRequest {
+  token: string;
+  password: string;
+}
+
+export interface AcceptTokenResponse extends SessionResponse {
+
+}
+
+export interface VerifyTokenResponse extends OkResponse {
+  username: string;
+}
+
+export interface SendRestorePasswordResponse extends OkResponse {
+}
+
 export interface CaptchaRequest {
   captcha?: string;
 }
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 144ba7bc5..5b194057c 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -23,10 +23,18 @@ import type {
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
-import {SignInRequest} from '@/ts/types/dto';
 import {
+  OkResponse,
+  SendRestorePasswordRequest,
+  SignInRequest
+} from '@/ts/types/dto';
+import {
+  AcceptTokenRequest,
+  AcceptTokenResponse,
   GoogleSignInResponse,
-  ValidateUserResponse
+  ValidateUserResponse,
+  VerifyTokenRequest,
+  VerifyTokenResponse
 } from '@/ts/types/backend';
 
 export default class Api extends MessageHandler {
@@ -71,10 +79,10 @@ export default class Api extends MessageHandler {
     });
   }
 
-  public async sendRestorePassword(form: HTMLFormElement): Promise<void> {
-    return this.xhr.doPost<void>({
-      url: "/send_restore_password",
-      formData: new FormData(form),
+  public async sendRestorePassword(params: SendRestorePasswordRequest): Promise<OkResponse> {
+    return this.xhr.doPost<OkResponse>({
+      url: "/auth/send-restore-password",
+      params: params as any,
     });
   }
 
@@ -247,24 +255,17 @@ export default class Api extends MessageHandler {
     });
   }
 
-  public async verifyToken(token: string): Promise<string> {
-    const value: {message: string; restoreUser: string} = await this.xhr.doPost<{message: string; restoreUser: string}>({
-      url: "/verify_token",
-      params: {token},
+  public async verifyToken(params: VerifyTokenRequest): Promise<VerifyTokenResponse> {
+    return this.xhr.doPost<VerifyTokenResponse>({
+      url: "/auth/verify-token",
+      params: params as any,
     });
-    if (value && value.message === RESPONSE_SUCCESS) {
-      return value.restoreUser;
-    }
-    throw value.message;
   }
 
-  public async acceptToken(token: string, password: string): Promise<void> {
+  public async acceptToken(params: AcceptTokenRequest): Promise<AcceptTokenResponse> {
     return this.xhr.doPost({
-      url: "/accept_token",
-      params: {
-        token,
-        password,
-      },
+      url: "/auth/accept-token",
+      params
     });
   }
 
diff --git a/frontend/src/vue/singup/ApplyResetPassword.vue b/frontend/src/vue/singup/ApplyResetPassword.vue
index ac5197337..dea556928 100644
--- a/frontend/src/vue/singup/ApplyResetPassword.vue
+++ b/frontend/src/vue/singup/ApplyResetPassword.vue
@@ -47,6 +47,7 @@ import {
 } from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
+import {LoginMessage} from '@/ts/types/messages/innerMessages';
 
 @Component({
   name: "ApplyResetPassword",
@@ -70,7 +71,8 @@ export default class ApplyResetPassword extends Vue {
     vueProperty: "error",
   })
   async created() {
-    this.restoreUser = await this.$api.verifyToken((this.$route.query.token) as string);
+    let data = await this.$api.verifyToken({token: (this.$route.query.token) as string});
+    this.restoreUser = data.username;
   }
 
   @ApplyGrowlErr({
@@ -82,9 +84,17 @@ export default class ApplyResetPassword extends Vue {
     if (this.password !== this.repeatPassword) {
       this.$store.growlError("Passords don't match");
     } else {
-      await this.$api.acceptToken(this.$route.query.token as string, this.password);
-      this.$store.growlSuccess("Password has been reset");
-      this.$router.replace("/auth/login");
+      let response = await this.$api.acceptToken({
+        token: this.$route.query.token as string,
+        password: this.password
+      });
+      const {session} = response;
+      const message: LoginMessage = {
+        action: "login",
+        handler: "router",
+        session,
+      };
+      this.$messageBus.notify(message);
     }
   }
 }
diff --git a/frontend/src/vue/singup/CaptchaComponent.vue b/frontend/src/vue/singup/CaptchaComponent.vue
index 944452eff..2f76d8059 100644
--- a/frontend/src/vue/singup/CaptchaComponent.vue
+++ b/frontend/src/vue/singup/CaptchaComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <template v-if="captcha_key">
+    <template v-if="captchaKey">
       <template v-if="isIframe">
         <iframe
           ref="iframe"
@@ -47,7 +47,7 @@ window.onloadrecaptcha = function () {
 
 @Component({name: "CaptchaComponent"})
 export default class CaptchaComponent extends Vue {
-  public captcha_key: string = RECAPTCHA_PUBLIC_KEY || "";
+  public captchaKey: string = RECAPTCHA_PUBLIC_KEY || "";
 
   public resettingAllowed: boolean = false; // Prevent resetting on initial load
 
@@ -104,7 +104,7 @@ export default class CaptchaComponent extends Vue {
   public renderCaptcha() {
     this.$emit("update:loading", false);
     this.grecaptcha.render(this.repactha, {
-      sitekey: this.captcha_key,
+      sitekey: this.captchaKey,
       theme: 'dark',
       callback: (response: string) => this.$emit("update:token", response),
     })
@@ -130,9 +130,9 @@ export default class CaptchaComponent extends Vue {
     }
   }
 
-  public async created() {
-    this.$logger.debug("initing captcha with key {}", RECAPTCHA_PUBLIC_KEY)();
-    if (this.captcha_key) {
+  public async mounted() { // should be mounted thus div to render recaptcha exists
+    this.$logger.debug("initing captcha with key {}", this.captchaKey)();
+    if (this.captchaKey) {
       if (this.isIframe) {
         this.$logger.log("Adding message listener")();
         this.event = (event: MessageEvent) => {
diff --git a/frontend/src/vue/singup/ResetPassword.vue b/frontend/src/vue/singup/ResetPassword.vue
index 763014ead..0b80fff0e 100644
--- a/frontend/src/vue/singup/ResetPassword.vue
+++ b/frontend/src/vue/singup/ResetPassword.vue
@@ -1,6 +1,5 @@
 <template>
   <form
-    ref="form"
     @submit.prevent="restorePassword"
   >
     <div>
@@ -10,13 +9,13 @@
         placeholder="Username or email"
         required
         type="text"
-        value=""
+        v-model="userNameOrEmail"
       />
       <div class="slider">
         Enter your username or email
       </div>
     </div>
-    <captcha-component v-model="running"/>
+     <captcha-component v-model:loading="running" v-model:token="captcha"/>
     <div>
       <app-submit
         :running="running"
@@ -45,13 +44,13 @@ import CaptchaComponent from "@/vue/singup/CaptchaComponent.vue";
   },
 })
 export default class ResetPassword extends Vue {
-  @Ref()
-  public form!: HTMLFormElement;
 
   @Ref()
   public repactha!: HTMLElement;
 
   public running: boolean = false;
+  public captcha: string = '';
+  public userNameOrEmail: string = '';
 
   public created() {
     this.$store.setRegHeader("Restore password");
@@ -62,7 +61,11 @@ export default class ResetPassword extends Vue {
     message: "Can't reset password",
   })
   public async restorePassword(event: Event) {
-    await this.$api.sendRestorePassword(this.form);
+    await this.$api.sendRestorePassword({
+      captcha: this.captcha,
+      email: this.userNameOrEmail.includes('@') ? this.userNameOrEmail : undefined,
+      username: !this.userNameOrEmail.includes('@') ? this.userNameOrEmail: undefined,
+    });
     this.$store.growlSuccess("A reset email has been sent to your email address, please follow the instruction in it");
   }
 }
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/data/database/repository/user.repository.ts
index a6d151658..19e5e0b5b 100644
--- a/newback/src/data/database/repository/user.repository.ts
+++ b/newback/src/data/database/repository/user.repository.ts
@@ -23,6 +23,20 @@ export class UserRepository {
   ) {
   }
 
+  public async updateUserPassword(userId: number, password: string, transaction: Transaction) {
+    await this.userAuthModel.update({password}, {
+      where: {id: userId},
+      transaction
+    })
+  }
+
+ public async markVerificationVerified(id: number, transaction: Transaction) {
+    await this.verificationModel.update({verified: true}, {
+      where: {id},
+      transaction
+    })
+  }
+
   public async createUser(data: {
     username: string;
     password: string;
@@ -84,9 +98,17 @@ export class UserRepository {
     }) != null
   }
 
-  public async createVerification(email: string, userId: number, token: string, transaction?: Transaction): Promise<void> {
+  public async getVerification(token: string, transaction?: Transaction): Promise<VerificationModel> {
+    return await this.verificationModel.findOne({
+      where: {token},
+      include: ['user'],
+      transaction
+    });
+  }
+
+  public async createVerification(email: string, userId: number, token: string, type: VerificationType, transaction: Transaction): Promise<void> {
     let verification = await this.verificationModel.create({
-      type: VerificationType.REGISTER,
+      type,
       email,
       userId,
       token,
@@ -111,21 +133,21 @@ export class UserRepository {
     }) != null
   }
 
-  public async getUserByEmail(email: string): Promise<UserAuthModel | null> {
+  public async getUserByEmail(email: string, transaction?: Transaction): Promise<UserAuthModel | null> {
     return this.userAuthModel.findOne({
       where: {email},
+      transaction,
       include: [
         'user', // LEFT OUTER JOIN "id" = "user"."id"
       ],
     })
   }
 
-  public async getUserByUserName(username: string): Promise<UserModel | null> {
+  public async getUserByUserName(username: string, includeFields: ('userAuth'|'userProfile')[], transaction?: Transaction): Promise<UserModel | null> {
     return this.userModel.findOne({
       where: {username},
-      include: [
-        'userAuth',
-      ],
+      transaction,
+      include: includeFields,
     })
   }
 
diff --git a/newback/src/fixtures/rendered.send.restore.password.html b/newback/src/fixtures/rendered.send.restore.password.html
new file mode 100644
index 000000000..5bbae78b1
--- /dev/null
+++ b/newback/src/fixtures/rendered.send.restore.password.html
@@ -0,0 +1,45 @@
+<h2 style="color: #102a80">Hello, a!</h2>
+<p><p>You have requested to change password on  <b>Pychat</b>. To proceed click on the link below. If you didn't request the password change just ignore this mail</p></p>
+<div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
+  <a href="https://localhost:8080/#/auth/proceed-reset-password?token=sfsd" style="font-size: 20px;
+    line-height: 26px;
+    border-top: 14px solid;
+    border-bottom: 14px solid;
+    border-right: 32px solid;
+    border-left: 32px solid;
+    background-color: #3c8f3b;
+    border-color: #3c8f3b;
+    display: inline-block;
+    letter-spacing: 1px;
+    min-width: 80px;
+    text-align: center;
+    color: white;
+    margin: auto;
+    font-weight: normal;
+    text-decoration: none;
+    border-radius: 4px">
+    CHANGE PASSWORD
+  </a>
+</div>
+<div style="width: 100%; text-align: center">
+  <p style="font-size: 0.9rem;
+    line-height: 20px;
+    margin: 0 auto 5px;
+    color: #aaa;
+    text-align: center;
+    max-width: 320px;
+    word-break: break-word">You may copy/paste this link into your browser:</p>
+  <a href="https://localhost:8080/#/auth/proceed-reset-password?token=sfsd"
+     style="color: #439fe0;
+        font-weight: normal;
+        text-decoration: none;
+        word-break: break-word">https://localhost:8080/#/auth/proceed-reset-password?token=sfsd</a>
+</div>
+<p>
+  <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
+</p>
+<p>
+  Link was generated Tue, 31 Mar 2020 21:00:00 GMT <br/>
+  IP: 192.168.1.1<br/>
+  Chernihiv
+</p>
diff --git a/newback/src/fixtures/send.sign.up.email.html b/newback/src/fixtures/send.sign.up.email.html
new file mode 100644
index 000000000..cb8fa1eca
--- /dev/null
+++ b/newback/src/fixtures/send.sign.up.email.html
@@ -0,0 +1,46 @@
+<h2 style="color: #102a80">Hello, a!</h2>
+<p><p>You have registered in <b>Pychat</b>. If you find any bugs or propositions you can post them
+  <a href='https://github.com/akoidan/pychat/issues/new}'>here</a>. To complete your registration please click on the link below.</p></p>
+<div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
+  <a href="https://localhost:8080/#/confirm_email?token=sfsd" style="font-size: 20px;
+    line-height: 26px;
+    border-top: 14px solid;
+    border-bottom: 14px solid;
+    border-right: 32px solid;
+    border-left: 32px solid;
+    background-color: #3c8f3b;
+    border-color: #3c8f3b;
+    display: inline-block;
+    letter-spacing: 1px;
+    min-width: 80px;
+    text-align: center;
+    color: white;
+    margin: auto;
+    font-weight: normal;
+    text-decoration: none;
+    border-radius: 4px">
+    CONFIRM EMAIL
+  </a>
+</div>
+<div style="width: 100%; text-align: center">
+  <p style="font-size: 0.9rem;
+    line-height: 20px;
+    margin: 0 auto 5px;
+    color: #aaa;
+    text-align: center;
+    max-width: 320px;
+    word-break: break-word">You may copy/paste this link into your browser:</p>
+  <a href="https://localhost:8080/#/confirm_email?token=sfsd"
+     style="color: #439fe0;
+        font-weight: normal;
+        text-decoration: none;
+        word-break: break-word">https://localhost:8080/#/confirm_email?token=sfsd</a>
+</div>
+<p>
+  <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
+</p>
+<p>
+  Link was generated Tue, 31 Mar 2020 21:00:00 GMT <br/>
+  IP: 192.168.1.1<br/>
+  Chernihiv
+</p>
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 6e315053e..70b710fa3 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -12,8 +12,10 @@ import {LoginRequestValidator} from '@/modules/api/auth/validators/login.request
 import {SignUpRequestValidator} from '@/modules/api/auth/validators/sign.up.request.validator';
 import {ValidateUserRequestValidator} from '@/modules/api/auth/validators/validate.user.request.validator';
 import {
+  AcceptTokenResponse,
   FacebookSignInResponse,
   GoogleSignInResponse,
+  SendRestorePasswordResponse,
   SignInResponse,
   SignUpResponse,
   ValidateUserEmailRequest,
@@ -23,6 +25,10 @@ import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.a
 import {CaptchaGuard} from '@/modules/captcha';
 import {ValidateEmailRequestValidator} from '@/modules/api/auth/validators/validate.email.request.validator';
 import {FacebookAuthRequestValidator} from '@/modules/api/auth/validators/facebook.auth.request.validator';
+import {SendRestorePasswordValidator} from '@/modules/api/auth/validators/send.restore.password.validator';
+import {VerifyTokenRequestValidator} from '@/modules/api/auth/validators/verify.token.request.validator';
+import {VerifyTokenResponse} from '@/data/types/frontend';
+import {AcceptTokenRequestValidator} from '@/modules/api/auth/validators/accept.token.request.validator';
 
 @Controller({
   path: '/api/auth'
@@ -63,6 +69,25 @@ export class AuthController {
     }
   }
 
+ @UseGuards(CaptchaGuard)
+ @Post('/send-restore-password')
+  public async sendRestorePassword(@Body() body: SendRestorePasswordValidator, @Ip() ip: string): Promise<SendRestorePasswordResponse> {
+    await this.authservice.sendRestorePassword(body, ip);
+    return {
+      ok: true
+    }
+  }
+
+ @Post('/verify-token')
+  public async verifyToken(@Body() body: VerifyTokenRequestValidator): Promise<VerifyTokenResponse> {
+    return  this.authservice.verifyToken(body.token);
+  }
+
+ @Post('/accept-token')
+  public async acceptToken(@Body() body: AcceptTokenRequestValidator): Promise<AcceptTokenResponse> {
+    return  this.authservice.acceptToken(body);
+  }
+
   @Post('/validate-user')
   public async validateUser(@Body() body: ValidateUserRequestValidator): Promise<ValidateUserResponse> {
     await this.authservice.validateUser(body.username);
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 7bc1e0fea..c9e1da545 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -1,4 +1,5 @@
 import {
+  BadRequestException,
   ConflictException,
   Injectable,
   Logger,
@@ -7,15 +8,20 @@ import {
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {
+  AcceptTokenRequest,
+  AcceptTokenResponse,
   FaceBookAuthRequest,
   FacebookSignInResponse,
   Gender,
   GoogleAuthRequest,
   GoogleSignInResponse,
+  SendRestorePasswordRequest,
   SignInRequest,
   SignInResponse,
   SignUpRequest,
-  SignUpResponse
+  SignUpResponse,
+  VerificationType,
+  VerifyTokenResponse
 } from '@/data/types/frontend';
 import {RoomRepository} from '@/data/database/repository/room.repository';
 import {
@@ -31,6 +37,7 @@ import {TokenPayload} from 'google-auth-library';
 import {generateUserName} from '@/data/utils/helpers';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
 import {FacebookGetUserResponse} from '@/data/types/api';
+import {VerificationModel} from '@/data/database/model/verification.model';
 
 @Injectable()
 export class AuthService {
@@ -131,7 +138,7 @@ export class AuthService {
       userId = result?.user?.id;
       password = result?.password;
     } else {
-      const result = await this.userRepository.getUserByUserName(body.username);
+      const result = await this.userRepository.getUserByUserName(body.username, ['userAuth']);
       userId = result?.id;
       password = result?.userAuth?.password;
     }
@@ -152,7 +159,7 @@ export class AuthService {
       await this.sequelize.transaction(async(t) => {
         let token = await this.passwordService.generateRandomString(32);
         this.logger.log(`Generated token for userId ${userId}: ${token}`)
-        await this.userRepository.createVerification(email, userId, token, t)
+        await this.userRepository.createVerification(email, userId, token, VerificationType.REGISTER, t)
         await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ip)
       });
     } catch (e) {
@@ -204,4 +211,75 @@ export class AuthService {
     await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, transaction);
     return userId;
   }
+
+  private doTokenVerification(data: VerificationModel): void {
+    if (!data) {
+      throw new BadRequestException("Invalid token");
+    }
+    if (data.type != VerificationType.PASSWORD) {
+      throw new BadRequestException("Invalid operation");
+    }
+    if (data.verified) {
+      throw new BadRequestException("This token is already used");
+    }
+    if (Date.now() - data.createdAt.getTime() > 24 * 3600 * 1000) { // 24 hours
+      throw new BadRequestException("This token is already expired");
+    }
+  }
+
+  public async verifyToken(token: string): Promise<VerifyTokenResponse> {
+    let verificationModel: VerificationModel = await this.userRepository.getVerification(token);
+    //https://pychat.org/#/auth/proceed-reset-password?token=evhv0zum3l8gavzql4xk5u16q2h9gqd2
+    this.doTokenVerification(verificationModel)
+    return {
+      ok: true,
+      username: verificationModel.user.username
+    }
+  }
+
+  public async sendRestorePassword(body: SendRestorePasswordRequest, ip: string): Promise<void> {
+    return this.sequelize.transaction(async(t) => {
+      let email, userId, username;
+      if (body.email) {
+        const user = await this.userRepository.getUserByEmail(body.email, t);
+        if (!user) {
+          throw new BadRequestException("User with this email doesnt exit");
+        }
+        username = user.user.username;
+        userId = user.id;
+        email = body.email;
+      } else if (body.username) {
+        const user = await this.userRepository.getUserByUserName(body.username, ['userAuth'], t);
+        if (!user) {
+          throw new BadRequestException("User with this username doesnt exit");
+        }
+        if (!user.userAuth.email) {
+          throw new BadRequestException("This user didnt specify an email");
+        }
+        email = user.userAuth.email;
+        username = user.username;
+        userId = user.id;
+      }
+      let token: string = await this.passwordService.generateRandomString(32);
+      this.logger.log(`Generated token='${token}' to restore user email='${email}'`);
+      await this.userRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t)
+      await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ip)
+    });
+  }
+
+  public async acceptToken(body: AcceptTokenRequest): Promise<AcceptTokenResponse> {
+    return this.sequelize.transaction(async(t) => {
+      let verificationModel: VerificationModel = await this.userRepository.getVerification(body.token, t);
+      this.doTokenVerification(verificationModel);
+      let password = await this.passwordService.createPassword(body.password);
+      this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`);
+      await this.userRepository.updateUserPassword(verificationModel.userId, password, t)
+      await this.userRepository.markVerificationVerified(verificationModel.id, t);
+      let session = await this.createAndSaveSession(verificationModel.userId);
+      let result: AcceptTokenResponse = {
+        session
+      }
+      return result;
+    })
+  }
 }
diff --git a/newback/src/modules/api/auth/validators/accept.token.request.validator.ts b/newback/src/modules/api/auth/validators/accept.token.request.validator.ts
new file mode 100644
index 000000000..537ea793f
--- /dev/null
+++ b/newback/src/modules/api/auth/validators/accept.token.request.validator.ts
@@ -0,0 +1,26 @@
+import {
+  IsEmail,
+  IsString,
+  Length,
+  Matches,
+  ValidateIf,
+} from 'class-validator';
+import {
+  AcceptTokenRequest,
+  VerifyTokenRequest
+} from '@/data/types/frontend';
+
+
+export class AcceptTokenRequestValidator implements AcceptTokenRequest {
+  @IsString()
+  public token: string;
+
+  @IsString()
+  @Length(3, 128, {
+    message: "Passwords should contain 3-64 symbols"
+  })
+  @Matches(/^\S+$/, {
+    message: `Password can't contain whitespaces`
+  })
+  public password: string;
+}
diff --git a/newback/src/modules/api/auth/validators/send.restore.password.validator.ts b/newback/src/modules/api/auth/validators/send.restore.password.validator.ts
new file mode 100644
index 000000000..bd5aeed21
--- /dev/null
+++ b/newback/src/modules/api/auth/validators/send.restore.password.validator.ts
@@ -0,0 +1,24 @@
+import {
+  IsEmail,
+  IsString,
+  Matches,
+  ValidateIf,
+} from 'class-validator';
+import {SendRestorePasswordRequest} from '@/data/types/frontend';
+
+export class SendRestorePasswordValidator implements SendRestorePasswordRequest {
+  @ValidateIf(o => !o.email || o.username)
+  @IsString()
+  @Matches(/^\S+$/, {
+    message: `Username can't contain whitespaces`
+  })
+  public username?: string;
+
+  @ValidateIf(o => !o.username || o.email)
+  @IsString()
+  @IsEmail()
+  @Matches(/^\S+$/, {
+    message: `email can't contain whitespaces`
+  })
+  public email?: string;
+}
diff --git a/newback/src/modules/api/auth/validators/verify.token.request.validator.ts b/newback/src/modules/api/auth/validators/verify.token.request.validator.ts
new file mode 100644
index 000000000..4364cc9b9
--- /dev/null
+++ b/newback/src/modules/api/auth/validators/verify.token.request.validator.ts
@@ -0,0 +1,13 @@
+import {
+  IsEmail,
+  IsString,
+  Matches,
+  ValidateIf,
+} from 'class-validator';
+import {VerifyTokenRequest} from '@/data/types/frontend';
+
+
+export class VerifyTokenRequestValidator implements VerifyTokenRequest {
+  @IsString()
+  public token: string;
+}
diff --git a/newback/src/modules/email.render/email.sender.service.spec.ts b/newback/src/modules/email.render/email.sender.service.spec.ts
new file mode 100644
index 000000000..123153c2a
--- /dev/null
+++ b/newback/src/modules/email.render/email.sender.service.spec.ts
@@ -0,0 +1,68 @@
+import {HtmlService} from '@/modules/html/html.service';
+import {EmailSenderService} from '@/modules/email.render/email.sender.service';
+import {
+  Test,
+  TestingModule
+} from '@nestjs/testing';
+import {LoggerModule} from '@/modules/logger/logger.module';
+import {MailerService} from '@nestjs-modules/mailer';
+import {ConfigModule} from '@/modules/config/config.module';
+import {promisify} from 'util';
+import {readFile} from 'fs';
+import {resolve} from 'path';
+
+describe('EmailSenderService', () => {
+
+  let sender: EmailSenderService;
+  let moduleFixture: TestingModule;
+  let mailer: MailerService;
+  beforeAll(
+    async() => {
+
+    moduleFixture = await Test.createTestingModule({
+      imports: [
+        LoggerModule,
+        ConfigModule
+      ],
+      providers: [
+        {
+          provide: MailerService,
+          useValue: { sendMail: (a) => console.log(a)}
+        },
+        HtmlService,
+        EmailSenderService,
+      ]
+    }).compile();
+    sender = moduleFixture.get(EmailSenderService);
+    mailer = moduleFixture.get(MailerService);
+  })
+  afterAll(async () => {
+    await moduleFixture.close()
+  })
+
+  beforeAll(() => {
+    jest.clearAllMocks();
+  })
+
+  describe('sendRestorePasswordEmail', () => {
+    it('should render', async () => {
+      let spy = jest.spyOn(mailer, 'sendMail');
+      jest.useFakeTimers('modern');
+      jest.setSystemTime(new Date(2020, 3, 1));
+      await sender.sendRestorePasswordEmail('a', 3 , 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
+      const content = await promisify(readFile)(resolve(__dirname, '..', '..', 'fixtures', 'rendered.send.restore.password.html'), 'utf-8');
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: content,  "subject": "Confirm pychat registration", "text": expect.any(String)}))
+    });
+  });
+
+   describe('sendSignUpEmail', () => {
+    it('should render', async () => {
+      let spy = jest.spyOn(mailer, 'sendMail');
+      jest.useFakeTimers('modern');
+      jest.setSystemTime(new Date(2020, 3, 1));
+      await sender.sendSignUpEmail('a', 3 , 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
+      const content = await promisify(readFile)(resolve(__dirname, '..', '..', 'fixtures', 'send.sign.up.email.html'), 'utf-8');
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: content,  "subject": "Confirm pychat registration", "text": expect.any(String)}))
+    });
+  });
+});
diff --git a/newback/src/modules/email.render/email.sender.service.ts b/newback/src/modules/email.render/email.sender.service.ts
index 6b8ea57b8..fc9c4e0ff 100644
--- a/newback/src/modules/email.render/email.sender.service.ts
+++ b/newback/src/modules/email.render/email.sender.service.ts
@@ -1,6 +1,6 @@
 import {
-	Injectable,
-	Logger
+  Injectable,
+  Logger
 } from '@nestjs/common';
 import {HtmlService} from '@/modules/html/html.service';
 import {MailerService} from '@nestjs-modules/mailer';
@@ -16,37 +16,44 @@ export class EmailSenderService {
   ) {
   }
 
-  public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
+  public async sendRestorePasswordEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
+    let context = {
+      username,
+      timeCreated: (new Date() as any).toGMTString(),
+      magicLink: `${this.configService.getConfig().frontend.address}/#/auth/proceed-reset-password?token=${token}`,
+      ip,
+      site: this.configService.getConfig().frontend.address,
+      ipInfo
+    };
+    await this.sendEmail('change_password_start', userId, email, 'Confirm pychat registration', context);
+  }
+
+  private async sendEmail(templateName: string, userId, email, subject: string, context: Record<string, string>) {
     if (!this.configService.getConfig().email) {
-        this.loggerService.warn(`Email to userId ${userId} ${email} won't be sent since email settings is not set in config`);
-        return
+      this.loggerService.warn(`Email to userId ${userId} ${email} won't be sent since email settings is not set in config`);
+      return
     }
-    const magicLink = `${this.configService.getConfig().frontend.address}/#/confirm_email?token=${token}`;
-    let issueReportLink = this.configService.getConfig().frontend.issueReportLink;
-    const text = `Hi ${username}, you have registered pychat` +
-      `\nTo complete your registration please click on the url bellow: ${magicLink}` +
-      `\n\nIf you find any bugs or propositions you can post them ${issueReportLink}`;
+    let html = await this.htmlService.renderTemplate(`${templateName}.html`, context);
+    let text = await this.htmlService.renderTemplate(`${templateName}.txt`, context);
+    this.loggerService.log(`Sending email to userId ${userId} ${email}`)
+    // await this.mailerService.sendMail({
+    //   to: email,
+    //   html,
+    //   text,
+    //   subject
+    // })
+  }
 
-    let signUpEmail = await this.htmlService.renderTemplate('sign_up_email', {
-      issueReportLink,
-      magicLink,
+  public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
+    let context: Record<string, string> = {
+      issueReportLink: this.configService.getConfig().frontend.issueReportLink,
+      magicLink: `${this.configService.getConfig().frontend.address}/#/confirm_email?token=${token}`,
       username,
-      btnText: "Confirm chat registration",
-    })
-    const html = await this.htmlService.renderTemplate('token_email', {
-      signUpEmail,
       ip,
-      timeCreated: new Date().getTime(),
+      timeCreated: (new Date() as any).toGMTString(),
       ipInfo
-    })
-    this.loggerService.log(`Sending verification email to userId ${userId} ${email}`)
-    await this.mailerService.sendMail({
-      to: email,
-      html,
-      text,
-      subject: 'Confirm pychat registration'
-    })
-
+    };
+    await this.sendEmail('sign_up_email', userId, email, 'Confirm pychat registration', context);
   }
 
 }
diff --git a/newback/src/modules/html/html.service.ts b/newback/src/modules/html/html.service.ts
index 3999f25f5..27aaa44f0 100644
--- a/newback/src/modules/html/html.service.ts
+++ b/newback/src/modules/html/html.service.ts
@@ -18,7 +18,7 @@ export class HtmlService {
   }
 
   public async renderTemplate(template: string, params: Record<string, string | number>) {
-    let filePath = ['src', 'templates', `${template}.html`].join(sep);
+    let filePath = ['src', 'templates', `${template}`].join(sep);
     const content = await promisify(readFile)(filePath, 'utf-8');
     return this.replaceTemplate(content, params);
   }
diff --git a/newback/src/templates/change_password_start.html b/newback/src/templates/change_password_start.html
new file mode 100644
index 000000000..bcaba769b
--- /dev/null
+++ b/newback/src/templates/change_password_start.html
@@ -0,0 +1,45 @@
+<h2 style="color: #102a80">Hello, {{ username }}!</h2>
+<p><p>You have requested to change password on  <b>Pychat</b>. To proceed click on the link below. If you didn't request the password change just ignore this mail</p></p>
+<div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
+  <a href="{{ magicLink }}" style="font-size: 20px;
+    line-height: 26px;
+    border-top: 14px solid;
+    border-bottom: 14px solid;
+    border-right: 32px solid;
+    border-left: 32px solid;
+    background-color: #3c8f3b;
+    border-color: #3c8f3b;
+    display: inline-block;
+    letter-spacing: 1px;
+    min-width: 80px;
+    text-align: center;
+    color: white;
+    margin: auto;
+    font-weight: normal;
+    text-decoration: none;
+    border-radius: 4px">
+    CHANGE PASSWORD
+  </a>
+</div>
+<div style="width: 100%; text-align: center">
+  <p style="font-size: 0.9rem;
+    line-height: 20px;
+    margin: 0 auto 5px;
+    color: #aaa;
+    text-align: center;
+    max-width: 320px;
+    word-break: break-word">You may copy/paste this link into your browser:</p>
+  <a href="{{ magicLink }}"
+     style="color: #439fe0;
+        font-weight: normal;
+        text-decoration: none;
+        word-break: break-word">{{ magicLink }}</a>
+</div>
+<p>
+  <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
+</p>
+<p>
+  Link was generated {{ timeCreated }} <br/>
+  IP: {{ ip }}<br/>
+  {{ ipInfo }}
+</p>
diff --git a/newback/src/templates/change_password_start.txt b/newback/src/templates/change_password_start.txt
new file mode 100644
index 000000000..69d2f0cf7
--- /dev/null
+++ b/newback/src/templates/change_password_start.txt
@@ -0,0 +1,4 @@
+Dear {{ username }}.
+You requested to change a password on {{ site }}.
+To proceed click on the link {{ magicLink }}
+If you didn't request the password change just ignore this mail.
diff --git a/newback/src/templates/sign_up_email.html b/newback/src/templates/sign_up_email.html
index e1fba2af5..a89137d60 100644
--- a/newback/src/templates/sign_up_email.html
+++ b/newback/src/templates/sign_up_email.html
@@ -19,7 +19,7 @@ <h2 style="color: #102a80">Hello, {{ username }}!</h2>
     font-weight: normal;
     text-decoration: none;
     border-radius: 4px">
-    {{ btnText }}
+    CONFIRM EMAIL
   </a>
 </div>
 <div style="width: 100%; text-align: center">
@@ -36,3 +36,11 @@ <h2 style="color: #102a80">Hello, {{ username }}!</h2>
         text-decoration: none;
         word-break: break-word">{{ magicLink }}</a>
 </div>
+<p>
+  <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
+</p>
+<p>
+  Link was generated {{ timeCreated }} <br/>
+  IP: {{ ip }}<br/>
+  {{ ipInfo }}
+</p>
diff --git a/newback/src/templates/sign_up_email.txt b/newback/src/templates/sign_up_email.txt
new file mode 100644
index 000000000..d9b2b81b0
--- /dev/null
+++ b/newback/src/templates/sign_up_email.txt
@@ -0,0 +1,3 @@
+Hi {{ username }} you have registered pychat
+To complete your registration please click on the url bellow: {{ magicLink }}
+If you find any bugs or propositions you can post them {{ issueReportLink }}
diff --git a/newback/src/templates/token_email.html b/newback/src/templates/token_email.html
deleted file mode 100644
index 6068498d3..000000000
--- a/newback/src/templates/token_email.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ signUpEmail }}
-<p>
-  <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
-</p>
-<p>
-  Link was generated {{ timeCreated }} <br/>
-  IP: {{ ip }}<br/>
-  {{ ipInfo }}
-</p>

From 0822767327d63bd3df5026e0bdfd346c1b301fdf Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 13:31:39 +0300
Subject: [PATCH 025/221] save changes + email

---
 frontend/package.json                             |  2 +-
 frontend/src/ts/instances/routerInstance.ts       | 14 +++++++-------
 frontend/src/ts/message_handlers/Api.ts           | 10 ++++++----
 frontend/src/vue/singup/AuthPage.vue              |  4 ++--
 frontend/src/vue/singup/{Login.vue => SignIn.vue} |  8 ++++----
 frontend/src/vue/singup/SignUp.vue                | 15 ++++++++++-----
 newback/src/modules/api/auth/auth.module.spec.ts  | 12 ++++++++++++
 .../auth/validators/sign.up.request.validator.ts  |  3 +--
 .../validators/validate.user.request.validator.ts |  2 +-
 .../modules/email.render/email.sender.service.ts  | 12 ++++++------
 10 files changed, 50 insertions(+), 32 deletions(-)
 rename frontend/src/vue/singup/{Login.vue => SignIn.vue} (94%)

diff --git a/frontend/package.json b/frontend/package.json
index 82e1395e3..50e1d58f7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Opensource chat",
   "scripts": {
-    "start": "vite --config build/vite.config.ts",
+    "start": "vite --config build/vite.config.ts --force",
     "build": "VITE_LIGHT=true vite --config build/vite.config.ts build",
     "build:light": "VITE_LIGHT=true vite --config build/vite.config.ts build",
     "start:lint": "VITE_LINT=true vite --config build/vite.config.ts",
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 76133166e..303f4c307 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -8,7 +8,7 @@ import MainPage from "@/vue/pages/MainPage.vue";
 import ChannelsPage from "@/vue/pages/ChannelsPage.vue";
 import AuthPage from "@/vue/singup/AuthPage.vue";
 import ResetPassword from "@/vue/singup/ResetPassword.vue";
-import Login from "@/vue/singup/Login.vue";
+import SignIn from "@/vue/singup/SignIn.vue";
 import SignUp from "@/vue/singup/SignUp.vue";
 import UserProfile from "@/vue/pages/UserProfile.vue";
 import UserProfileChangePassword from "@/vue/pages/UserProfileChangePassword.vue";
@@ -56,7 +56,7 @@ export function routerFactory(sub: Subscription) {
         component: MainPage,
         beforeEnter: (to, from) => {
           if (!sessionHolder.session) {
-            return "/auth/login";
+            return "/auth/sign-in";
           }
         },
         children: [
@@ -157,11 +157,11 @@ export function routerFactory(sub: Subscription) {
         children: [
           {
             path: "",
-            redirect: "/auth/login",
+            redirect: "/auth/sign-in",
           },
           {
-            path: "login",
-            component: Login,
+            path: "sign-in",
+            component: SignIn,
           },
           {
             path: "reset-password",
@@ -188,7 +188,7 @@ export function routerFactory(sub: Subscription) {
 
   router.beforeEach((to, from, next) => {
     if (to.matched[0]?.meta?.loginRequired && !sessionHolder.session) {
-      next("/auth/login");
+      next("/auth/sign-in");
     } else {
       if (to?.meta?.beforeEnter) {
         (to.meta.beforeEnter as any)(to, from, next);
@@ -207,7 +207,7 @@ export function routerFactory(sub: Subscription) {
     };
 
     logout(a: LogoutMessage) {
-      router.replace("/auth/login");
+      router.replace("/auth/sign-in");
     }
 
     navigate(a: RouterNavigateMessage) {
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 5b194057c..716e73968 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -26,12 +26,14 @@ import type Subscription from "@/ts/classes/Subscription";
 import {
   OkResponse,
   SendRestorePasswordRequest,
-  SignInRequest
+  SignInRequest,
+  SignUpRequest
 } from '@/ts/types/dto';
 import {
   AcceptTokenRequest,
   AcceptTokenResponse,
   GoogleSignInResponse,
+  SignUpResponse,
   ValidateUserResponse,
   VerifyTokenRequest,
   VerifyTokenResponse
@@ -55,7 +57,7 @@ export default class Api extends MessageHandler {
     this.xhr = xhr;
   }
 
-  public async login(body: SignInRequest): Promise<SessionResponse> {
+  public async signIn(body: SignInRequest): Promise<SessionResponse> {
     return this.xhr.doPost<SessionResponse>({
       url: "/auth/sign-in",
       params: {...body}
@@ -86,7 +88,7 @@ export default class Api extends MessageHandler {
     });
   }
 
-  public async register(data: SignInRequest): Promise<SessionResponse> {
+  public async signUp(data: SignUpRequest): Promise<SignUpResponse> {
     return this.xhr.doPost<SessionResponse>({
       url: "/auth/sign-up",
       params: data as any,
@@ -265,7 +267,7 @@ export default class Api extends MessageHandler {
   public async acceptToken(params: AcceptTokenRequest): Promise<AcceptTokenResponse> {
     return this.xhr.doPost({
       url: "/auth/accept-token",
-      params
+      params: params as any,
     });
   }
 
diff --git a/frontend/src/vue/singup/AuthPage.vue b/frontend/src/vue/singup/AuthPage.vue
index 45eb3fe2e..0f308db47 100644
--- a/frontend/src/vue/singup/AuthPage.vue
+++ b/frontend/src/vue/singup/AuthPage.vue
@@ -4,7 +4,7 @@
       <router-link to="/auth/sign-up">
         Sign Up
       </router-link>
-      <router-link to="/auth/login">
+      <router-link to="/auth/sign-in">
         Log In
       </router-link>
     </div>
@@ -38,7 +38,7 @@ export default class AuthPage extends Vue {
   @ApplyGrowlErr({message: "Auto-registration error"})
   public async created() {
     if (AUTO_REGISTRATION) {
-      const {session} = await this.$api.register({
+      const {session} = await this.$api.signUp({
         username: this.getRandom(),
         password: this.getRandom(),
       });
diff --git a/frontend/src/vue/singup/Login.vue b/frontend/src/vue/singup/SignIn.vue
similarity index 94%
rename from frontend/src/vue/singup/Login.vue
rename to frontend/src/vue/singup/SignIn.vue
index cf0f99baa..b364a7375 100644
--- a/frontend/src/vue/singup/Login.vue
+++ b/frontend/src/vue/singup/SignIn.vue
@@ -60,14 +60,14 @@ import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import SocialAuthSignUp from "@/vue/singup/SocialAuthSignUp.vue";
 
 @Component({
-  name: "Login",
+  name: "SignIn",
   components: {
     SocialAuthSignUp,
     CaptchaComponent,
     AppSubmit,
   },
 })
-export default class Login extends Vue {
+export default class SignIn extends Vue {
   @Ref()
   public form!: HTMLFormElement;
 
@@ -87,12 +87,12 @@ export default class Login extends Vue {
   public async login() {
     let response;
     if (this.username?.includes('@')) {
-      response = await this.$api.login({
+      response = await this.$api.signIn({
         email: this.username,
         password: this.password,
       });
     } else {
-      response = await this.$api.login({
+      response = await this.$api.signIn({
         username: this.username,
         password: this.password,
         captcha: this.captcha,
diff --git a/frontend/src/vue/singup/SignUp.vue b/frontend/src/vue/singup/SignUp.vue
index 6a2ead6bf..e673e6e2c 100644
--- a/frontend/src/vue/singup/SignUp.vue
+++ b/frontend/src/vue/singup/SignUp.vue
@@ -92,17 +92,17 @@
         @blur="sexFoc = true"
       >
         <option
-          value="Secret"
+          :value="signUpSexOther"
           disabled
           selected
           hidden
         >
           Gender
         </option>
-        <option value="Male">
+        <option :value="signUpSexMale">
           Male
         </option>
-        <option value="Female">
+        <option :value="signUpSexFemale">
           Female
         </option>
       </select>
@@ -146,6 +146,9 @@ export default class SignUp extends Vue {
 
   @Prop() public fb_app_id!: string;
 
+  signUpSexMale = Gender.MALE;
+  signUpSexFemale = Gender.FEMALE;
+  signUpSexOther = Gender.OTHER;
 
   running: boolean = false;
 
@@ -327,7 +330,7 @@ export default class SignUp extends Vue {
 
   sexFoc: boolean = true;
 
-  sex: string = "";
+  sex: string = Gender.OTHER;
 
   sexDescription: string = "Need a help?";
 
@@ -349,9 +352,11 @@ export default class SignUp extends Vue {
     message: "Can't sign up"
   })
   async register() {
-    const {session} = await this.$api.register({
+    const {session} = await this.$api.signUp({
       username: this.username,
       password: this.password,
+      email: this.email,
+
     });
     const message: LoginMessage = {
       action: "login",
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index d5887f507..1470576ec 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -507,6 +507,18 @@ describe('AuthModule', () => {
           "statusCode": 400,
         });
     });
+    it('should give error on invalid and also correct ones', async() => {
+      await request
+        .post('/api/auth/validate-user').send({
+          username: '%asfasdf',
+        }).expect(400, {
+          "error": "Bad Request",
+          "message": [
+            "Username can only contain latin characters, numbers and symbols '-' '_'",
+          ],
+          "statusCode": 400,
+        });
+    });
     it('should give error if username has great length', async() => {
       await request
         .post('/api/auth/validate-user').send({
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index 7f12a0f2f..ebebb89cf 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -19,12 +19,11 @@ export class SignUpRequestValidator implements SignUpRequest {
   @Length(1, MAX_USERNAME_LENGTH, {
     message: `Username should be 1-${MAX_USERNAME_LENGTH} characters`
   })
-  @Matches(/[a-zA-Z-_0-9]+/, {
+  @Matches(/^[a-zA-Z-_0-9]+$/, {
     message: `Username can only contain latin characters, numbers and symbols '-' '_'`
   })
   public username: string;
 
-
   @IsString()
   @Length(3, 128, {
     message: "Passwords should contain 3-64 symbols"
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index 4c5087959..777323f73 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -11,7 +11,7 @@ export class ValidateUserRequestValidator implements ValidateUserRequest {
   @Length(1, MAX_USERNAME_LENGTH, {
     message: `Username should be 1-${MAX_USERNAME_LENGTH} characters`
   })
-  @Matches(/[a-zA-Z-_0-9]+/, {
+  @Matches(/^[a-zA-Z-_0-9]+$/, {
     message: `Username can only contain latin characters, numbers and symbols '-' '_'`
   })
   public username: string;
diff --git a/newback/src/modules/email.render/email.sender.service.ts b/newback/src/modules/email.render/email.sender.service.ts
index fc9c4e0ff..d854d8235 100644
--- a/newback/src/modules/email.render/email.sender.service.ts
+++ b/newback/src/modules/email.render/email.sender.service.ts
@@ -36,12 +36,12 @@ export class EmailSenderService {
     let html = await this.htmlService.renderTemplate(`${templateName}.html`, context);
     let text = await this.htmlService.renderTemplate(`${templateName}.txt`, context);
     this.loggerService.log(`Sending email to userId ${userId} ${email}`)
-    // await this.mailerService.sendMail({
-    //   to: email,
-    //   html,
-    //   text,
-    //   subject
-    // })
+    await this.mailerService.sendMail({
+      to: email,
+      html,
+      text,
+      subject
+    })
   }
 
   public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {

From 809df2f53363b60aa6cdd1f4da04e37d648c1335 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 13:35:11 +0300
Subject: [PATCH 026/221] added ci newback

---
 .github/workflows/frontend.yml |  6 +++---
 .github/workflows/newback.yml  | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/newback.yml

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 6882a8a13..244d4099d 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -3,11 +3,11 @@ name: FE:pychat.org
 on:
   push:
     branches: [ master ]
-    paths: 
+    paths:
       - 'frontend/**'
 
 jobs:
-  upload_frontend:
+  upload-frontend:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -20,7 +20,7 @@ jobs:
           path: |
             frontend/node_modules
             frontend/yarn-cache
-          key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{ hashFiles('frontend/yarn.lock') }}
       - name: Install npm dependencies
         run: |
           cd frontend 
diff --git a/.github/workflows/newback.yml b/.github/workflows/newback.yml
new file mode 100644
index 000000000..916aaabc4
--- /dev/null
+++ b/.github/workflows/newback.yml
@@ -0,0 +1,30 @@
+name: NEWBE:pychat.org
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'newback/**'
+
+jobs:
+  test-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2-beta
+        with:
+          node-version: 'v16.14'
+      - name: Cache multiple paths
+        uses: actions/cache@v2
+        with:
+          path: |
+            newback/node_modules
+            newback/yarn-cache
+          key: ${{ runner.os }}-${{ hashFiles('newback/yarn.lock') }}
+      - name: Install npm dependencies
+        run: |
+          cd newback 
+          yarn config set cache-folder `pwd`/yarn-cache
+          yarn install --frozen-lockfile
+      - name: Run tests
+        run: cd newback && yarn test

From 6f8d8bc45087aa079d2bfd0915ea7ca8ff845b73 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 13:35:57 +0300
Subject: [PATCH 027/221] fix

---
 .github/workflows/newback.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/newback.yml b/.github/workflows/newback.yml
index 916aaabc4..13d1c56f3 100644
--- a/.github/workflows/newback.yml
+++ b/.github/workflows/newback.yml
@@ -2,7 +2,7 @@ name: NEWBE:pychat.org
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, nestjs ]
     paths:
       - 'newback/**'
 

From d1ece96d7ff96d9c4e80ef6774979cd3845eb5bc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 13:37:26 +0300
Subject: [PATCH 028/221] trigger

---
 newback/src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newback/src/main.ts b/newback/src/main.ts
index 1cf017348..481403e67 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -11,7 +11,7 @@ import {promisify} from 'util';
 
 async function bootstrap() {
   const key  = await promisify(readFile)(config.application.keyPath, 'utf-8');
-  const cert =await promisify(readFile)(config.application.crtPath, 'utf-8');
+  const cert = await promisify(readFile)(config.application.crtPath, 'utf-8');
 
   const app = await NestFactory.create(AppModule, {
     logger: new ConsoleLogger(),

From 5b5d47839ef594527bb564a1570a46700fdb38a5 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 13:57:57 +0300
Subject: [PATCH 029/221] Fix

---
 newback/package.json                          |  5 ++---
 .../src/modules/api/auth/auth.module.spec.ts  |  4 ++--
 newback/src/modules/api/auth/auth.module.ts   |  2 +-
 newback/src/modules/api/auth/auth.service.ts  |  4 ++--
 .../{email.render => email}/email.module.ts   |  6 +++---
 .../email.service.spec.ts}                    | 10 ++++-----
 .../email.service.ts}                         |  2 +-
 newback/src/modules/html/html.service.spec.ts | 21 -------------------
 8 files changed, 16 insertions(+), 38 deletions(-)
 rename newback/src/modules/{email.render => email}/email.module.ts (74%)
 rename newback/src/modules/{email.render/email.sender.service.spec.ts => email/email.service.spec.ts} (89%)
 rename newback/src/modules/{email.render/email.sender.service.ts => email/email.service.ts} (98%)

diff --git a/newback/package.json b/newback/package.json
index ccba4be56..4a4cf0e19 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -9,9 +9,8 @@
     "migrate": "ts-node  -r tsconfig-paths/register ./src/migration.runner.ts ",
     "build": "nest build",
     "start": "nest start",
-    "test": "jest --coverage --runInBand --detectOpenHandles --testTimeout=10000 --passWithNoTests",
-    "start:dev": "node --inspect=0.0.0.0 dist/src/main",
-    "start:debug": "nest start --debug --watch"
+    "test:debug": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000",
+    "test": "jest --runInBand --coverage --coverageReporters text"
   },
   "dependencies": {
     "@nestjs-modules/mailer": "^1.6.1",
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 1470576ec..eeaa9f392 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -12,7 +12,7 @@ import {PasswordService} from '@/modules/api/auth/password.service';
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {RoomRepository} from '@/data/database/repository/room.repository';
 import {RedisService} from '@/data/redis/RedisService';
-import {EmailSenderService} from '@/modules/email.render/email.sender.service';
+import {EmailService} from '@/modules/email/email.service';
 import {MailerService} from '@nestjs-modules/mailer';
 import {Sequelize} from 'sequelize-typescript';
 import {HtmlService} from '@/modules/html/html.service';
@@ -81,7 +81,7 @@ describe('AuthModule', () => {
         PasswordService,
         AuthService,
         HtmlService,
-        EmailSenderService,
+        EmailService,
         FacebookAuthService,
         {
           provide: MailerService,
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index ff994a751..e75399d34 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -6,7 +6,7 @@ import {AuthController} from '@/modules/api/auth/auth.controller';
 import {AuthService} from '@/modules/api/auth/auth.service';
 import {DatabaseModule} from '@/data/database/database.module';
 import {RedisService} from '@/data/redis/RedisService';
-import {EmailModule} from '@/modules/email.render/email.module';
+import {EmailModule} from '@/modules/email/email.module';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {OAuth2Client} from 'google-auth-library';
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index c9e1da545..c7b6d4853 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -29,7 +29,7 @@ import {
   MAX_USERNAME_LENGTH
 } from '@/data/utils/consts';
 import {RedisService} from '@/data/redis/RedisService';
-import {EmailSenderService} from '@/modules/email.render/email.sender.service';
+import {EmailService} from '@/modules/email/email.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
@@ -47,7 +47,7 @@ export class AuthService {
     private readonly roomRepository: RoomRepository,
     private readonly passwordService: PasswordService,
     private readonly redisService: RedisService,
-    private readonly emailService: EmailSenderService,
+    private readonly emailService: EmailService,
     private readonly googleAuthService: GoogleAuthService,
     private readonly facebookService: FacebookAuthService,
     private readonly sequelize: Sequelize,
diff --git a/newback/src/modules/email.render/email.module.ts b/newback/src/modules/email/email.module.ts
similarity index 74%
rename from newback/src/modules/email.render/email.module.ts
rename to newback/src/modules/email/email.module.ts
index 4c6c9d1ed..31e764f2f 100644
--- a/newback/src/modules/email.render/email.module.ts
+++ b/newback/src/modules/email/email.module.ts
@@ -1,7 +1,7 @@
 import {Module} from '@nestjs/common';
 import {MailerModule} from '@nestjs-modules/mailer';
 import {config} from 'node-ts-config';
-import {EmailSenderService} from '@/modules/email.render/email.sender.service';
+import {EmailService} from '@/modules/email/email.service';
 import {HtmlService} from '@/modules/html/html.service';
 
 
@@ -12,11 +12,11 @@ import {HtmlService} from '@/modules/html/html.service';
     })
   ],
   providers: [
-    EmailSenderService,
+    EmailService,
     HtmlService
   ],
   exports: [
-    EmailSenderService
+    EmailService
   ]
 })
 export class EmailModule {
diff --git a/newback/src/modules/email.render/email.sender.service.spec.ts b/newback/src/modules/email/email.service.spec.ts
similarity index 89%
rename from newback/src/modules/email.render/email.sender.service.spec.ts
rename to newback/src/modules/email/email.service.spec.ts
index 123153c2a..ec7748a0c 100644
--- a/newback/src/modules/email.render/email.sender.service.spec.ts
+++ b/newback/src/modules/email/email.service.spec.ts
@@ -1,5 +1,5 @@
 import {HtmlService} from '@/modules/html/html.service';
-import {EmailSenderService} from '@/modules/email.render/email.sender.service';
+import {EmailService} from '@/modules/email/email.service';
 import {
   Test,
   TestingModule
@@ -13,7 +13,7 @@ import {resolve} from 'path';
 
 describe('EmailSenderService', () => {
 
-  let sender: EmailSenderService;
+  let sender: EmailService;
   let moduleFixture: TestingModule;
   let mailer: MailerService;
   beforeAll(
@@ -27,13 +27,13 @@ describe('EmailSenderService', () => {
       providers: [
         {
           provide: MailerService,
-          useValue: { sendMail: (a) => console.log(a)}
+          useValue: { sendMail: () => jest.fn().mockResolvedValue(undefined)}
         },
         HtmlService,
-        EmailSenderService,
+        EmailService,
       ]
     }).compile();
-    sender = moduleFixture.get(EmailSenderService);
+    sender = moduleFixture.get(EmailService);
     mailer = moduleFixture.get(MailerService);
   })
   afterAll(async () => {
diff --git a/newback/src/modules/email.render/email.sender.service.ts b/newback/src/modules/email/email.service.ts
similarity index 98%
rename from newback/src/modules/email.render/email.sender.service.ts
rename to newback/src/modules/email/email.service.ts
index d854d8235..c4e1f0d90 100644
--- a/newback/src/modules/email.render/email.sender.service.ts
+++ b/newback/src/modules/email/email.service.ts
@@ -7,7 +7,7 @@ import {MailerService} from '@nestjs-modules/mailer';
 import {ConfigService} from '@/modules/config/config.service';
 
 @Injectable()
-export class EmailSenderService {
+export class EmailService {
   public constructor(
     private readonly htmlService: HtmlService,
     private readonly loggerService: Logger,
diff --git a/newback/src/modules/html/html.service.spec.ts b/newback/src/modules/html/html.service.spec.ts
index 7983daf14..c65cf3a6f 100644
--- a/newback/src/modules/html/html.service.spec.ts
+++ b/newback/src/modules/html/html.service.spec.ts
@@ -26,25 +26,4 @@ describe('HtmlService', () => {
       expect(() => service.replaceTemplate('aa {{ adas }}', {blah: 4})).toThrow(Error("Unable to render template. 'adas' is missing in {\"blah\":4}"))
     });
   });
-  describe('renderTemplate', () => {
-    it('should replace single param', async() => {
-      let service = new HtmlService();
-      let result = await service.renderTemplate('token_email', {
-        signUpEmail: 'include',
-        timeCreated: 'now',
-        ip: 'localhost',
-        ipInfo: 'Chernihiv'
-      })
-      expect(result).toEqual(`include
-<p>
-  <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
-</p>
-<p>
-  Link was generated now <br/>
-  IP: localhost<br/>
-  Chernihiv
-</p>
-`);
-    });
-  });
 });

From 08dc57f7a15a3870d3ffc3c45df6aad2cdf0d6fe Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 14:02:55 +0300
Subject: [PATCH 030/221] Rename auth

---
 frontend/src/ts/instances/routerInstance.ts            | 10 +++++-----
 .../src/vue/{singup => auth}/ApplyResetPassword.vue    |  0
 frontend/src/vue/{singup => auth}/AuthPage.vue         |  0
 frontend/src/vue/{singup => auth}/CaptchaComponent.vue |  0
 frontend/src/vue/{singup => auth}/FacebookAuth.vue     |  0
 frontend/src/vue/{singup => auth}/GoogleAuth.vue       |  0
 frontend/src/vue/{singup => auth}/RegisterFieldSet.vue |  0
 frontend/src/vue/{singup => auth}/ResetPassword.vue    |  2 +-
 frontend/src/vue/{singup => auth}/SignIn.vue           |  4 ++--
 frontend/src/vue/{singup => auth}/SignUp.vue           |  4 ++--
 frontend/src/vue/{singup => auth}/SocialAuthSignUp.vue |  4 ++--
 frontend/src/vue/pages/UserProfileOauthSettings.vue    |  4 ++--
 newback/package.json                                   |  2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)
 rename frontend/src/vue/{singup => auth}/ApplyResetPassword.vue (100%)
 rename frontend/src/vue/{singup => auth}/AuthPage.vue (100%)
 rename frontend/src/vue/{singup => auth}/CaptchaComponent.vue (100%)
 rename frontend/src/vue/{singup => auth}/FacebookAuth.vue (100%)
 rename frontend/src/vue/{singup => auth}/GoogleAuth.vue (100%)
 rename frontend/src/vue/{singup => auth}/RegisterFieldSet.vue (100%)
 rename frontend/src/vue/{singup => auth}/ResetPassword.vue (97%)
 rename frontend/src/vue/{singup => auth}/SignIn.vue (95%)
 rename frontend/src/vue/{singup => auth}/SignUp.vue (98%)
 rename frontend/src/vue/{singup => auth}/SocialAuthSignUp.vue (94%)

diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 303f4c307..9d9d0db9e 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -6,10 +6,10 @@ import sessionHolder from "@/ts/instances/sessionInstance";
 import {store} from "@/ts/instances/storeInstance";
 import MainPage from "@/vue/pages/MainPage.vue";
 import ChannelsPage from "@/vue/pages/ChannelsPage.vue";
-import AuthPage from "@/vue/singup/AuthPage.vue";
-import ResetPassword from "@/vue/singup/ResetPassword.vue";
-import SignIn from "@/vue/singup/SignIn.vue";
-import SignUp from "@/vue/singup/SignUp.vue";
+import AuthPage from "@/vue/auth/AuthPage.vue";
+import ResetPassword from "@/vue/auth/ResetPassword.vue";
+import SignIn from "@/vue/auth/SignIn.vue";
+import SignUp from "@/vue/auth/SignUp.vue";
 import UserProfile from "@/vue/pages/UserProfile.vue";
 import UserProfileChangePassword from "@/vue/pages/UserProfileChangePassword.vue";
 import UserProfileImage from "@/vue/pages/UserProfileImage.vue";
@@ -18,7 +18,7 @@ import UserProfileSettings from "@/vue/pages/UserProfileSettings.vue";
 import CreatePrivateRoom from "@/vue/pages/CreatePrivateRoom.vue";
 import ViewProfilePage from "@/vue/pages/ViewProfilePage.vue";
 import RoomSettings from "@/vue/pages/RoomSettings.vue";
-import ApplyResetPassword from "@/vue/singup/ApplyResetPassword.vue";
+import ApplyResetPassword from "@/vue/auth/ApplyResetPassword.vue";
 import {
   ACTIVE_ROOM_ID_LS_NAME,
   ALL_ROOM_ID,
diff --git a/frontend/src/vue/singup/ApplyResetPassword.vue b/frontend/src/vue/auth/ApplyResetPassword.vue
similarity index 100%
rename from frontend/src/vue/singup/ApplyResetPassword.vue
rename to frontend/src/vue/auth/ApplyResetPassword.vue
diff --git a/frontend/src/vue/singup/AuthPage.vue b/frontend/src/vue/auth/AuthPage.vue
similarity index 100%
rename from frontend/src/vue/singup/AuthPage.vue
rename to frontend/src/vue/auth/AuthPage.vue
diff --git a/frontend/src/vue/singup/CaptchaComponent.vue b/frontend/src/vue/auth/CaptchaComponent.vue
similarity index 100%
rename from frontend/src/vue/singup/CaptchaComponent.vue
rename to frontend/src/vue/auth/CaptchaComponent.vue
diff --git a/frontend/src/vue/singup/FacebookAuth.vue b/frontend/src/vue/auth/FacebookAuth.vue
similarity index 100%
rename from frontend/src/vue/singup/FacebookAuth.vue
rename to frontend/src/vue/auth/FacebookAuth.vue
diff --git a/frontend/src/vue/singup/GoogleAuth.vue b/frontend/src/vue/auth/GoogleAuth.vue
similarity index 100%
rename from frontend/src/vue/singup/GoogleAuth.vue
rename to frontend/src/vue/auth/GoogleAuth.vue
diff --git a/frontend/src/vue/singup/RegisterFieldSet.vue b/frontend/src/vue/auth/RegisterFieldSet.vue
similarity index 100%
rename from frontend/src/vue/singup/RegisterFieldSet.vue
rename to frontend/src/vue/auth/RegisterFieldSet.vue
diff --git a/frontend/src/vue/singup/ResetPassword.vue b/frontend/src/vue/auth/ResetPassword.vue
similarity index 97%
rename from frontend/src/vue/singup/ResetPassword.vue
rename to frontend/src/vue/auth/ResetPassword.vue
index 0b80fff0e..d93aeddc7 100644
--- a/frontend/src/vue/singup/ResetPassword.vue
+++ b/frontend/src/vue/auth/ResetPassword.vue
@@ -34,7 +34,7 @@ import {
 } from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
-import CaptchaComponent from "@/vue/singup/CaptchaComponent.vue";
+import CaptchaComponent from "@/vue/auth/CaptchaComponent.vue";
 
 @Component({
   name: "ResetPassword",
diff --git a/frontend/src/vue/singup/SignIn.vue b/frontend/src/vue/auth/SignIn.vue
similarity index 95%
rename from frontend/src/vue/singup/SignIn.vue
rename to frontend/src/vue/auth/SignIn.vue
index b364a7375..7cd3c2d25 100644
--- a/frontend/src/vue/singup/SignIn.vue
+++ b/frontend/src/vue/auth/SignIn.vue
@@ -55,9 +55,9 @@ import {
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 
-import CaptchaComponent from "@/vue/singup/CaptchaComponent.vue";
+import CaptchaComponent from "@/vue/auth/CaptchaComponent.vue";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
-import SocialAuthSignUp from "@/vue/singup/SocialAuthSignUp.vue";
+import SocialAuthSignUp from "@/vue/auth/SocialAuthSignUp.vue";
 
 @Component({
   name: "SignIn",
diff --git a/frontend/src/vue/singup/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
similarity index 98%
rename from frontend/src/vue/singup/SignUp.vue
rename to frontend/src/vue/auth/SignUp.vue
index e673e6e2c..107d0d375 100644
--- a/frontend/src/vue/singup/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -127,11 +127,11 @@ import {
 } from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
-import RegisterFieldSet from "@/vue/singup/RegisterFieldSet.vue";
+import RegisterFieldSet from "@/vue/auth/RegisterFieldSet.vue";
 import debounce from "lodash.debounce";
 import {IconColor} from "@/ts/types/types";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
-import SocialAuthSignUp from "@/vue/singup/SocialAuthSignUp.vue";
+import SocialAuthSignUp from "@/vue/auth/SocialAuthSignUp.vue";
 import {USERNAME_REGEX} from "@/ts/utils/consts";
 import {Gender} from '@/ts/types/backend';
 
diff --git a/frontend/src/vue/singup/SocialAuthSignUp.vue b/frontend/src/vue/auth/SocialAuthSignUp.vue
similarity index 94%
rename from frontend/src/vue/singup/SocialAuthSignUp.vue
rename to frontend/src/vue/auth/SocialAuthSignUp.vue
index e94baa996..9d1cab4c4 100644
--- a/frontend/src/vue/singup/SocialAuthSignUp.vue
+++ b/frontend/src/vue/auth/SocialAuthSignUp.vue
@@ -11,8 +11,8 @@ import {
   Vue,
 } from "vue-property-decorator";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
-import FacebookAuth from "@/vue/singup/FacebookAuth.vue";
-import GoogleAuth from "@/vue/singup/GoogleAuth.vue";
+import FacebookAuth from "@/vue/auth/FacebookAuth.vue";
+import GoogleAuth from "@/vue/auth/GoogleAuth.vue";
 import {
   FACEBOOK_APP_ID,
   GOOGLE_OAUTH_2_CLIENT_ID,
diff --git a/frontend/src/vue/pages/UserProfileOauthSettings.vue b/frontend/src/vue/pages/UserProfileOauthSettings.vue
index 6af039300..33496061a 100644
--- a/frontend/src/vue/pages/UserProfileOauthSettings.vue
+++ b/frontend/src/vue/pages/UserProfileOauthSettings.vue
@@ -24,8 +24,8 @@ import {
 } from "vue-property-decorator";
 import type {OauthStatus} from "@/ts/types/dto";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
-import FacebookAuth from "@/vue/singup/FacebookAuth.vue";
-import GoogleAuth from "@/vue/singup/GoogleAuth.vue";
+import FacebookAuth from "@/vue/auth/FacebookAuth.vue";
+import GoogleAuth from "@/vue/auth/GoogleAuth.vue";
 
 @Component({
   name: "UserProfileOauthSettings",
diff --git a/newback/package.json b/newback/package.json
index 4a4cf0e19..9aad1a885 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -9,7 +9,7 @@
     "migrate": "ts-node  -r tsconfig-paths/register ./src/migration.runner.ts ",
     "build": "nest build",
     "start": "nest start",
-    "test:debug": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000",
+    "test:debug": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
     "test": "jest --runInBand --coverage --coverageReporters text"
   },
   "dependencies": {

From 58659c06e6c234f5719f746fd38e014e5a33f579 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 14:52:11 +0300
Subject: [PATCH 031/221] refactor structure

---
 common/dto.ts                                 | 13 ++++++++----
 frontend/src/ts/instances/routerInstance.ts   |  2 +-
 frontend/src/ts/message_handlers/Api.ts       | 21 ++++++++++++-------
 frontend/src/ts/types/types.ts                |  2 +-
 frontend/src/vue/auth/SignUp.vue              |  4 ++--
 frontend/src/vue/pages/ConfirmMail.vue        |  2 +-
 .../database/repository/user.repository.ts    |  7 +++++++
 newback/src/fixtures/send.sign.up.email.html  |  6 +++---
 .../src/modules/api/auth/auth.controller.ts   | 17 ++++++++++++---
 .../src/modules/api/auth/auth.module.spec.ts  | 10 ++++-----
 newback/src/modules/api/auth/auth.module.ts   |  6 +++---
 newback/src/modules/api/auth/auth.service.ts  | 21 ++++++++++++++-----
 .../modules/api/auth/facebook.auth.service.ts |  4 ++--
 .../confirm.email.request.validator.ts        |  8 +++++++
 newback/src/modules/app/app.module.ts         |  6 +++---
 .../{ => util}/config/config.module.ts        |  2 +-
 .../{ => util}/config/config.service.ts       |  0
 .../modules/{ => util}/email/email.module.ts  |  4 ++--
 .../{ => util}/email/email.service.spec.ts    |  8 +++----
 .../modules/{ => util}/email/email.service.ts | 10 ++++-----
 .../index.ts => util/guards/captcha.guard.ts} |  4 ++--
 .../{ => util}/html/html.service.spec.ts      |  2 +-
 .../modules/{ => util}/html/html.service.ts   |  0
 .../modules/{ => util}/http/http.module.ts    |  2 +-
 .../modules/{ => util}/http/http.service.ts   |  0
 .../interceptors/logging.interceptor.ts}      |  0
 .../{ => util}/logger/logger.module.ts        |  0
 ..._start.html => change.password.start.html} |  0
 ...rd_start.txt => change.password.start.txt} |  0
 ...{sign_up_email.html => sign.up.email.html} |  0
 .../{sign_up_email.txt => sign.up.email.txt}  |  0
 31 files changed, 105 insertions(+), 56 deletions(-)
 create mode 100644 newback/src/modules/api/auth/validators/confirm.email.request.validator.ts
 rename newback/src/modules/{ => util}/config/config.module.ts (79%)
 rename newback/src/modules/{ => util}/config/config.service.ts (100%)
 rename newback/src/modules/{ => util}/email/email.module.ts (73%)
 rename newback/src/modules/{ => util}/email/email.service.spec.ts (89%)
 rename newback/src/modules/{ => util}/email/email.service.ts (83%)
 rename newback/src/modules/{captcha/index.ts => util/guards/captcha.guard.ts} (90%)
 rename newback/src/modules/{ => util}/html/html.service.spec.ts (93%)
 rename newback/src/modules/{ => util}/html/html.service.ts (100%)
 rename newback/src/modules/{ => util}/http/http.module.ts (82%)
 rename newback/src/modules/{ => util}/http/http.service.ts (100%)
 rename newback/src/modules/{logger/interceptor.ts => util/interceptors/logging.interceptor.ts} (100%)
 rename newback/src/modules/{ => util}/logger/logger.module.ts (100%)
 rename newback/src/templates/{change_password_start.html => change.password.start.html} (100%)
 rename newback/src/templates/{change_password_start.txt => change.password.start.txt} (100%)
 rename newback/src/templates/{sign_up_email.html => sign.up.email.html} (100%)
 rename newback/src/templates/{sign_up_email.txt => sign.up.email.txt} (100%)

diff --git a/common/dto.ts b/common/dto.ts
index d6ca0734f..7e8ef44b3 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -52,6 +52,12 @@ export interface SignUpRequest {
   sex?: Gender;
 }
 
+export interface ConfirmEmailRequest {
+  token: string;
+}
+
+export interface ConfirmEmailResponse extends OkResponse {}
+
 export interface SessionResponse {
   session: string;
 }
@@ -117,10 +123,9 @@ export enum Theme {
 
 
 export enum VerificationType {
-  REGISTER = 'REGISTER',
-  PASSWORD = 'PASSWORD',
-  EMAIL = 'EMAIL',
-  CONFIRM_EMAIL = 'CONFIRM_EMAIL',
+  REGISTER = 'REGISTER', // when user sign up with email, we want to confirm that it's his/her email
+  PASSWORD = 'PASSWORD', // when user request a pasword change
+  EMAIL = 'EMAIL', // when user changes an email
 }
 
 export enum ImageType {
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 9d9d0db9e..c4cc6aa7b 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -177,7 +177,7 @@ export function routerFactory(sub: Subscription) {
           },
         ],
       }, {
-        path: "/confirm_email",
+        path: "/confirm-email",
         component: ConfirmMail,
       }, {
         path: "/:catchAll(.*)",
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 716e73968..1c69bc65e 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -27,13 +27,17 @@ import {
   OkResponse,
   SendRestorePasswordRequest,
   SignInRequest,
-  SignUpRequest
+  SignUpRequest,
+  ValidateEmailResponse
 } from '@/ts/types/dto';
 import {
   AcceptTokenRequest,
   AcceptTokenResponse,
+  ConfirmEmailRequest,
+  ConfirmEmailResponse,
   GoogleSignInResponse,
   SignUpResponse,
+  ValidateUserEmailRequest,
   ValidateUserResponse,
   VerifyTokenRequest,
   VerifyTokenResponse
@@ -229,8 +233,11 @@ export default class Api extends MessageHandler {
     });
   }
 
-  public async confirmEmail(token: string): Promise<string> {
-    return this.xhr.doGet<string>(`/confirm_email?token=${token}`);
+  public async confirmEmail(params: ConfirmEmailRequest): Promise<ConfirmEmailResponse> {
+    return this.xhr.doPost({
+      url: '/auth/confirm-email',
+      params
+    });
   }
 
   public async uploadFiles(files: UploadFile[], progress: (e: ProgressEvent) => void, setXhr: (e: XMLHttpRequest) => void): Promise<SaveFileResponse> {
@@ -249,10 +256,10 @@ export default class Api extends MessageHandler {
     });
   }
 
-  public async validateEmail(email: string, onAbortController: (controller: AbortController) => void): Promise<void> {
+  public async validateEmail(params: ValidateUserEmailRequest, onAbortController: (controller: AbortController) => void): Promise<ValidateEmailResponse> {
     return this.xhr.doPost({
       url: "/auth/validate-email",
-      params: {email},
+      params,
       onAbortController,
     });
   }
@@ -260,14 +267,14 @@ export default class Api extends MessageHandler {
   public async verifyToken(params: VerifyTokenRequest): Promise<VerifyTokenResponse> {
     return this.xhr.doPost<VerifyTokenResponse>({
       url: "/auth/verify-token",
-      params: params as any,
+      params,
     });
   }
 
   public async acceptToken(params: AcceptTokenRequest): Promise<AcceptTokenResponse> {
     return this.xhr.doPost({
       url: "/auth/accept-token",
-      params: params as any,
+      params,
     });
   }
 
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index f5885a108..fa985de6b 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -229,7 +229,7 @@ export interface IStorage {
 
 export interface PostData {
   url: string;
-  params?: Record<string, Blob | boolean | number | string | null>;
+  params?: any;
   formData?: FormData;
   onAbortController?: (controller: AbortController) => void;
   process?(R: XMLHttpRequest): void;
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index 107d0d375..09c698d6e 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -282,13 +282,13 @@ export default class SignUp extends Vue {
 
   private currentValidateEmailRequest: AbortController | null = null;
 
-  async checkEmail(username: string) {
+  async checkEmail(email: string) {
     if (this.currentValidateEmailRequest) {
       this.currentValidateEmailRequest.abort();
       this.currentValidateEmailRequest = null;
     }
     try {
-      await this.$api.validateEmail(username, (r:AbortController) => this.currentValidateEmailRequest = r);
+      await this.$api.validateEmail({email}, (r:AbortController) => this.currentValidateEmailRequest = r);
       this.emailCheckValue = IconColor.SUCCESS;
       this.emailDescription = "Email is ok!";
       this.emailValidity = "";
diff --git a/frontend/src/vue/pages/ConfirmMail.vue b/frontend/src/vue/pages/ConfirmMail.vue
index 41ea53c3d..255828c66 100644
--- a/frontend/src/vue/pages/ConfirmMail.vue
+++ b/frontend/src/vue/pages/ConfirmMail.vue
@@ -43,7 +43,7 @@ export default class ConfirmMail extends Vue {
     message: "Confirming email error ",
   })
   public async created() {
-    await this.$api.confirmEmail(this.$route.query.token as string);
+    await this.$api.confirmEmail({token: this.$route.query.token as string});
     this.message = "Email has been confirmed";
   }
 }
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/data/database/repository/user.repository.ts
index 19e5e0b5b..fca146f49 100644
--- a/newback/src/data/database/repository/user.repository.ts
+++ b/newback/src/data/database/repository/user.repository.ts
@@ -37,6 +37,13 @@ export class UserRepository {
     })
   }
 
+  public async setUserVerification(userId: number, emailVerificationId: number, transaction: Transaction) {
+    await this.userAuthModel.update({emailVerificationId}, {
+      where: {id: userId},
+      transaction
+    })
+  }
+
   public async createUser(data: {
     username: string;
     password: string;
diff --git a/newback/src/fixtures/send.sign.up.email.html b/newback/src/fixtures/send.sign.up.email.html
index cb8fa1eca..b6863c5ba 100644
--- a/newback/src/fixtures/send.sign.up.email.html
+++ b/newback/src/fixtures/send.sign.up.email.html
@@ -2,7 +2,7 @@ <h2 style="color: #102a80">Hello, a!</h2>
 <p><p>You have registered in <b>Pychat</b>. If you find any bugs or propositions you can post them
   <a href='https://github.com/akoidan/pychat/issues/new}'>here</a>. To complete your registration please click on the link below.</p></p>
 <div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
-  <a href="https://localhost:8080/#/confirm_email?token=sfsd" style="font-size: 20px;
+  <a href="https://localhost:8080/#/confirm-email?token=sfsd" style="font-size: 20px;
     line-height: 26px;
     border-top: 14px solid;
     border-bottom: 14px solid;
@@ -30,11 +30,11 @@ <h2 style="color: #102a80">Hello, a!</h2>
     text-align: center;
     max-width: 320px;
     word-break: break-word">You may copy/paste this link into your browser:</p>
-  <a href="https://localhost:8080/#/confirm_email?token=sfsd"
+  <a href="https://localhost:8080/#/confirm-email?token=sfsd"
      style="color: #439fe0;
         font-weight: normal;
         text-decoration: none;
-        word-break: break-word">https://localhost:8080/#/confirm_email?token=sfsd</a>
+        word-break: break-word">https://localhost:8080/#/confirm-email?token=sfsd</a>
 </div>
 <p>
   <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 70b710fa3..6e16d1cfc 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -13,22 +13,25 @@ import {SignUpRequestValidator} from '@/modules/api/auth/validators/sign.up.requ
 import {ValidateUserRequestValidator} from '@/modules/api/auth/validators/validate.user.request.validator';
 import {
   AcceptTokenResponse,
+  ConfirmEmailResponse,
   FacebookSignInResponse,
   GoogleSignInResponse,
   SendRestorePasswordResponse,
   SignInResponse,
   SignUpResponse,
+  ValidateEmailResponse,
   ValidateUserEmailRequest,
   ValidateUserResponse
 } from '@/data/types/frontend';
 import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.auth.reques.validator';
-import {CaptchaGuard} from '@/modules/captcha';
+import {CaptchaGuard} from '@/modules/util/guards/captcha.guard';
 import {ValidateEmailRequestValidator} from '@/modules/api/auth/validators/validate.email.request.validator';
 import {FacebookAuthRequestValidator} from '@/modules/api/auth/validators/facebook.auth.request.validator';
 import {SendRestorePasswordValidator} from '@/modules/api/auth/validators/send.restore.password.validator';
 import {VerifyTokenRequestValidator} from '@/modules/api/auth/validators/verify.token.request.validator';
 import {VerifyTokenResponse} from '@/data/types/frontend';
 import {AcceptTokenRequestValidator} from '@/modules/api/auth/validators/accept.token.request.validator';
+import {ConfirmEmailRequestValidator} from '@/modules/api/auth/validators/confirm.email.request.validator';
 
 @Controller({
   path: '/api/auth'
@@ -62,7 +65,7 @@ export class AuthController {
   }
 
   @Post('/validate-email')
-  public async validateEmail(@Body() body: ValidateEmailRequestValidator): Promise<ValidateUserResponse> {
+  public async validateEmail(@Body() body: ValidateEmailRequestValidator): Promise<ValidateEmailResponse> {
     await this.authservice.validateEmail(body.email);
     return {
       ok: true
@@ -83,9 +86,17 @@ export class AuthController {
     return  this.authservice.verifyToken(body.token);
   }
 
+  @Post('/confirm-email')
+  public async confirmEmail(@Body() body: ConfirmEmailRequestValidator): Promise<ConfirmEmailResponse> {
+    await this.authservice.confirmEmail(body);
+    return {
+      ok: true,
+    }
+  }
+
  @Post('/accept-token')
   public async acceptToken(@Body() body: AcceptTokenRequestValidator): Promise<AcceptTokenResponse> {
-    return  this.authservice.acceptToken(body);
+    return this.authservice.acceptToken(body);
   }
 
   @Post('/validate-user')
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index eeaa9f392..2c4eb11bc 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -7,24 +7,24 @@ import * as supertest from 'supertest';
 import {Test} from '@nestjs/testing';
 import {AuthService} from '@/modules/api/auth/auth.service';
 import {AuthController} from '@/modules/api/auth/auth.controller';
-import {LoggerModule} from '@/modules/logger/logger.module';
+import {LoggerModule} from '@/modules/util/logger/logger.module';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {UserRepository} from '@/data/database/repository/user.repository';
 import {RoomRepository} from '@/data/database/repository/room.repository';
 import {RedisService} from '@/data/redis/RedisService';
-import {EmailService} from '@/modules/email/email.service';
+import {EmailService} from '@/modules/util/email/email.service';
 import {MailerService} from '@nestjs-modules/mailer';
 import {Sequelize} from 'sequelize-typescript';
-import {HtmlService} from '@/modules/html/html.service';
+import {HtmlService} from '@/modules/util/html/html.service';
 import waitForExpect from "wait-for-expect";
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {OAuth2Client} from 'google-auth-library';
-import {HttpService} from '@/modules/http/http.service';
+import {HttpService} from '@/modules/util/http/http.service';
 import fetch from 'node-fetch';
 import * as googleResponseFixture from '@/fixtures/google.response.fixture.json';
 import * as facebookGetTokenResponseFixture from '@/fixtures/facebook.get.token.response.json';
 import * as facebookGetUserResponseFixture from '@/fixtures/facebook.get.user.response.json';
-import {ConfigService} from '@/modules/config/config.service';
+import {ConfigService} from '@/modules/util/config/config.service';
 import {
   config,
   IConfig
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index e75399d34..0e5102ae7 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -6,14 +6,14 @@ import {AuthController} from '@/modules/api/auth/auth.controller';
 import {AuthService} from '@/modules/api/auth/auth.service';
 import {DatabaseModule} from '@/data/database/database.module';
 import {RedisService} from '@/data/redis/RedisService';
-import {EmailModule} from '@/modules/email/email.module';
+import {EmailModule} from '@/modules/util/email/email.module';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {OAuth2Client} from 'google-auth-library';
 import {config} from 'node-ts-config';
-import {HttpModule} from '@/modules/http/http.module';
+import {HttpModule} from '@/modules/util/http/http.module';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
-import {ConfigService} from '@/modules/config/config.service';
+import {ConfigService} from '@/modules/util/config/config.service';
 
 @Module({
   imports: [DatabaseModule, EmailModule, HttpModule],
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index c7b6d4853..6b7f4fe50 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -10,6 +10,8 @@ import {PasswordService} from '@/modules/api/auth/password.service';
 import {
   AcceptTokenRequest,
   AcceptTokenResponse,
+  ConfirmEmailRequest,
+  ConfirmEmailResponse,
   FaceBookAuthRequest,
   FacebookSignInResponse,
   Gender,
@@ -29,7 +31,7 @@ import {
   MAX_USERNAME_LENGTH
 } from '@/data/utils/consts';
 import {RedisService} from '@/data/redis/RedisService';
-import {EmailService} from '@/modules/email/email.service';
+import {EmailService} from '@/modules/util/email/email.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
@@ -212,11 +214,11 @@ export class AuthService {
     return userId;
   }
 
-  private doTokenVerification(data: VerificationModel): void {
+  private doTokenVerification(data: VerificationModel, typ: VerificationType): void {
     if (!data) {
       throw new BadRequestException("Invalid token");
     }
-    if (data.type != VerificationType.PASSWORD) {
+    if (data.type != typ) {
       throw new BadRequestException("Invalid operation");
     }
     if (data.verified) {
@@ -230,7 +232,7 @@ export class AuthService {
   public async verifyToken(token: string): Promise<VerifyTokenResponse> {
     let verificationModel: VerificationModel = await this.userRepository.getVerification(token);
     //https://pychat.org/#/auth/proceed-reset-password?token=evhv0zum3l8gavzql4xk5u16q2h9gqd2
-    this.doTokenVerification(verificationModel)
+    this.doTokenVerification(verificationModel, VerificationType.PASSWORD)
     return {
       ok: true,
       username: verificationModel.user.username
@@ -270,7 +272,7 @@ export class AuthService {
   public async acceptToken(body: AcceptTokenRequest): Promise<AcceptTokenResponse> {
     return this.sequelize.transaction(async(t) => {
       let verificationModel: VerificationModel = await this.userRepository.getVerification(body.token, t);
-      this.doTokenVerification(verificationModel);
+      this.doTokenVerification(verificationModel, VerificationType.PASSWORD);
       let password = await this.passwordService.createPassword(body.password);
       this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`);
       await this.userRepository.updateUserPassword(verificationModel.userId, password, t)
@@ -282,4 +284,13 @@ export class AuthService {
       return result;
     })
   }
+
+  public async confirmEmail(body: ConfirmEmailRequest): Promise<void> {
+     this.sequelize.transaction(async(t) => {
+      let verificationModel: VerificationModel = await this.userRepository.getVerification(body.token, t);
+      this.doTokenVerification(verificationModel, VerificationType.REGISTER);
+      await this.userRepository.markVerificationVerified(verificationModel.id , t);
+      await this.userRepository.setUserVerification(verificationModel.userId, verificationModel.id , t);
+    })
+  }
 }
diff --git a/newback/src/modules/api/auth/facebook.auth.service.ts b/newback/src/modules/api/auth/facebook.auth.service.ts
index 148372fc5..23da497f3 100644
--- a/newback/src/modules/api/auth/facebook.auth.service.ts
+++ b/newback/src/modules/api/auth/facebook.auth.service.ts
@@ -6,8 +6,8 @@ import {
   Logger,
   ServiceUnavailableException,
 } from '@nestjs/common';
-import {HttpService} from '@/modules/http/http.service';
-import {ConfigService} from '@/modules/config/config.service';
+import {HttpService} from '@/modules/util/http/http.service';
+import {ConfigService} from '@/modules/util/config/config.service';
 import {FacebookGetUserResponse} from '@/data/types/api';
 
 @Injectable()
diff --git a/newback/src/modules/api/auth/validators/confirm.email.request.validator.ts b/newback/src/modules/api/auth/validators/confirm.email.request.validator.ts
new file mode 100644
index 000000000..4f61e8b12
--- /dev/null
+++ b/newback/src/modules/api/auth/validators/confirm.email.request.validator.ts
@@ -0,0 +1,8 @@
+import {IsString,} from 'class-validator';
+import {ConfirmEmailRequest,} from '@/data/types/frontend';
+
+
+export class ConfirmEmailRequestValidator implements ConfirmEmailRequest {
+  @IsString()
+  public token: string;
+}
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index a71129830..0840b59e9 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -1,14 +1,14 @@
 import {Module} from '@nestjs/common';
 import {AuthModule} from '@/modules/api/auth/auth.module';
-import {LoggingInterceptor} from '@/modules/logger/interceptor';
+import {LoggingInterceptor} from '@/modules/util/interceptors/logging.interceptor';
 import {
   APP_INTERCEPTOR,
   RouterModule
 } from '@nestjs/core';
-import {LoggerModule} from '@/modules/logger/logger.module';
+import {LoggerModule} from '@/modules/util/logger/logger.module';
 import {RedisModule} from '@nestjs-modules/ioredis';
 import {config} from 'node-ts-config';
-import {ConfigModule} from '@/modules/config/config.module';
+import {ConfigModule} from '@/modules/util/config/config.module';
 
 @Module({
   imports: [AuthModule, LoggerModule, ConfigModule, RedisModule.forRoot({
diff --git a/newback/src/modules/config/config.module.ts b/newback/src/modules/util/config/config.module.ts
similarity index 79%
rename from newback/src/modules/config/config.module.ts
rename to newback/src/modules/util/config/config.module.ts
index d8e1f9aa7..162de8b24 100644
--- a/newback/src/modules/config/config.module.ts
+++ b/newback/src/modules/util/config/config.module.ts
@@ -2,7 +2,7 @@ import {
   Global,
   Module
 } from '@nestjs/common';
-import {ConfigService} from '@/modules/config/config.service';
+import {ConfigService} from '@/modules/util/config/config.service';
 import {config} from 'node-ts-config';
 
 @Global()
diff --git a/newback/src/modules/config/config.service.ts b/newback/src/modules/util/config/config.service.ts
similarity index 100%
rename from newback/src/modules/config/config.service.ts
rename to newback/src/modules/util/config/config.service.ts
diff --git a/newback/src/modules/email/email.module.ts b/newback/src/modules/util/email/email.module.ts
similarity index 73%
rename from newback/src/modules/email/email.module.ts
rename to newback/src/modules/util/email/email.module.ts
index 31e764f2f..a9ecbf9f2 100644
--- a/newback/src/modules/email/email.module.ts
+++ b/newback/src/modules/util/email/email.module.ts
@@ -1,8 +1,8 @@
 import {Module} from '@nestjs/common';
 import {MailerModule} from '@nestjs-modules/mailer';
 import {config} from 'node-ts-config';
-import {EmailService} from '@/modules/email/email.service';
-import {HtmlService} from '@/modules/html/html.service';
+import {EmailService} from '@/modules/util/email/email.service';
+import {HtmlService} from '@/modules/util/html/html.service';
 
 
 @Module({
diff --git a/newback/src/modules/email/email.service.spec.ts b/newback/src/modules/util/email/email.service.spec.ts
similarity index 89%
rename from newback/src/modules/email/email.service.spec.ts
rename to newback/src/modules/util/email/email.service.spec.ts
index ec7748a0c..cb46d50d4 100644
--- a/newback/src/modules/email/email.service.spec.ts
+++ b/newback/src/modules/util/email/email.service.spec.ts
@@ -1,12 +1,12 @@
-import {HtmlService} from '@/modules/html/html.service';
-import {EmailService} from '@/modules/email/email.service';
+import {HtmlService} from '@/modules/util/html/html.service';
+import {EmailService} from '@/modules/util/email/email.service';
 import {
   Test,
   TestingModule
 } from '@nestjs/testing';
-import {LoggerModule} from '@/modules/logger/logger.module';
+import {LoggerModule} from '@/modules/util/logger/logger.module';
 import {MailerService} from '@nestjs-modules/mailer';
-import {ConfigModule} from '@/modules/config/config.module';
+import {ConfigModule} from '@/modules/util/config/config.module';
 import {promisify} from 'util';
 import {readFile} from 'fs';
 import {resolve} from 'path';
diff --git a/newback/src/modules/email/email.service.ts b/newback/src/modules/util/email/email.service.ts
similarity index 83%
rename from newback/src/modules/email/email.service.ts
rename to newback/src/modules/util/email/email.service.ts
index c4e1f0d90..b37515c53 100644
--- a/newback/src/modules/email/email.service.ts
+++ b/newback/src/modules/util/email/email.service.ts
@@ -2,9 +2,9 @@ import {
   Injectable,
   Logger
 } from '@nestjs/common';
-import {HtmlService} from '@/modules/html/html.service';
+import {HtmlService} from '@/modules/util/html/html.service';
 import {MailerService} from '@nestjs-modules/mailer';
-import {ConfigService} from '@/modules/config/config.service';
+import {ConfigService} from '@/modules/util/config/config.service';
 
 @Injectable()
 export class EmailService {
@@ -25,7 +25,7 @@ export class EmailService {
       site: this.configService.getConfig().frontend.address,
       ipInfo
     };
-    await this.sendEmail('change_password_start', userId, email, 'Confirm pychat registration', context);
+    await this.sendEmail('change.password.start', userId, email, 'Reset pychat password', context);
   }
 
   private async sendEmail(templateName: string, userId, email, subject: string, context: Record<string, string>) {
@@ -47,13 +47,13 @@ export class EmailService {
   public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
     let context: Record<string, string> = {
       issueReportLink: this.configService.getConfig().frontend.issueReportLink,
-      magicLink: `${this.configService.getConfig().frontend.address}/#/confirm_email?token=${token}`,
+      magicLink: `${this.configService.getConfig().frontend.address}/#/confirm-email?token=${token}`,
       username,
       ip,
       timeCreated: (new Date() as any).toGMTString(),
       ipInfo
     };
-    await this.sendEmail('sign_up_email', userId, email, 'Confirm pychat registration', context);
+    await this.sendEmail('sign.up.email', userId, email, 'Confirm Pychat registration', context);
   }
 
 }
diff --git a/newback/src/modules/captcha/index.ts b/newback/src/modules/util/guards/captcha.guard.ts
similarity index 90%
rename from newback/src/modules/captcha/index.ts
rename to newback/src/modules/util/guards/captcha.guard.ts
index c49331b81..d49c5e8cb 100644
--- a/newback/src/modules/captcha/index.ts
+++ b/newback/src/modules/util/guards/captcha.guard.ts
@@ -12,8 +12,8 @@ import {
 	Recaptcha
 } from 'node-ts-config';
 
-import {ConfigService} from '@/modules/config/config.service';
-import {HttpService} from '@/modules/http/http.service';
+import {ConfigService} from '@/modules/util/config/config.service';
+import {HttpService} from '@/modules/util/http/http.service';
 @Injectable()
 export class CaptchaGuard implements CanActivate {
   constructor(
diff --git a/newback/src/modules/html/html.service.spec.ts b/newback/src/modules/util/html/html.service.spec.ts
similarity index 93%
rename from newback/src/modules/html/html.service.spec.ts
rename to newback/src/modules/util/html/html.service.spec.ts
index c65cf3a6f..7641e3179 100644
--- a/newback/src/modules/html/html.service.spec.ts
+++ b/newback/src/modules/util/html/html.service.spec.ts
@@ -1,4 +1,4 @@
-import {HtmlService} from '@/modules/html/html.service';
+import {HtmlService} from '@/modules/util/html/html.service';
 
 describe('HtmlService', () => {
 
diff --git a/newback/src/modules/html/html.service.ts b/newback/src/modules/util/html/html.service.ts
similarity index 100%
rename from newback/src/modules/html/html.service.ts
rename to newback/src/modules/util/html/html.service.ts
diff --git a/newback/src/modules/http/http.module.ts b/newback/src/modules/util/http/http.module.ts
similarity index 82%
rename from newback/src/modules/http/http.module.ts
rename to newback/src/modules/util/http/http.module.ts
index 16bc3a5d1..723b73e0c 100644
--- a/newback/src/modules/http/http.module.ts
+++ b/newback/src/modules/util/http/http.module.ts
@@ -3,7 +3,7 @@ import {
   Logger,
   Module
 } from '@nestjs/common';
-import {HttpService} from '@/modules/http/http.service';
+import {HttpService} from '@/modules/util/http/http.service';
 import fetch from 'node-fetch';
 
 @Global()
diff --git a/newback/src/modules/http/http.service.ts b/newback/src/modules/util/http/http.service.ts
similarity index 100%
rename from newback/src/modules/http/http.service.ts
rename to newback/src/modules/util/http/http.service.ts
diff --git a/newback/src/modules/logger/interceptor.ts b/newback/src/modules/util/interceptors/logging.interceptor.ts
similarity index 100%
rename from newback/src/modules/logger/interceptor.ts
rename to newback/src/modules/util/interceptors/logging.interceptor.ts
diff --git a/newback/src/modules/logger/logger.module.ts b/newback/src/modules/util/logger/logger.module.ts
similarity index 100%
rename from newback/src/modules/logger/logger.module.ts
rename to newback/src/modules/util/logger/logger.module.ts
diff --git a/newback/src/templates/change_password_start.html b/newback/src/templates/change.password.start.html
similarity index 100%
rename from newback/src/templates/change_password_start.html
rename to newback/src/templates/change.password.start.html
diff --git a/newback/src/templates/change_password_start.txt b/newback/src/templates/change.password.start.txt
similarity index 100%
rename from newback/src/templates/change_password_start.txt
rename to newback/src/templates/change.password.start.txt
diff --git a/newback/src/templates/sign_up_email.html b/newback/src/templates/sign.up.email.html
similarity index 100%
rename from newback/src/templates/sign_up_email.html
rename to newback/src/templates/sign.up.email.html
diff --git a/newback/src/templates/sign_up_email.txt b/newback/src/templates/sign.up.email.txt
similarity index 100%
rename from newback/src/templates/sign_up_email.txt
rename to newback/src/templates/sign.up.email.txt

From 66bb447a73403bbe7c933a67bf067e31c8ce4e91 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 15:10:15 +0300
Subject: [PATCH 032/221] Another refactor of structure

---
 newback/package.json                          |  2 +-
 newback/src/data/database/database.module.ts  | 65 -------------------
 .../{database => }/model/channel.model.ts     |  2 +-
 .../data/{database => }/model/image.model.ts  |  2 +-
 .../{database => }/model/ip.address.model.ts  |  0
 .../model/message.history.model.ts            |  2 +-
 .../model/message.mention.model.ts            |  4 +-
 .../{database => }/model/message.model.ts     |  4 +-
 .../data/{database => }/model/room.model.ts   |  4 +-
 .../{database => }/model/room.users.model.ts  |  4 +-
 .../model/subscription.message.model.ts       |  4 +-
 .../model/subscription.model.ts               |  4 +-
 .../model/uploaded.file.model.ts              |  2 +-
 .../{database => }/model/user.auth.model.ts   |  4 +-
 .../model/user.joined.info.model.ts           |  4 +-
 .../data/{database => }/model/user.model.ts   |  4 +-
 .../model/user.profile.model.ts               |  2 +-
 .../model/user.settings.model.ts              |  2 +-
 .../model/verification.model.ts               |  2 +-
 newback/src/data/utils/helpers.ts             |  5 --
 .../src/modules/api/auth/auth.controller.ts   |  2 +-
 .../src/modules/api/auth/auth.module.spec.ts  | 16 ++---
 newback/src/modules/api/auth/auth.module.ts   | 10 +--
 newback/src/modules/api/auth/auth.service.ts  | 14 ++--
 .../modules/api/auth/facebook.auth.service.ts |  4 +-
 .../validators/sign.up.request.validator.ts   |  2 +-
 .../validate.user.request.validator.ts        |  2 +-
 newback/src/modules/app/app.module.ts         |  6 +-
 .../{util => app}/guards/captcha.guard.ts     |  4 +-
 .../interceptors/logging.interceptor.ts       |  0
 .../{util => rest}/config/config.module.ts    |  2 +-
 .../{util => rest}/config/config.service.ts   |  0
 .../modules/rest/database/database.module.ts  | 64 ++++++++++++++++++
 .../database/repository/room.repository.ts    |  4 +-
 .../database/repository/user.repository.ts    | 10 +--
 .../{util => rest}/email/email.module.ts      |  4 +-
 .../email/email.service.spec.ts               |  8 +--
 .../{util => rest}/email/email.service.ts     |  4 +-
 .../{util => rest}/html/html.service.spec.ts  |  2 +-
 .../{util => rest}/html/html.service.ts       |  0
 .../{util => rest}/http/http.module.ts        |  2 +-
 .../{util => rest}/http/http.service.ts       |  0
 .../{util => rest}/logger/logger.module.ts    |  0
 .../rest}/redis/RedisService.ts               |  2 +-
 newback/src/{data => }/utils/consts.ts        |  0
 newback/src/{data => }/utils/helpers.spec.ts  |  2 +-
 .../ormconfig.ts => utils/helpers.ts}         |  8 ++-
 newback/src/{ => utils}/migration.runner.ts   |  4 +-
 48 files changed, 148 insertions(+), 150 deletions(-)
 delete mode 100644 newback/src/data/database/database.module.ts
 rename newback/src/data/{database => }/model/channel.model.ts (91%)
 rename newback/src/data/{database => }/model/image.model.ts (95%)
 rename newback/src/data/{database => }/model/ip.address.model.ts (100%)
 rename newback/src/data/{database => }/model/message.history.model.ts (92%)
 rename newback/src/data/{database => }/model/message.mention.model.ts (89%)
 rename newback/src/data/{database => }/model/message.model.ts (92%)
 rename newback/src/data/{database => }/model/room.model.ts (92%)
 rename newback/src/data/{database => }/model/room.users.model.ts (90%)
 rename newback/src/data/{database => }/model/subscription.message.model.ts (88%)
 rename newback/src/data/{database => }/model/subscription.model.ts (89%)
 rename newback/src/data/{database => }/model/uploaded.file.model.ts (94%)
 rename newback/src/data/{database => }/model/user.auth.model.ts (89%)
 rename newback/src/data/{database => }/model/user.joined.info.model.ts (88%)
 rename newback/src/data/{database => }/model/user.model.ts (88%)
 rename newback/src/data/{database => }/model/user.profile.model.ts (93%)
 rename newback/src/data/{database => }/model/user.settings.model.ts (96%)
 rename newback/src/data/{database => }/model/verification.model.ts (94%)
 delete mode 100644 newback/src/data/utils/helpers.ts
 rename newback/src/modules/{util => app}/guards/captcha.guard.ts (90%)
 rename newback/src/modules/{util => app}/interceptors/logging.interceptor.ts (100%)
 rename newback/src/modules/{util => rest}/config/config.module.ts (81%)
 rename newback/src/modules/{util => rest}/config/config.service.ts (100%)
 create mode 100644 newback/src/modules/rest/database/database.module.ts
 rename newback/src/{data => modules/rest}/database/repository/room.repository.ts (82%)
 rename newback/src/{data => modules/rest}/database/repository/user.repository.ts (92%)
 rename newback/src/modules/{util => rest}/email/email.module.ts (73%)
 rename newback/src/modules/{util => rest}/email/email.service.spec.ts (89%)
 rename newback/src/modules/{util => rest}/email/email.service.ts (94%)
 rename newback/src/modules/{util => rest}/html/html.service.spec.ts (93%)
 rename newback/src/modules/{util => rest}/html/html.service.ts (100%)
 rename newback/src/modules/{util => rest}/http/http.module.ts (82%)
 rename newback/src/modules/{util => rest}/http/http.service.ts (100%)
 rename newback/src/modules/{util => rest}/logger/logger.module.ts (100%)
 rename newback/src/{data => modules/rest}/redis/RedisService.ts (87%)
 rename newback/src/{data => }/utils/consts.ts (100%)
 rename newback/src/{data => }/utils/helpers.spec.ts (89%)
 rename newback/src/{data/database/ormconfig.ts => utils/helpers.ts} (67%)
 rename newback/src/{ => utils}/migration.runner.ts (87%)

diff --git a/newback/package.json b/newback/package.json
index 9aad1a885..44d6dac45 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "generate-configs": "node-ts-config",
-    "migrate": "ts-node  -r tsconfig-paths/register ./src/migration.runner.ts ",
+    "migrate": "ts-node  -r tsconfig-paths/register ./src/utils/migration.runner.ts ",
     "build": "nest build",
     "start": "nest start",
     "test:debug": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
diff --git a/newback/src/data/database/database.module.ts b/newback/src/data/database/database.module.ts
deleted file mode 100644
index 031edfdb8..000000000
--- a/newback/src/data/database/database.module.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import {Module} from '@nestjs/common';
-import {SequelizeModule} from '@nestjs/sequelize';
-
-import {generateConfig} from '@/data/database/ormconfig';
-import {ChannelModel} from '@/data/database/model/channel.model';
-import {ImageModel} from '@/data/database/model/image.model';
-import {IpAddressModel} from '@/data/database/model/ip.address.model';
-import {MessageHistoryModel} from '@/data/database/model/message.history.model';
-import {MessageModel} from '@/data/database/model/message.model';
-import {RoomModel} from '@/data/database/model/room.model';
-import {RoomUsersModel} from '@/data/database/model/room.users.model';
-import {MessageMentionModel} from '@/data/database/model/message.mention.model';
-import {SubscriptionMessageModel} from '@/data/database/model/subscription.message.model';
-import {SubscriptionModel} from '@/data/database/model/subscription.model';
-import {UploadedFileModel} from '@/data/database/model/uploaded.file.model';
-import {UserAuthModel} from '@/data/database/model/user.auth.model';
-import {UserJoinedInfoModel} from '@/data/database/model/user.joined.info.model';
-import {UserModel} from '@/data/database/model/user.model';
-import {UserProfileModel} from '@/data/database/model/user.profile.model';
-import {UserSettingsModel} from '@/data/database/model/user.settings.model';
-import {VerificationModel} from '@/data/database/model/verification.model';
-import {Logger} from '@nestjs/common/services/logger.service';
-import {UserRepository} from '@/data/database/repository/user.repository';
-import {RoomRepository} from '@/data/database/repository/room.repository';
-import {Sequelize} from 'sequelize-typescript';
-
-const repositories = [
-  UserRepository,
-  RoomRepository,
-];
-
-@Module({
-  imports: [
-    SequelizeModule.forRootAsync({
-      inject: [Logger],
-      useFactory: (logger: Logger) => generateConfig((sql) => logger.debug(sql, 'sql')),
-    }),
-    SequelizeModule.forFeature([
-      ChannelModel,
-      ImageModel,
-      IpAddressModel,
-      MessageHistoryModel,
-      MessageMentionModel,
-      MessageModel,
-      RoomModel,
-      RoomUsersModel,
-      SubscriptionMessageModel,
-      SubscriptionModel,
-      UploadedFileModel,
-      UserAuthModel,
-      UserJoinedInfoModel,
-      UserModel,
-      UserProfileModel,
-      UserSettingsModel,
-      VerificationModel,
-    ]),
-  ],
-  providers: [...repositories],
-  exports: [
-    SequelizeModule,
-    ...repositories,
-  ],
-})
-export class DatabaseModule {
-}
diff --git a/newback/src/data/database/model/channel.model.ts b/newback/src/data/model/channel.model.ts
similarity index 91%
rename from newback/src/data/database/model/channel.model.ts
rename to newback/src/data/model/channel.model.ts
index 025498e02..24a2cf5d8 100644
--- a/newback/src/data/database/model/channel.model.ts
+++ b/newback/src/data/model/channel.model.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
+import {UserModel} from '@/data/model/user.model';
 
 
 @Injectable()
diff --git a/newback/src/data/database/model/image.model.ts b/newback/src/data/model/image.model.ts
similarity index 95%
rename from newback/src/data/database/model/image.model.ts
rename to newback/src/data/model/image.model.ts
index c8232aa13..b58f1a85e 100644
--- a/newback/src/data/database/model/image.model.ts
+++ b/newback/src/data/model/image.model.ts
@@ -9,7 +9,7 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {ImageType} from '@/data/types/frontend';
-import {MessageModel} from '@/data/database/model/message.model';
+import {MessageModel} from '@/data/model/message.model';
 
 const uniqueUserIdSymbMess = 'unique_image_symbol_message';
 
diff --git a/newback/src/data/database/model/ip.address.model.ts b/newback/src/data/model/ip.address.model.ts
similarity index 100%
rename from newback/src/data/database/model/ip.address.model.ts
rename to newback/src/data/model/ip.address.model.ts
diff --git a/newback/src/data/database/model/message.history.model.ts b/newback/src/data/model/message.history.model.ts
similarity index 92%
rename from newback/src/data/database/model/message.history.model.ts
rename to newback/src/data/model/message.history.model.ts
index 8d99046b8..829cf0431 100644
--- a/newback/src/data/database/model/message.history.model.ts
+++ b/newback/src/data/model/message.history.model.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {MessageModel} from '@/data/database/model/message.model';
+import {MessageModel} from '@/data/model/message.model';
 
 
 @Injectable()
diff --git a/newback/src/data/database/model/message.mention.model.ts b/newback/src/data/model/message.mention.model.ts
similarity index 89%
rename from newback/src/data/database/model/message.mention.model.ts
rename to newback/src/data/model/message.mention.model.ts
index 9d09b435b..9a1c4c672 100644
--- a/newback/src/data/database/model/message.mention.model.ts
+++ b/newback/src/data/model/message.mention.model.ts
@@ -8,8 +8,8 @@ import {
   Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
-import {MessageModel} from '@/data/database/model/message.model';
+import {UserModel} from '@/data/model/user.model';
+import {MessageModel} from '@/data/model/message.model';
 
 const uniqueUserIdSymbMess = 'unique_message_mention_user_id_symbol_message_id';
 
diff --git a/newback/src/data/database/model/message.model.ts b/newback/src/data/model/message.model.ts
similarity index 92%
rename from newback/src/data/database/model/message.model.ts
rename to newback/src/data/model/message.model.ts
index c500fcd0f..cc2c5389f 100644
--- a/newback/src/data/database/model/message.model.ts
+++ b/newback/src/data/model/message.model.ts
@@ -8,8 +8,8 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {MessageStatus,} from '@/data/types/frontend';
-import {UserModel} from '@/data/database/model/user.model';
-import {RoomModel} from '@/data/database/model/room.model';
+import {UserModel} from '@/data/model/user.model';
+import {RoomModel} from '@/data/model/room.model';
 
 @Injectable()
 @Table({tableName: 'message'})
diff --git a/newback/src/data/database/model/room.model.ts b/newback/src/data/model/room.model.ts
similarity index 92%
rename from newback/src/data/database/model/room.model.ts
rename to newback/src/data/model/room.model.ts
index 0ff516521..c39bf1689 100644
--- a/newback/src/data/database/model/room.model.ts
+++ b/newback/src/data/model/room.model.ts
@@ -7,8 +7,8 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
-import {ChannelModel} from '@/data/database/model/channel.model';
+import {UserModel} from '@/data/model/user.model';
+import {ChannelModel} from '@/data/model/channel.model';
 
 
 // 	constraint admin_should_not_be_define_for_private_rooms
diff --git a/newback/src/data/database/model/room.users.model.ts b/newback/src/data/model/room.users.model.ts
similarity index 90%
rename from newback/src/data/database/model/room.users.model.ts
rename to newback/src/data/model/room.users.model.ts
index 7cca0dbd3..4e466015a 100644
--- a/newback/src/data/database/model/room.users.model.ts
+++ b/newback/src/data/model/room.users.model.ts
@@ -8,8 +8,8 @@ import {
   Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
-import {RoomModel} from '@/data/database/model/room.model';
+import {UserModel} from '@/data/model/user.model';
+import {RoomModel} from '@/data/model/room.model';
 
 const uniqueRoomUser = 'unique_room_user_room_id_user_id';
 
diff --git a/newback/src/data/database/model/subscription.message.model.ts b/newback/src/data/model/subscription.message.model.ts
similarity index 88%
rename from newback/src/data/database/model/subscription.message.model.ts
rename to newback/src/data/model/subscription.message.model.ts
index 5baea7833..b37cfba86 100644
--- a/newback/src/data/database/model/subscription.message.model.ts
+++ b/newback/src/data/model/subscription.message.model.ts
@@ -8,8 +8,8 @@ import {
   Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {MessageModel} from '@/data/database/model/message.model';
-import {SubscriptionModel} from '@/data/database/model/subscription.model';
+import {MessageModel} from '@/data/model/message.model';
+import {SubscriptionModel} from '@/data/model/subscription.model';
 
 const uniqueSubscriptionMessage = 'unique_subscription_message_subscription_id_message_id';
 
diff --git a/newback/src/data/database/model/subscription.model.ts b/newback/src/data/model/subscription.model.ts
similarity index 89%
rename from newback/src/data/database/model/subscription.model.ts
rename to newback/src/data/model/subscription.model.ts
index 91f05e9f4..0a4dd0740 100644
--- a/newback/src/data/database/model/subscription.model.ts
+++ b/newback/src/data/model/subscription.model.ts
@@ -7,9 +7,9 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
+import {UserModel} from '@/data/model/user.model';
 import {UploadedFileChoices} from '@/data/types/frontend';
-import {IpAddressModel} from '@/data/database/model/ip.address.model';
+import {IpAddressModel} from '@/data/model/ip.address.model';
 
 @Injectable()
 @Table({tableName: 'subscription'})
diff --git a/newback/src/data/database/model/uploaded.file.model.ts b/newback/src/data/model/uploaded.file.model.ts
similarity index 94%
rename from newback/src/data/database/model/uploaded.file.model.ts
rename to newback/src/data/model/uploaded.file.model.ts
index 6e7ae357a..11942e414 100644
--- a/newback/src/data/database/model/uploaded.file.model.ts
+++ b/newback/src/data/model/uploaded.file.model.ts
@@ -8,7 +8,7 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UploadedFileChoices} from '@/data/types/frontend';
-import {UserModel} from '@/data/database/model/user.model';
+import {UserModel} from '@/data/model/user.model';
 
 @Injectable()
 @Table({tableName: 'uploaded_file'})
diff --git a/newback/src/data/database/model/user.auth.model.ts b/newback/src/data/model/user.auth.model.ts
similarity index 89%
rename from newback/src/data/database/model/user.auth.model.ts
rename to newback/src/data/model/user.auth.model.ts
index 5699919c3..cd6690988 100644
--- a/newback/src/data/database/model/user.auth.model.ts
+++ b/newback/src/data/model/user.auth.model.ts
@@ -7,8 +7,8 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
-import {VerificationModel} from '@/data/database/model/verification.model';
+import {UserModel} from '@/data/model/user.model';
+import {VerificationModel} from '@/data/model/verification.model';
 
 @Injectable()
 @Table({tableName: 'user_auth'})
diff --git a/newback/src/data/database/model/user.joined.info.model.ts b/newback/src/data/model/user.joined.info.model.ts
similarity index 88%
rename from newback/src/data/database/model/user.joined.info.model.ts
rename to newback/src/data/model/user.joined.info.model.ts
index 51b4d7b95..5b664672a 100644
--- a/newback/src/data/database/model/user.joined.info.model.ts
+++ b/newback/src/data/model/user.joined.info.model.ts
@@ -8,8 +8,8 @@ import {
   Unique,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
-import {IpAddressModel} from '@/data/database/model/ip.address.model';
+import {UserModel} from '@/data/model/user.model';
+import {IpAddressModel} from '@/data/model/ip.address.model';
 
 const uniqueUserJoinedInfoUserIdIpId = 'unique_user_joined_info_user_id_ip_id';
 
diff --git a/newback/src/data/database/model/user.model.ts b/newback/src/data/model/user.model.ts
similarity index 88%
rename from newback/src/data/database/model/user.model.ts
rename to newback/src/data/model/user.model.ts
index f01f8114a..061f9d85d 100644
--- a/newback/src/data/database/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -7,8 +7,8 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {Gender} from '@/data/types/frontend';
-import {UserAuthModel} from '@/data/database/model/user.auth.model';
-import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
+import {UserAuthModel} from '@/data/model/user.auth.model';
+import {MAX_USERNAME_LENGTH} from '@/utils/consts';
 
 
 @Injectable()
diff --git a/newback/src/data/database/model/user.profile.model.ts b/newback/src/data/model/user.profile.model.ts
similarity index 93%
rename from newback/src/data/database/model/user.profile.model.ts
rename to newback/src/data/model/user.profile.model.ts
index c7e605fc3..ff5e838c8 100644
--- a/newback/src/data/database/model/user.profile.model.ts
+++ b/newback/src/data/model/user.profile.model.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
+import {UserModel} from '@/data/model/user.model';
 
 @Injectable()
 @Table({tableName: 'user_profile'})
diff --git a/newback/src/data/database/model/user.settings.model.ts b/newback/src/data/model/user.settings.model.ts
similarity index 96%
rename from newback/src/data/database/model/user.settings.model.ts
rename to newback/src/data/model/user.settings.model.ts
index 2f8dccad8..101c551a9 100644
--- a/newback/src/data/database/model/user.settings.model.ts
+++ b/newback/src/data/model/user.settings.model.ts
@@ -8,7 +8,7 @@ import {
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {Theme,} from '@/data/types/frontend';
-import {UserModel} from '@/data/database/model/user.model';
+import {UserModel} from '@/data/model/user.model';
 import {
   LogLevel,
   logLevels
diff --git a/newback/src/data/database/model/verification.model.ts b/newback/src/data/model/verification.model.ts
similarity index 94%
rename from newback/src/data/database/model/verification.model.ts
rename to newback/src/data/model/verification.model.ts
index 754523c39..993a2721a 100644
--- a/newback/src/data/database/model/verification.model.ts
+++ b/newback/src/data/model/verification.model.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/database/model/user.model';
+import {UserModel} from '@/data/model/user.model';
 import {VerificationType} from '@/data/types/frontend';
 
 @Injectable()
diff --git a/newback/src/data/utils/helpers.ts b/newback/src/data/utils/helpers.ts
deleted file mode 100644
index 09db2036e..000000000
--- a/newback/src/data/utils/helpers.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
-
-export function generateUserName(email: string) {
-  return email.split('@')[0].replace(/[^0-9a-zA-Z-_]+/g, '-').substring(0, MAX_USERNAME_LENGTH);
-}
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 6e16d1cfc..5ac8d8766 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -24,7 +24,7 @@ import {
   ValidateUserResponse
 } from '@/data/types/frontend';
 import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.auth.reques.validator';
-import {CaptchaGuard} from '@/modules/util/guards/captcha.guard';
+import {CaptchaGuard} from '@/modules/app/guards/captcha.guard';
 import {ValidateEmailRequestValidator} from '@/modules/api/auth/validators/validate.email.request.validator';
 import {FacebookAuthRequestValidator} from '@/modules/api/auth/validators/facebook.auth.request.validator';
 import {SendRestorePasswordValidator} from '@/modules/api/auth/validators/send.restore.password.validator';
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 2c4eb11bc..958d59688 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -7,24 +7,24 @@ import * as supertest from 'supertest';
 import {Test} from '@nestjs/testing';
 import {AuthService} from '@/modules/api/auth/auth.service';
 import {AuthController} from '@/modules/api/auth/auth.controller';
-import {LoggerModule} from '@/modules/util/logger/logger.module';
+import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {PasswordService} from '@/modules/api/auth/password.service';
-import {UserRepository} from '@/data/database/repository/user.repository';
-import {RoomRepository} from '@/data/database/repository/room.repository';
-import {RedisService} from '@/data/redis/RedisService';
-import {EmailService} from '@/modules/util/email/email.service';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+import {RedisService} from '@/modules/rest/redis/RedisService';
+import {EmailService} from '@/modules/rest/email/email.service';
 import {MailerService} from '@nestjs-modules/mailer';
 import {Sequelize} from 'sequelize-typescript';
-import {HtmlService} from '@/modules/util/html/html.service';
+import {HtmlService} from '@/modules/rest/html/html.service';
 import waitForExpect from "wait-for-expect";
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {OAuth2Client} from 'google-auth-library';
-import {HttpService} from '@/modules/util/http/http.service';
+import {HttpService} from '@/modules/rest/http/http.service';
 import fetch from 'node-fetch';
 import * as googleResponseFixture from '@/fixtures/google.response.fixture.json';
 import * as facebookGetTokenResponseFixture from '@/fixtures/facebook.get.token.response.json';
 import * as facebookGetUserResponseFixture from '@/fixtures/facebook.get.user.response.json';
-import {ConfigService} from '@/modules/util/config/config.service';
+import {ConfigService} from '@/modules/rest/config/config.service';
 import {
   config,
   IConfig
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index 0e5102ae7..ee113ac9a 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -4,16 +4,16 @@ import {
 } from '@nestjs/common';
 import {AuthController} from '@/modules/api/auth/auth.controller';
 import {AuthService} from '@/modules/api/auth/auth.service';
-import {DatabaseModule} from '@/data/database/database.module';
-import {RedisService} from '@/data/redis/RedisService';
-import {EmailModule} from '@/modules/util/email/email.module';
+import {DatabaseModule} from '@/modules/rest/database/database.module';
+import {RedisService} from '@/modules/rest/redis/RedisService';
+import {EmailModule} from '@/modules/rest/email/email.module';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {OAuth2Client} from 'google-auth-library';
 import {config} from 'node-ts-config';
-import {HttpModule} from '@/modules/util/http/http.module';
+import {HttpModule} from '@/modules/rest/http/http.module';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
-import {ConfigService} from '@/modules/util/config/config.service';
+import {ConfigService} from '@/modules/rest/config/config.service';
 
 @Module({
   imports: [DatabaseModule, EmailModule, HttpModule],
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 6b7f4fe50..bb7ccad72 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -5,7 +5,7 @@ import {
   Logger,
   UnauthorizedException
 } from '@nestjs/common';
-import {UserRepository} from '@/data/database/repository/user.repository';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {
   AcceptTokenRequest,
@@ -25,21 +25,21 @@ import {
   VerificationType,
   VerifyTokenResponse
 } from '@/data/types/frontend';
-import {RoomRepository} from '@/data/database/repository/room.repository';
+import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
 import {
   ALL_ROOM_ID,
   MAX_USERNAME_LENGTH
-} from '@/data/utils/consts';
-import {RedisService} from '@/data/redis/RedisService';
-import {EmailService} from '@/modules/util/email/email.service';
+} from '@/utils/consts';
+import {RedisService} from '@/modules/rest/redis/RedisService';
+import {EmailService} from '@/modules/rest/email/email.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {TokenPayload} from 'google-auth-library';
-import {generateUserName} from '@/data/utils/helpers';
+import {generateUserName} from '@/utils/helpers';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
 import {FacebookGetUserResponse} from '@/data/types/api';
-import {VerificationModel} from '@/data/database/model/verification.model';
+import {VerificationModel} from '@/data/model/verification.model';
 
 @Injectable()
 export class AuthService {
diff --git a/newback/src/modules/api/auth/facebook.auth.service.ts b/newback/src/modules/api/auth/facebook.auth.service.ts
index 23da497f3..c47790d32 100644
--- a/newback/src/modules/api/auth/facebook.auth.service.ts
+++ b/newback/src/modules/api/auth/facebook.auth.service.ts
@@ -6,8 +6,8 @@ import {
   Logger,
   ServiceUnavailableException,
 } from '@nestjs/common';
-import {HttpService} from '@/modules/util/http/http.service';
-import {ConfigService} from '@/modules/util/config/config.service';
+import {HttpService} from '@/modules/rest/http/http.service';
+import {ConfigService} from '@/modules/rest/config/config.service';
 import {FacebookGetUserResponse} from '@/data/types/api';
 
 @Injectable()
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index ebebb89cf..da1a6d4a2 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -11,7 +11,7 @@ import {
   Gender,
   SignUpRequest,
 } from '@/data/types/frontend';
-import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
+import {MAX_USERNAME_LENGTH} from '@/utils/consts';
 
 export class SignUpRequestValidator implements SignUpRequest {
 
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index 777323f73..b8ccae791 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -4,7 +4,7 @@ import {
   Matches,
 } from 'class-validator';
 import {ValidateUserRequest} from '@/data/types/frontend';
-import {MAX_USERNAME_LENGTH} from '@/data/utils/consts';
+import {MAX_USERNAME_LENGTH} from '@/utils/consts';
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {
   @IsString()
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 0840b59e9..3ff0cb811 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -1,14 +1,14 @@
 import {Module} from '@nestjs/common';
 import {AuthModule} from '@/modules/api/auth/auth.module';
-import {LoggingInterceptor} from '@/modules/util/interceptors/logging.interceptor';
+import {LoggingInterceptor} from '@/modules/app/interceptors/logging.interceptor';
 import {
   APP_INTERCEPTOR,
   RouterModule
 } from '@nestjs/core';
-import {LoggerModule} from '@/modules/util/logger/logger.module';
+import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {RedisModule} from '@nestjs-modules/ioredis';
 import {config} from 'node-ts-config';
-import {ConfigModule} from '@/modules/util/config/config.module';
+import {ConfigModule} from '@/modules/rest/config/config.module';
 
 @Module({
   imports: [AuthModule, LoggerModule, ConfigModule, RedisModule.forRoot({
diff --git a/newback/src/modules/util/guards/captcha.guard.ts b/newback/src/modules/app/guards/captcha.guard.ts
similarity index 90%
rename from newback/src/modules/util/guards/captcha.guard.ts
rename to newback/src/modules/app/guards/captcha.guard.ts
index d49c5e8cb..c123b7dd5 100644
--- a/newback/src/modules/util/guards/captcha.guard.ts
+++ b/newback/src/modules/app/guards/captcha.guard.ts
@@ -12,8 +12,8 @@ import {
 	Recaptcha
 } from 'node-ts-config';
 
-import {ConfigService} from '@/modules/util/config/config.service';
-import {HttpService} from '@/modules/util/http/http.service';
+import {ConfigService} from '@/modules/rest/config/config.service';
+import {HttpService} from '@/modules/rest/http/http.service';
 @Injectable()
 export class CaptchaGuard implements CanActivate {
   constructor(
diff --git a/newback/src/modules/util/interceptors/logging.interceptor.ts b/newback/src/modules/app/interceptors/logging.interceptor.ts
similarity index 100%
rename from newback/src/modules/util/interceptors/logging.interceptor.ts
rename to newback/src/modules/app/interceptors/logging.interceptor.ts
diff --git a/newback/src/modules/util/config/config.module.ts b/newback/src/modules/rest/config/config.module.ts
similarity index 81%
rename from newback/src/modules/util/config/config.module.ts
rename to newback/src/modules/rest/config/config.module.ts
index 162de8b24..0a3a6e7e3 100644
--- a/newback/src/modules/util/config/config.module.ts
+++ b/newback/src/modules/rest/config/config.module.ts
@@ -2,7 +2,7 @@ import {
   Global,
   Module
 } from '@nestjs/common';
-import {ConfigService} from '@/modules/util/config/config.service';
+import {ConfigService} from '@/modules/rest/config/config.service';
 import {config} from 'node-ts-config';
 
 @Global()
diff --git a/newback/src/modules/util/config/config.service.ts b/newback/src/modules/rest/config/config.service.ts
similarity index 100%
rename from newback/src/modules/util/config/config.service.ts
rename to newback/src/modules/rest/config/config.service.ts
diff --git a/newback/src/modules/rest/database/database.module.ts b/newback/src/modules/rest/database/database.module.ts
new file mode 100644
index 000000000..242246c5a
--- /dev/null
+++ b/newback/src/modules/rest/database/database.module.ts
@@ -0,0 +1,64 @@
+import {Module} from '@nestjs/common';
+import {SequelizeModule} from '@nestjs/sequelize';
+
+import {generateOrmConfig} from '@/utils/helpers';
+import {ChannelModel} from '@/data/model/channel.model';
+import {ImageModel} from '@/data/model/image.model';
+import {IpAddressModel} from '@/data/model/ip.address.model';
+import {MessageHistoryModel} from '@/data/model/message.history.model';
+import {MessageModel} from '@/data/model/message.model';
+import {RoomModel} from '@/data/model/room.model';
+import {RoomUsersModel} from '@/data/model/room.users.model';
+import {MessageMentionModel} from '@/data/model/message.mention.model';
+import {SubscriptionMessageModel} from '@/data/model/subscription.message.model';
+import {SubscriptionModel} from '@/data/model/subscription.model';
+import {UploadedFileModel} from '@/data/model/uploaded.file.model';
+import {UserAuthModel} from '@/data/model/user.auth.model';
+import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
+import {UserModel} from '@/data/model/user.model';
+import {UserProfileModel} from '@/data/model/user.profile.model';
+import {UserSettingsModel} from '@/data/model/user.settings.model';
+import {VerificationModel} from '@/data/model/verification.model';
+import {Logger} from '@nestjs/common/services/logger.service';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+
+const repositories = [
+  UserRepository,
+  RoomRepository,
+];
+
+@Module({
+  imports: [
+    SequelizeModule.forRootAsync({
+      inject: [Logger],
+      useFactory: (logger: Logger) => generateOrmConfig((sql) => logger.debug(sql, 'sql')),
+    }),
+    SequelizeModule.forFeature([
+      ChannelModel,
+      ImageModel,
+      IpAddressModel,
+      MessageHistoryModel,
+      MessageMentionModel,
+      MessageModel,
+      RoomModel,
+      RoomUsersModel,
+      SubscriptionMessageModel,
+      SubscriptionModel,
+      UploadedFileModel,
+      UserAuthModel,
+      UserJoinedInfoModel,
+      UserModel,
+      UserProfileModel,
+      UserSettingsModel,
+      VerificationModel,
+    ]),
+  ],
+  providers: [...repositories],
+  exports: [
+    SequelizeModule,
+    ...repositories,
+  ],
+})
+export class DatabaseModule {
+}
diff --git a/newback/src/data/database/repository/room.repository.ts b/newback/src/modules/rest/database/repository/room.repository.ts
similarity index 82%
rename from newback/src/data/database/repository/room.repository.ts
rename to newback/src/modules/rest/database/repository/room.repository.ts
index 633d6f3e6..b715d0818 100644
--- a/newback/src/data/database/repository/room.repository.ts
+++ b/newback/src/modules/rest/database/repository/room.repository.ts
@@ -1,7 +1,7 @@
 import {Injectable} from '@nestjs/common';
 import {InjectModel} from '@nestjs/sequelize';
-import {RoomModel} from '@/data/database/model/room.model';
-import {RoomUsersModel} from '@/data/database/model/room.users.model';
+import {RoomModel} from '@/data/model/room.model';
+import {RoomUsersModel} from '@/data/model/room.users.model';
 import {Transaction} from 'sequelize';
 
 
diff --git a/newback/src/data/database/repository/user.repository.ts b/newback/src/modules/rest/database/repository/user.repository.ts
similarity index 92%
rename from newback/src/data/database/repository/user.repository.ts
rename to newback/src/modules/rest/database/repository/user.repository.ts
index fca146f49..c46e55c11 100644
--- a/newback/src/data/database/repository/user.repository.ts
+++ b/newback/src/modules/rest/database/repository/user.repository.ts
@@ -1,14 +1,14 @@
 import {Injectable} from '@nestjs/common';
 import {InjectModel} from '@nestjs/sequelize';
-import {UserModel} from '@/data/database/model/user.model';
-import {UserAuthModel} from '@/data/database/model/user.auth.model';
+import {UserModel} from '@/data/model/user.model';
+import {UserAuthModel} from '@/data/model/user.auth.model';
 import {
   Gender,
   VerificationType
 } from '@/data/types/frontend';
-import {UserProfileModel} from '@/data/database/model/user.profile.model';
-import {UserSettingsModel} from '@/data/database/model/user.settings.model';
-import {VerificationModel} from '@/data/database/model/verification.model';
+import {UserProfileModel} from '@/data/model/user.profile.model';
+import {UserSettingsModel} from '@/data/model/user.settings.model';
+import {VerificationModel} from '@/data/model/verification.model';
 import {Transaction} from 'sequelize';
 
 
diff --git a/newback/src/modules/util/email/email.module.ts b/newback/src/modules/rest/email/email.module.ts
similarity index 73%
rename from newback/src/modules/util/email/email.module.ts
rename to newback/src/modules/rest/email/email.module.ts
index a9ecbf9f2..f7a7d8d2e 100644
--- a/newback/src/modules/util/email/email.module.ts
+++ b/newback/src/modules/rest/email/email.module.ts
@@ -1,8 +1,8 @@
 import {Module} from '@nestjs/common';
 import {MailerModule} from '@nestjs-modules/mailer';
 import {config} from 'node-ts-config';
-import {EmailService} from '@/modules/util/email/email.service';
-import {HtmlService} from '@/modules/util/html/html.service';
+import {EmailService} from '@/modules/rest/email/email.service';
+import {HtmlService} from '@/modules/rest/html/html.service';
 
 
 @Module({
diff --git a/newback/src/modules/util/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
similarity index 89%
rename from newback/src/modules/util/email/email.service.spec.ts
rename to newback/src/modules/rest/email/email.service.spec.ts
index cb46d50d4..4a41df099 100644
--- a/newback/src/modules/util/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -1,12 +1,12 @@
-import {HtmlService} from '@/modules/util/html/html.service';
-import {EmailService} from '@/modules/util/email/email.service';
+import {HtmlService} from '@/modules/rest/html/html.service';
+import {EmailService} from '@/modules/rest/email/email.service';
 import {
   Test,
   TestingModule
 } from '@nestjs/testing';
-import {LoggerModule} from '@/modules/util/logger/logger.module';
+import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {MailerService} from '@nestjs-modules/mailer';
-import {ConfigModule} from '@/modules/util/config/config.module';
+import {ConfigModule} from '@/modules/rest/config/config.module';
 import {promisify} from 'util';
 import {readFile} from 'fs';
 import {resolve} from 'path';
diff --git a/newback/src/modules/util/email/email.service.ts b/newback/src/modules/rest/email/email.service.ts
similarity index 94%
rename from newback/src/modules/util/email/email.service.ts
rename to newback/src/modules/rest/email/email.service.ts
index b37515c53..702455f80 100644
--- a/newback/src/modules/util/email/email.service.ts
+++ b/newback/src/modules/rest/email/email.service.ts
@@ -2,9 +2,9 @@ import {
   Injectable,
   Logger
 } from '@nestjs/common';
-import {HtmlService} from '@/modules/util/html/html.service';
+import {HtmlService} from '@/modules/rest/html/html.service';
 import {MailerService} from '@nestjs-modules/mailer';
-import {ConfigService} from '@/modules/util/config/config.service';
+import {ConfigService} from '@/modules/rest/config/config.service';
 
 @Injectable()
 export class EmailService {
diff --git a/newback/src/modules/util/html/html.service.spec.ts b/newback/src/modules/rest/html/html.service.spec.ts
similarity index 93%
rename from newback/src/modules/util/html/html.service.spec.ts
rename to newback/src/modules/rest/html/html.service.spec.ts
index 7641e3179..92d322ab6 100644
--- a/newback/src/modules/util/html/html.service.spec.ts
+++ b/newback/src/modules/rest/html/html.service.spec.ts
@@ -1,4 +1,4 @@
-import {HtmlService} from '@/modules/util/html/html.service';
+import {HtmlService} from '@/modules/rest/html/html.service';
 
 describe('HtmlService', () => {
 
diff --git a/newback/src/modules/util/html/html.service.ts b/newback/src/modules/rest/html/html.service.ts
similarity index 100%
rename from newback/src/modules/util/html/html.service.ts
rename to newback/src/modules/rest/html/html.service.ts
diff --git a/newback/src/modules/util/http/http.module.ts b/newback/src/modules/rest/http/http.module.ts
similarity index 82%
rename from newback/src/modules/util/http/http.module.ts
rename to newback/src/modules/rest/http/http.module.ts
index 723b73e0c..60797b738 100644
--- a/newback/src/modules/util/http/http.module.ts
+++ b/newback/src/modules/rest/http/http.module.ts
@@ -3,7 +3,7 @@ import {
   Logger,
   Module
 } from '@nestjs/common';
-import {HttpService} from '@/modules/util/http/http.service';
+import {HttpService} from '@/modules/rest/http/http.service';
 import fetch from 'node-fetch';
 
 @Global()
diff --git a/newback/src/modules/util/http/http.service.ts b/newback/src/modules/rest/http/http.service.ts
similarity index 100%
rename from newback/src/modules/util/http/http.service.ts
rename to newback/src/modules/rest/http/http.service.ts
diff --git a/newback/src/modules/util/logger/logger.module.ts b/newback/src/modules/rest/logger/logger.module.ts
similarity index 100%
rename from newback/src/modules/util/logger/logger.module.ts
rename to newback/src/modules/rest/logger/logger.module.ts
diff --git a/newback/src/data/redis/RedisService.ts b/newback/src/modules/rest/redis/RedisService.ts
similarity index 87%
rename from newback/src/data/redis/RedisService.ts
rename to newback/src/modules/rest/redis/RedisService.ts
index f41a3daec..56fa6aa74 100644
--- a/newback/src/data/redis/RedisService.ts
+++ b/newback/src/modules/rest/redis/RedisService.ts
@@ -1,5 +1,5 @@
 import {Injectable} from '@nestjs/common';
-import {REDIS_SESSIONS_KEY} from '@/data/utils/consts';
+import {REDIS_SESSIONS_KEY} from '@/utils/consts';
 import {
   InjectRedis,
   Redis
diff --git a/newback/src/data/utils/consts.ts b/newback/src/utils/consts.ts
similarity index 100%
rename from newback/src/data/utils/consts.ts
rename to newback/src/utils/consts.ts
diff --git a/newback/src/data/utils/helpers.spec.ts b/newback/src/utils/helpers.spec.ts
similarity index 89%
rename from newback/src/data/utils/helpers.spec.ts
rename to newback/src/utils/helpers.spec.ts
index ec5289dc0..18df68d2f 100644
--- a/newback/src/data/utils/helpers.spec.ts
+++ b/newback/src/utils/helpers.spec.ts
@@ -1,4 +1,4 @@
-import {generateUserName} from '@/data/utils/helpers';
+import {generateUserName} from '@/utils/helpers';
 
 describe('helper', () => {
 
diff --git a/newback/src/data/database/ormconfig.ts b/newback/src/utils/helpers.ts
similarity index 67%
rename from newback/src/data/database/ormconfig.ts
rename to newback/src/utils/helpers.ts
index 926977471..bcfdce6fd 100644
--- a/newback/src/data/database/ormconfig.ts
+++ b/newback/src/utils/helpers.ts
@@ -1,8 +1,12 @@
 import type {SequelizeModuleOptions} from '@nestjs/sequelize';
-import {config} from 'node-ts-config';
 
+import {MAX_USERNAME_LENGTH} from '@/utils/consts';
+import {config} from 'node-ts-config';
 
-export function generateConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, 'ssl'> {
+export function generateUserName(email: string) {
+  return email.split('@')[0].replace(/[^0-9a-zA-Z-_]+/g, '-').substring(0, MAX_USERNAME_LENGTH);
+}
+export function generateOrmConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, 'ssl'> {
   return {
     synchronize: config.mysql.synchronize,
     logging: config.mysql.logging ? logging : false,
diff --git a/newback/src/migration.runner.ts b/newback/src/utils/migration.runner.ts
similarity index 87%
rename from newback/src/migration.runner.ts
rename to newback/src/utils/migration.runner.ts
index fc706e3d1..1ea2d205d 100644
--- a/newback/src/migration.runner.ts
+++ b/newback/src/utils/migration.runner.ts
@@ -1,11 +1,11 @@
 import {createConnection} from 'mysql2';
-import {generateConfig} from '@/data/database/ormconfig';
+import {generateOrmConfig} from '@/utils/helpers';
 import {
   CommandsRunner,
   MysqlDriver
 } from 'node-db-migration';
 
-const {database, host, password, port, username, define} = generateConfig((sql) => console.log(sql))
+const {database, host, password, port, username, define} = generateOrmConfig((sql) => console.log(sql))
 
 const connection = createConnection({
   database,

From 43b3b92fbb54885dd537a7dc48ea2fa91d0f6515 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 16:43:15 +0300
Subject: [PATCH 033/221] Fixed migration sql

---
 .../config/migration-template/202204110326-init.sql   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/newback/config/migration-template/202204110326-init.sql b/newback/config/migration-template/202204110326-init.sql
index 0e2feb71a..f7dc3af51 100644
--- a/newback/config/migration-template/202204110326-init.sql
+++ b/newback/config/migration-template/202204110326-init.sql
@@ -18,7 +18,7 @@ CREATE TABLE `channel`
 (
     `id`         INTEGER auto_increment,
     `name`       VARCHAR(16) NOT NULL,
-    `creator_id` INTEGER,
+    `creator_id` INTEGER NOT NULL,
     `created_at` DATETIME    NOT NULL,
     `updated_at` DATETIME    NOT NULL,
     `deleted_at` DATETIME,
@@ -91,6 +91,7 @@ CREATE TABLE `ip_address`
 (
     `id`           INTEGER auto_increment,
     `ip`           VARCHAR(32) NOT NULL UNIQUE,
+    `status`       TINYINT(1) NOT NULL DEFAULT true,
     `isp`          VARCHAR(255),
     `country_code` VARCHAR(16),
     `country`      VARCHAR(64),
@@ -287,3 +288,11 @@ CREATE TABLE `user_settings`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE utf8mb4_general_ci;
+
+INSERT INTO user (id, last_time_online, username, sex, thumbnail, created_at, updated_at, deleted_at) VALUES (1, '2022-04-13 13:37:37', '1', 'OTHER', null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO channel (id, name, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, '2022-04-13 16:32:11', '2022-04-13 16:32:09', null);
+INSERT INTO room (id, name, is_main_in_channel, p2p, channel_id, creator_id, created_at, updated_at, deleted_at) VALUES (1, null, 1, DEFAULT, 1, 1, '2022-04-13 16:35:16', '2022-04-13 16:35:20', null)
+INSERT INTO user_profile (id, name, city, surname, birthday, contacts, created_at, updated_at, deleted_at) VALUES (1, null, null, null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO user_auth (id, password, email, facebook_id, google_id, email_verification_id, created_at, updated_at, deleted_at) VALUES (1, '$2b$10$8RTcHp1.oCEYGiPgLbTHH.Fk8MC6YUySzJ8AxGFxnjFqb.zsdlH7m', 'deathangel908@gmail.com', null, null, 1, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO user_settings (id, suggestions, show_when_im_typing, embedded_youtube, highlight_code, message_sound, incoming_file_call_sound, online_change_messages, devtools_logs, theme, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 'error', 'COLOR_REG', '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO room_user (id, room_id, user_id, volume, notifications, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 2, 0, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);

From a2ce340642d48bec6b77b8a62e9415337e1ec5ad Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 17:02:59 +0300
Subject: [PATCH 034/221] Fixed migrati

---
 frontend/src/vue/auth/SignUp.vue              |  6 +-
 newback/config/Config.d.ts                    | 10 ++-
 newback/config/default.json                   |  3 -
 .../migration-template/202204110326-init.sql  |  6 +-
 newback/src/data/model/channel.model.ts       |  2 +-
 newback/src/data/model/ip.address.model.ts    |  7 ++
 newback/src/data/model/room.model.ts          |  4 +-
 newback/src/data/types/api.ts                 | 24 +++++++
 newback/src/fixtures/ip.134.249.113.11.json   | 16 +++++
 .../src/modules/api/auth/auth.module.spec.ts  |  2 +-
 newback/src/modules/api/auth/auth.module.ts   |  5 +-
 newback/src/modules/api/auth/auth.service.ts  | 11 ++-
 .../modules/rest/database/database.module.ts  |  2 +
 .../rest/database/repository/ip.repository.ts | 27 ++++++++
 newback/src/modules/rest/http/http.service.ts |  2 +-
 .../src/modules/rest/ip/ip.cache.service.ts   | 68 +++++++++++++++++++
 newback/src/modules/rest/ip/ip.module.ts      | 17 +++++
 .../modules/rest/ip/ip.service.e2e.spec.ts    | 47 +++++++++++++
 newback/src/modules/rest/ip/ip.service.ts     | 45 ++++++++++++
 .../{RedisService.ts => redis.service.ts}     |  0
 newback/src/utils/helpers.ts                  |  7 +-
 newback/src/utils/migration.runner.ts         |  3 +-
 22 files changed, 285 insertions(+), 29 deletions(-)
 create mode 100644 newback/src/fixtures/ip.134.249.113.11.json
 create mode 100644 newback/src/modules/rest/database/repository/ip.repository.ts
 create mode 100644 newback/src/modules/rest/ip/ip.cache.service.ts
 create mode 100644 newback/src/modules/rest/ip/ip.module.ts
 create mode 100644 newback/src/modules/rest/ip/ip.service.e2e.spec.ts
 create mode 100644 newback/src/modules/rest/ip/ip.service.ts
 rename newback/src/modules/rest/redis/{RedisService.ts => redis.service.ts} (100%)

diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index 09c698d6e..b401384ee 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -330,7 +330,7 @@ export default class SignUp extends Vue {
 
   sexFoc: boolean = true;
 
-  sex: string = Gender.OTHER;
+  sex: Gender = Gender.OTHER;
 
   sexDescription: string = "Need a help?";
 
@@ -355,8 +355,8 @@ export default class SignUp extends Vue {
     const {session} = await this.$api.signUp({
       username: this.username,
       password: this.password,
-      email: this.email,
-
+      email: this.email || undefined, // undefined is not sending via json.stringify
+      sex: this.sex,
     });
     const message: LoginMessage = {
       action: "login",
diff --git a/newback/config/Config.d.ts b/newback/config/Config.d.ts
index 0a75c345e..0b63fae9b 100644
--- a/newback/config/Config.d.ts
+++ b/newback/config/Config.d.ts
@@ -15,13 +15,12 @@ declare module "node-ts-config" {
   interface Email {
     host: string
     port: number
+    secure: boolean
     auth: Auth2
-    from: string
   }
   interface Auth2 {
-    type: string
     user: string
-    password: string
+    pass: string
   }
   interface Recaptcha {
     publicKey: string
@@ -38,13 +37,13 @@ declare module "node-ts-config" {
     clientId: string
   }
   interface Mysql {
-    synchronize: boolean
-    logging: boolean
     host: string
     port: number
     username: string
     password: string
     database: string
+    synchronize: boolean
+    logging: boolean
   }
   interface Frontend {
     address: string
@@ -68,7 +67,6 @@ declare module "node-ts-config" {
     allRoomId: number
     showCountryCode: boolean
     firebaseUrl: string
-    ipApiUrl: string
     pingCloseJsDelay: number
     pingInterval: number
     clientNoServerPingCloseTimeout: number
diff --git a/newback/config/default.json b/newback/config/default.json
index 93a0d6f24..298b5a210 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -14,7 +14,6 @@
     "allRoomId": 1,
     "showCountryCode": false,
     "firebaseUrl": "https://fcm.googleapis.com/fcm/send",
-    "ipApiUrl": "http://ip-api.com/json/%s",
     "pingCloseJsDelay": 10000,
     "pingInterval": 300000,
     "clientNoServerPingCloseTimeout": 320000
@@ -35,8 +34,6 @@
     }
   },
   "mysql": {
-    "synchronize": false,
-    "logging": true,
     "host": "localhost",
     "port": 3306,
     "username": "pychat",
diff --git a/newback/config/migration-template/202204110326-init.sql b/newback/config/migration-template/202204110326-init.sql
index f7dc3af51..38666e7b6 100644
--- a/newback/config/migration-template/202204110326-init.sql
+++ b/newback/config/migration-template/202204110326-init.sql
@@ -23,7 +23,7 @@ CREATE TABLE `channel`
     `updated_at` DATETIME    NOT NULL,
     `deleted_at` DATETIME,
     PRIMARY KEY (`id`),
-    FOREIGN KEY (`creator_id`) REFERENCES `user` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+    FOREIGN KEY (`creator_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE utf8mb4_general_ci;
@@ -291,8 +291,8 @@ CREATE TABLE `user_settings`
 
 INSERT INTO user (id, last_time_online, username, sex, thumbnail, created_at, updated_at, deleted_at) VALUES (1, '2022-04-13 13:37:37', '1', 'OTHER', null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
 INSERT INTO channel (id, name, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, '2022-04-13 16:32:11', '2022-04-13 16:32:09', null);
-INSERT INTO room (id, name, is_main_in_channel, p2p, channel_id, creator_id, created_at, updated_at, deleted_at) VALUES (1, null, 1, DEFAULT, 1, 1, '2022-04-13 16:35:16', '2022-04-13 16:35:20', null)
+INSERT INTO room (id, name, is_main_in_channel, p2p, channel_id, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, DEFAULT, 1, 1, '2022-04-13 16:35:16', '2022-04-13 16:35:20', null);
 INSERT INTO user_profile (id, name, city, surname, birthday, contacts, created_at, updated_at, deleted_at) VALUES (1, null, null, null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
-INSERT INTO user_auth (id, password, email, facebook_id, google_id, email_verification_id, created_at, updated_at, deleted_at) VALUES (1, '$2b$10$8RTcHp1.oCEYGiPgLbTHH.Fk8MC6YUySzJ8AxGFxnjFqb.zsdlH7m', 'deathangel908@gmail.com', null, null, 1, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO user_auth (id, password, email, facebook_id, google_id, email_verification_id, created_at, updated_at, deleted_at) VALUES (1, '$2b$10$8RTcHp1.oCEYGiPgLbTHH.Fk8MC6YUySzJ8AxGFxnjFqb.zsdlH7m', 'deathangel908@gmail.com', null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
 INSERT INTO user_settings (id, suggestions, show_when_im_typing, embedded_youtube, highlight_code, message_sound, incoming_file_call_sound, online_change_messages, devtools_logs, theme, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 'error', 'COLOR_REG', '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
 INSERT INTO room_user (id, room_id, user_id, volume, notifications, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 2, 0, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
diff --git a/newback/src/data/model/channel.model.ts b/newback/src/data/model/channel.model.ts
index 24a2cf5d8..ab3a380ec 100644
--- a/newback/src/data/model/channel.model.ts
+++ b/newback/src/data/model/channel.model.ts
@@ -28,7 +28,7 @@ export class ChannelModel extends Model<ChannelModel> {
 
   @ForeignKey(() => UserModel)
   @Column({
-    allowNull: true, // main room no id
+    allowNull: false,
     type: DataType.INTEGER,
   })
   public creatorId: number;
diff --git a/newback/src/data/model/ip.address.model.ts b/newback/src/data/model/ip.address.model.ts
index 64a2333b8..ebf5b450a 100644
--- a/newback/src/data/model/ip.address.model.ts
+++ b/newback/src/data/model/ip.address.model.ts
@@ -24,6 +24,13 @@ export class IpAddressModel extends Model<IpAddressModel> {
   })
   public ip: string;
 
+  @Column({
+    type: DataType.BOOLEAN,
+    defaultValue: true,
+    allowNull: false,
+  })
+  public status: boolean;
+
   @Column({
     type: DataType.STRING,
     allowNull: true,
diff --git a/newback/src/data/model/room.model.ts b/newback/src/data/model/room.model.ts
index c39bf1689..d75a35f93 100644
--- a/newback/src/data/model/room.model.ts
+++ b/newback/src/data/model/room.model.ts
@@ -66,8 +66,8 @@ export class RoomModel extends Model<RoomModel> {
     allowNull: true,
     defaultValue: null,
   })
-  public creatorId: number;
+  public creatorId: number|null;
 
   @BelongsTo(() => UserModel)
-  public creator: UserModel;
+  public creator: UserModel|null;
 }
diff --git a/newback/src/data/types/api.ts b/newback/src/data/types/api.ts
index e161dc05e..e2fc2891a 100644
--- a/newback/src/data/types/api.ts
+++ b/newback/src/data/types/api.ts
@@ -3,3 +3,27 @@ export interface FacebookGetUserResponse {
   last_name: string;
   id: string;
 }
+
+export interface IpFailedInfoResponse {
+  message: string;
+  status: 'fail';
+}
+export const IP_FAIL = 'fail';
+
+export interface IpSuccessInfoResponse  {
+  status: 'success';
+  country: string;
+  countryCode: string;
+  region: string;
+  regionName: string;
+  city: string;
+  zip: string;
+  lat: number;
+  lon: number;
+  timezone: string;
+  isp: string;
+  org: string;
+  as: string;
+  query: string;
+}
+export type IpInfoResponse = IpFailedInfoResponse | IpSuccessInfoResponse;
diff --git a/newback/src/fixtures/ip.134.249.113.11.json b/newback/src/fixtures/ip.134.249.113.11.json
new file mode 100644
index 000000000..a769f3526
--- /dev/null
+++ b/newback/src/fixtures/ip.134.249.113.11.json
@@ -0,0 +1,16 @@
+{
+  "status": "success",
+  "country": "Ukraine",
+  "countryCode": "UA",
+  "region": "30",
+  "regionName": "Kyiv City",
+  "city": "Kyiv",
+  "zip": "01000",
+  "lat": 50.4501,
+  "lon": 30.5234,
+  "timezone": "Europe/Kiev",
+  "isp": "Kyivstar UA",
+  "org": "Kyivstar LLC",
+  "as": "AS15895 Kyivstar PJSC",
+  "query": "134.249.113.11"
+}
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 958d59688..de6f1e2c7 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -11,7 +11,7 @@ import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {PasswordService} from '@/modules/api/auth/password.service';
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
-import {RedisService} from '@/modules/rest/redis/RedisService';
+import {RedisService} from '@/modules/rest/redis/redis.service';
 import {EmailService} from '@/modules/rest/email/email.service';
 import {MailerService} from '@nestjs-modules/mailer';
 import {Sequelize} from 'sequelize-typescript';
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index ee113ac9a..9527c2563 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -5,7 +5,7 @@ import {
 import {AuthController} from '@/modules/api/auth/auth.controller';
 import {AuthService} from '@/modules/api/auth/auth.service';
 import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {RedisService} from '@/modules/rest/redis/RedisService';
+import {RedisService} from '@/modules/rest/redis/redis.service';
 import {EmailModule} from '@/modules/rest/email/email.module';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
 import {PasswordService} from '@/modules/api/auth/password.service';
@@ -14,9 +14,10 @@ import {config} from 'node-ts-config';
 import {HttpModule} from '@/modules/rest/http/http.module';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
 import {ConfigService} from '@/modules/rest/config/config.service';
+import {IpModule} from '@/modules/rest/ip/ip.module';
 
 @Module({
-  imports: [DatabaseModule, EmailModule, HttpModule],
+  imports: [DatabaseModule, EmailModule, HttpModule, IpModule],
   controllers: [AuthController],
   providers: [
     AuthService,
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index bb7ccad72..381410ab9 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -30,7 +30,7 @@ import {
   ALL_ROOM_ID,
   MAX_USERNAME_LENGTH
 } from '@/utils/consts';
-import {RedisService} from '@/modules/rest/redis/RedisService';
+import {RedisService} from '@/modules/rest/redis/redis.service';
 import {EmailService} from '@/modules/rest/email/email.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
@@ -40,6 +40,8 @@ import {generateUserName} from '@/utils/helpers';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
 import {FacebookGetUserResponse} from '@/data/types/api';
 import {VerificationModel} from '@/data/model/verification.model';
+import {IpService} from '@/modules/rest/ip/ip.service';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
 
 @Injectable()
 export class AuthService {
@@ -51,6 +53,7 @@ export class AuthService {
     private readonly redisService: RedisService,
     private readonly emailService: EmailService,
     private readonly googleAuthService: GoogleAuthService,
+    private readonly ipCacheService: IpCacheService,
     private readonly facebookService: FacebookAuthService,
     private readonly sequelize: Sequelize,
     private readonly logger: Logger,
@@ -162,7 +165,8 @@ export class AuthService {
         let token = await this.passwordService.generateRandomString(32);
         this.logger.log(`Generated token for userId ${userId}: ${token}`)
         await this.userRepository.createVerification(email, userId, token, VerificationType.REGISTER, t)
-        await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ip)
+        let ipInfo = await this.ipCacheService.getIpString(ip)
+        await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ipInfo)
       });
     } catch (e) {
       this.logger.error(`Can't send email to userid ${userId} ${email} because ${e.message}`, e.stack, 'Mail')
@@ -265,7 +269,8 @@ export class AuthService {
       let token: string = await this.passwordService.generateRandomString(32);
       this.logger.log(`Generated token='${token}' to restore user email='${email}'`);
       await this.userRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t)
-      await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ip)
+      let ipInfo = await this.ipCacheService.getIpString(ip);
+      await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ipInfo)
     });
   }
 
diff --git a/newback/src/modules/rest/database/database.module.ts b/newback/src/modules/rest/database/database.module.ts
index 242246c5a..ddc220d5e 100644
--- a/newback/src/modules/rest/database/database.module.ts
+++ b/newback/src/modules/rest/database/database.module.ts
@@ -22,10 +22,12 @@ import {VerificationModel} from '@/data/model/verification.model';
 import {Logger} from '@nestjs/common/services/logger.service';
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 
 const repositories = [
   UserRepository,
   RoomRepository,
+  IpRepository,
 ];
 
 @Module({
diff --git a/newback/src/modules/rest/database/repository/ip.repository.ts b/newback/src/modules/rest/database/repository/ip.repository.ts
new file mode 100644
index 000000000..39b210140
--- /dev/null
+++ b/newback/src/modules/rest/database/repository/ip.repository.ts
@@ -0,0 +1,27 @@
+import {Injectable} from '@nestjs/common';
+import {InjectModel} from '@nestjs/sequelize';
+import {RoomModel} from '@/data/model/room.model';
+import {RoomUsersModel} from '@/data/model/room.users.model';
+import {Transaction} from 'sequelize';
+import {IpAddressModel} from '@/data/model/ip.address.model';
+
+
+@Injectable()
+export class IpRepository {
+  public constructor(
+    @InjectModel(IpAddressModel) private readonly ipAddressModel: typeof IpAddressModel,
+  ) {
+  }
+
+  public async saveIP(model: Partial<IpAddressModel>) {
+    return this.ipAddressModel.upsert(model);
+  }
+
+  public async getIp(ip: string): Promise<IpAddressModel> {
+    return this.ipAddressModel.findOne({
+      where: {
+        ip
+      }
+    });
+  }
+}
diff --git a/newback/src/modules/rest/http/http.service.ts b/newback/src/modules/rest/http/http.service.ts
index 1dd8c04ce..a79e44712 100644
--- a/newback/src/modules/rest/http/http.service.ts
+++ b/newback/src/modules/rest/http/http.service.ts
@@ -48,7 +48,7 @@ export class HttpService {
     return this.post<T>(url, body, {})
   }
 
-  public async getUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
+  public async getUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any> = {}): Promise<T> {
     const params = new URLSearchParams();
     Object.entries(data).forEach(([k,v]) => {
       params.append(k, v);
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/rest/ip/ip.cache.service.ts
new file mode 100644
index 000000000..2c3680c25
--- /dev/null
+++ b/newback/src/modules/rest/ip/ip.cache.service.ts
@@ -0,0 +1,68 @@
+import {
+  BadRequestException,
+  Injectable,
+  Logger
+} from '@nestjs/common';
+import {HtmlService} from '@/modules/rest/html/html.service';
+import {MailerService} from '@nestjs-modules/mailer';
+import {ConfigService} from '@/modules/rest/config/config.service';
+import {HttpService} from '@/modules/rest/http/http.service';
+import {
+  IP_FAIL,
+  IpInfoResponse,
+  IpSuccessInfoResponse
+} from '@/data/types/api';
+import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
+import {IpService} from '@/modules/rest/ip/ip.service';
+import {IpAddressModel} from '@/data/model/ip.address.model';
+
+@Injectable()
+export class IpCacheService {
+  public constructor(
+    private readonly ipService: IpService,
+    private readonly ipRepository: IpRepository,
+    private readonly logger: Logger,
+  ) {
+  }
+
+  public async getIpString(ip: string): Promise<string> {
+    let data = await this.getIpInfo(ip);
+    if (!data) {
+      return "Unknown";
+    } else {
+      return `${data.country} ${data.city} ${data.isp}`;
+    }
+  }
+
+  public async getIpInfo(ip: string): Promise<Partial<IpAddressModel>> {
+    let response = await this.ipRepository.getIp(ip);
+    if (response && !response.status) {
+      return null;
+    }
+    try {
+      let ipInfo = await this.ipService.getIpInfo(ip)
+      let model: Partial<IpAddressModel> = {
+        ip: ip,
+        status: true,
+        isp: ipInfo.isp,
+        country: ipInfo.country,
+        region: ipInfo.region,
+        city: ipInfo.city,
+        lat: ipInfo.lat,
+        lon: ipInfo.lon,
+        zip: ipInfo.zip,
+        timezone: ipInfo.timezone
+      };
+      await this.ipRepository.saveIP(model)
+      return model;
+    } catch (e) {
+      if (e.error == IP_FAIL) {
+        await this.ipRepository.saveIP({ip, status: false})
+        return null;
+      }
+      this.logger.error(`Unable to get Ip Address Info ${ip}`, e.stack, e.error)
+      return null;
+    }
+  }
+
+}
diff --git a/newback/src/modules/rest/ip/ip.module.ts b/newback/src/modules/rest/ip/ip.module.ts
new file mode 100644
index 000000000..4b81c0c40
--- /dev/null
+++ b/newback/src/modules/rest/ip/ip.module.ts
@@ -0,0 +1,17 @@
+import {
+  Global,
+  Logger,
+  Module
+} from '@nestjs/common';
+import {IpService} from '@/modules/rest/ip/ip.service';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {DatabaseModule} from '@/modules/rest/database/database.module';
+
+@Global()
+@Module({
+  imports: [DatabaseModule],
+  providers: [IpService, IpCacheService],
+  exports: [IpCacheService]
+})
+export class IpModule {
+}
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
new file mode 100644
index 000000000..1e9f8491c
--- /dev/null
+++ b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
@@ -0,0 +1,47 @@
+import {
+  Test,
+  TestingModule
+} from '@nestjs/testing';
+import {LoggerModule} from '@/modules/rest/logger/logger.module';
+import {IpService} from '@/modules/rest/ip/ip.service';
+import {HttpModule} from '@/modules/rest/http/http.module';
+import * as pychatIpAddressFixture from '@/fixtures/ip.134.249.113.11.json';
+import {BadRequestException} from '@nestjs/common';
+
+describe('IpService', () => {
+
+  let ipservice: IpService;
+  let moduleFixture: TestingModule;
+  beforeAll(
+    async() => {
+
+    moduleFixture = await Test.createTestingModule({
+      imports: [
+        LoggerModule,
+        HttpModule
+      ],
+      providers: [
+        IpService,
+      ]
+    }).compile();
+    ipservice = moduleFixture.get(IpService);
+  })
+
+  afterAll(async () => {
+    await moduleFixture.close()
+  })
+
+  beforeAll(() => {
+    jest.clearAllMocks();
+  })
+
+  describe('getIpInfo', () => {
+    it('ip 134.249.113.11 should return correct response', async () => {
+     let data = await ipservice.getIpInfo('134.249.113.11');
+     expect(data).toEqual(pychatIpAddressFixture)
+    });
+     it('ip ::ffff:127.0.0.1 should return correct response', async () => {
+      await expect(ipservice.getIpInfo('::ffff:127.0.0.1')).rejects.toMatchObject(expect.any(BadRequestException))
+    });
+  });
+});
diff --git a/newback/src/modules/rest/ip/ip.service.ts b/newback/src/modules/rest/ip/ip.service.ts
new file mode 100644
index 000000000..692512b36
--- /dev/null
+++ b/newback/src/modules/rest/ip/ip.service.ts
@@ -0,0 +1,45 @@
+import {
+  BadRequestException,
+  Injectable,
+  Logger
+} from '@nestjs/common';
+import {HtmlService} from '@/modules/rest/html/html.service';
+import {MailerService} from '@nestjs-modules/mailer';
+import {ConfigService} from '@/modules/rest/config/config.service';
+import {HttpService} from '@/modules/rest/http/http.service';
+import {
+  IP_FAIL,
+  IpInfoResponse,
+  IpSuccessInfoResponse
+} from '@/data/types/api';
+
+@Injectable()
+export class IpService {
+  public constructor(
+    private readonly httpService: HttpService,
+    private readonly loggerService: Logger,
+  ) {
+  }
+
+  public async getIpFailSilenty(ip: string): Promise<IpSuccessInfoResponse|null> {
+    try {
+      let response = await this.getIpInfo(ip);
+      return response; // await should be on top otherwise we won't catch errors
+    } catch (e) {
+      this.loggerService.error(`Failed to get info about ip ${ip}`);
+      return null;
+    }
+  }
+
+  public async getIpInfo(ip: string): Promise<IpSuccessInfoResponse> {
+    let response = await this.httpService.getUrlEncoded<IpInfoResponse>(`http://ip-api.com/json/${ip}`);
+    if (response?.status === 'fail') {
+      throw new BadRequestException(`Ip='${ip}' error='${response.message}'`, IP_FAIL)
+    }
+    if (response.status !== 'success') {
+      throw new BadRequestException('Unkown error')
+    }
+    return response;
+  }
+
+}
diff --git a/newback/src/modules/rest/redis/RedisService.ts b/newback/src/modules/rest/redis/redis.service.ts
similarity index 100%
rename from newback/src/modules/rest/redis/RedisService.ts
rename to newback/src/modules/rest/redis/redis.service.ts
diff --git a/newback/src/utils/helpers.ts b/newback/src/utils/helpers.ts
index bcfdce6fd..4495737f4 100644
--- a/newback/src/utils/helpers.ts
+++ b/newback/src/utils/helpers.ts
@@ -7,9 +7,10 @@ export function generateUserName(email: string) {
   return email.split('@')[0].replace(/[^0-9a-zA-Z-_]+/g, '-').substring(0, MAX_USERNAME_LENGTH);
 }
 export function generateOrmConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, 'ssl'> {
+  const sync = false;
   return {
-    synchronize: config.mysql.synchronize,
-    logging: config.mysql.logging ? logging : false,
+    synchronize: sync,
+    logging: logging,
     dialect: 'mysql',
     host: config.mysql.host,
     port: config.mysql.port,
@@ -18,7 +19,7 @@ export function generateOrmConfig(logging: ((sql: string) => void)): Omit<Sequel
     database: config.mysql.database,
     autoLoadModels: true,
     sync: {
-      force: config.mysql.synchronize,
+      force: sync,
     },
     define: {
       collate: 'utf8mb4_general_ci',
diff --git a/newback/src/utils/migration.runner.ts b/newback/src/utils/migration.runner.ts
index 1ea2d205d..3ac5ce6b8 100644
--- a/newback/src/utils/migration.runner.ts
+++ b/newback/src/utils/migration.runner.ts
@@ -23,8 +23,9 @@ const connection = createConnection({
 connection.connect(async function (err) {
   let migrations = new CommandsRunner({
     driver: new MysqlDriver(connection),
-    directoryWithScripts: `${__dirname}/../config/migration/`,
+    directoryWithScripts: `${__dirname}/../../config/migration/`,
   });
   await migrations.run('init')
   await migrations.run('migrate')
+  await new Promise((resolve, reject) => connection.end((err) =>err ? reject() : resolve(undefined)));
 });

From 0cff238c9cbea8787c8e00f48f7a72f449e9a992 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 17:16:57 +0300
Subject: [PATCH 035/221] Fixed ip

---
 .../modules/rest/ip/invalid.ip.exception.ts   | 11 ++++++++
 .../src/modules/rest/ip/ip.cache.service.ts   | 18 ++++---------
 .../modules/rest/ip/ip.service.e2e.spec.ts    |  1 -
 newback/src/modules/rest/ip/ip.service.ts     | 26 +++----------------
 4 files changed, 20 insertions(+), 36 deletions(-)
 create mode 100644 newback/src/modules/rest/ip/invalid.ip.exception.ts

diff --git a/newback/src/modules/rest/ip/invalid.ip.exception.ts b/newback/src/modules/rest/ip/invalid.ip.exception.ts
new file mode 100644
index 000000000..98644cfc5
--- /dev/null
+++ b/newback/src/modules/rest/ip/invalid.ip.exception.ts
@@ -0,0 +1,11 @@
+import {HttpException} from '@nestjs/common';
+
+export class InvalidIpException extends HttpException {
+  public readonly networkError: boolean;
+  public readonly ip: string;
+  constructor(ip: string, error: string, networkError: boolean) {
+    super(error,networkError ? 500 : 400);
+    this.networkError = networkError;
+    this.ip = ip;
+  }
+}
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/rest/ip/ip.cache.service.ts
index 2c3680c25..38fd5377c 100644
--- a/newback/src/modules/rest/ip/ip.cache.service.ts
+++ b/newback/src/modules/rest/ip/ip.cache.service.ts
@@ -1,20 +1,12 @@
 import {
-  BadRequestException,
   Injectable,
   Logger
 } from '@nestjs/common';
-import {HtmlService} from '@/modules/rest/html/html.service';
-import {MailerService} from '@nestjs-modules/mailer';
-import {ConfigService} from '@/modules/rest/config/config.service';
-import {HttpService} from '@/modules/rest/http/http.service';
-import {
-  IP_FAIL,
-  IpInfoResponse,
-  IpSuccessInfoResponse
-} from '@/data/types/api';
+import {IP_FAIL} from '@/data/types/api';
 import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 import {IpService} from '@/modules/rest/ip/ip.service';
 import {IpAddressModel} from '@/data/model/ip.address.model';
+import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
 
 @Injectable()
 export class IpCacheService {
@@ -55,12 +47,12 @@ export class IpCacheService {
       };
       await this.ipRepository.saveIP(model)
       return model;
-    } catch (e) {
-      if (e.error == IP_FAIL) {
+    } catch (e: any) {
+       this.logger.error(`Unable to get Ip Address Info ${ip}`, e.stack, e.error)
+      if (!(e as InvalidIpException).networkError) {
         await this.ipRepository.saveIP({ip, status: false})
         return null;
       }
-      this.logger.error(`Unable to get Ip Address Info ${ip}`, e.stack, e.error)
       return null;
     }
   }
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
index 1e9f8491c..9c6602555 100644
--- a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
+++ b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
@@ -17,7 +17,6 @@ describe('IpService', () => {
 
     moduleFixture = await Test.createTestingModule({
       imports: [
-        LoggerModule,
         HttpModule
       ],
       providers: [
diff --git a/newback/src/modules/rest/ip/ip.service.ts b/newback/src/modules/rest/ip/ip.service.ts
index 692512b36..85251d3fb 100644
--- a/newback/src/modules/rest/ip/ip.service.ts
+++ b/newback/src/modules/rest/ip/ip.service.ts
@@ -1,43 +1,25 @@
-import {
-  BadRequestException,
-  Injectable,
-  Logger
-} from '@nestjs/common';
-import {HtmlService} from '@/modules/rest/html/html.service';
-import {MailerService} from '@nestjs-modules/mailer';
-import {ConfigService} from '@/modules/rest/config/config.service';
+import {Injectable} from '@nestjs/common';
 import {HttpService} from '@/modules/rest/http/http.service';
 import {
-  IP_FAIL,
   IpInfoResponse,
   IpSuccessInfoResponse
 } from '@/data/types/api';
+import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
 
 @Injectable()
 export class IpService {
   public constructor(
     private readonly httpService: HttpService,
-    private readonly loggerService: Logger,
   ) {
   }
 
-  public async getIpFailSilenty(ip: string): Promise<IpSuccessInfoResponse|null> {
-    try {
-      let response = await this.getIpInfo(ip);
-      return response; // await should be on top otherwise we won't catch errors
-    } catch (e) {
-      this.loggerService.error(`Failed to get info about ip ${ip}`);
-      return null;
-    }
-  }
-
   public async getIpInfo(ip: string): Promise<IpSuccessInfoResponse> {
     let response = await this.httpService.getUrlEncoded<IpInfoResponse>(`http://ip-api.com/json/${ip}`);
     if (response?.status === 'fail') {
-      throw new BadRequestException(`Ip='${ip}' error='${response.message}'`, IP_FAIL)
+      throw new InvalidIpException(ip, response.message, false);
     }
     if (response.status !== 'success') {
-      throw new BadRequestException('Unkown error')
+        throw new InvalidIpException(ip, 'Unknown', true);
     }
     return response;
   }

From 7a046434885085b3bb7d42574cdc5d5b79494624 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 17:30:21 +0300
Subject: [PATCH 036/221] Added ci badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 37eb96ec1..3575a0094 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/deathangel908/pychat.svg?label=docker%3Aprod)](https://hub.docker.com/r/deathangel908/pychat)
 [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/deathangel908/pychat-test.svg?label=docker%3Atest)](https://hub.docker.com/r/deathangel908/pychat-test) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Deathangel908/pychat/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Deathangel908/pychat/?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/b508fef8efba4a5f8b5e8411c0803af5)](https://www.codacy.com/app/nightmarequake/pychat?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Deathangel908/pychat&amp;utm_campaign=Badge_Grade)[![Code Health](https://landscape.io/github/akoidan/pychat/master/landscape.svg?style=flat&v=1)](https://landscape.io/github/akoidan/pychat/master) [![Upload Frontend pychat.org](https://github.com/akoidan/pychat/workflows/FE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3AFE%3Apychat.org) [![Refresh backend pychat.org](https://github.com/akoidan/pychat/workflows/BE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3ABE%3Apychat.org)
+[![Github actions](https://github.com/akoidan/pychat/workflows/NEWBE:pychat.org/badge.svg)](https://github.com/akoidan/pychat/actions)
 
 # Live demo: [pychat.org](https://pychat.org/), [video](https://www.youtube.com/watch?v=m6sJ-blTidg)
 <span>pychat.org is not available due to server location in Ukraine because of war ;(. Please support Ukraine. Russian invaders suffer in hell!</span>

From c90206a9ea5c3c56d11a53ac07aa0be20237c565 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 17:45:06 +0300
Subject: [PATCH 037/221] Fixed test

---
 .../src/modules/api/auth/auth.module.spec.ts    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index de6f1e2c7..60d7e2c4e 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -30,11 +30,16 @@ import {
   IConfig
 } from 'node-ts-config';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {IpService} from '@/modules/rest/ip/ip.service';
+import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
+import {IpAddressModel} from '@/data/model/ip.address.model';
 
 describe('AuthModule', () => {
   let app: INestApplication;
   let request: supertest.SuperTest<supertest.Test>;
   let userRepository: UserRepository = {} as UserRepository;
+  let ipRepository: IpRepository = {} as IpRepository;
   let roomRepository: RoomRepository = {} as RoomRepository;
   let redisService: RedisService = {} as RedisService;
   let sequelize: Sequelize = {} as Sequelize;
@@ -82,6 +87,8 @@ describe('AuthModule', () => {
         AuthService,
         HtmlService,
         EmailService,
+        IpCacheService,
+        IpService,
         FacebookAuthService,
         {
           provide: MailerService,
@@ -95,6 +102,10 @@ describe('AuthModule', () => {
           provide: UserRepository,
           useValue: userRepository,
         },
+        {
+          provide: IpRepository,
+          useValue: ipRepository,
+        },
         {
           provide: RoomRepository,
           useValue: roomRepository,
@@ -121,6 +132,7 @@ describe('AuthModule', () => {
     Object.keys(sequelize).forEach(key => delete sequelize[key]);
     Object.keys(mailerService).forEach(key => delete mailerService[key]);
     Object.keys(oauth2Client).forEach(key => delete oauth2Client[key]);
+    Object.keys(ipRepository).forEach(key => delete ipRepository[key]);
     nodeApply = () => {
     };
     Object.keys(configService).forEach(key => delete configService[key]);
@@ -396,6 +408,11 @@ describe('AuthModule', () => {
       userRepository.createUser = jest.fn().mockResolvedValue(3);
       roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
       mailerService.sendMail = jest.fn();
+      ipRepository.getIp = jest.fn().mockResolvedValue({
+        country: 'Ukraine',
+        city: 'Mariupol',
+        isp: 'AZOV',
+      } as IpAddressModel)
       let spy = jest.spyOn(mailerService, 'sendMail').mockResolvedValue(true);
       redisService.saveSession = jest.fn().mockResolvedValue(undefined)
       const {body} = await request

From ff7b319851c3090672385e944549449780374950 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 17:52:41 +0300
Subject: [PATCH 038/221] Fixed tests

---
 newback/src/modules/rest/email/email.service.spec.ts | 8 ++++----
 newback/src/modules/rest/ip/ip.service.e2e.spec.ts   | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
index 4a41df099..3e01e95d0 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -50,8 +50,8 @@ describe('EmailSenderService', () => {
       jest.useFakeTimers('modern');
       jest.setSystemTime(new Date(2020, 3, 1));
       await sender.sendRestorePasswordEmail('a', 3 , 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
-      const content = await promisify(readFile)(resolve(__dirname, '..', '..', 'fixtures', 'rendered.send.restore.password.html'), 'utf-8');
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: content,  "subject": "Confirm pychat registration", "text": expect.any(String)}))
+      const content = await promisify(readFile)(resolve(__dirname, '..', '..', '..', 'fixtures', 'rendered.send.restore.password.html'), 'utf-8');
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: content,  "subject": "Reset pychat password", "text": expect.any(String)}))
     });
   });
 
@@ -61,8 +61,8 @@ describe('EmailSenderService', () => {
       jest.useFakeTimers('modern');
       jest.setSystemTime(new Date(2020, 3, 1));
       await sender.sendSignUpEmail('a', 3 , 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
-      const content = await promisify(readFile)(resolve(__dirname, '..', '..', 'fixtures', 'send.sign.up.email.html'), 'utf-8');
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: content,  "subject": "Confirm pychat registration", "text": expect.any(String)}))
+      const content = await promisify(readFile)(resolve(__dirname, '..', '..', '..', 'fixtures', 'send.sign.up.email.html'), 'utf-8');
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: content,  "subject": "Confirm Pychat registration", "text": expect.any(String)}))
     });
   });
 });
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
index 9c6602555..757ebca90 100644
--- a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
+++ b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
@@ -2,11 +2,12 @@ import {
   Test,
   TestingModule
 } from '@nestjs/testing';
-import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {IpService} from '@/modules/rest/ip/ip.service';
 import {HttpModule} from '@/modules/rest/http/http.module';
 import * as pychatIpAddressFixture from '@/fixtures/ip.134.249.113.11.json';
 import {BadRequestException} from '@nestjs/common';
+import {LoggerModule} from '@/modules/rest/logger/logger.module';
+import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
 
 describe('IpService', () => {
 
@@ -17,6 +18,7 @@ describe('IpService', () => {
 
     moduleFixture = await Test.createTestingModule({
       imports: [
+        LoggerModule,
         HttpModule
       ],
       providers: [
@@ -40,7 +42,7 @@ describe('IpService', () => {
      expect(data).toEqual(pychatIpAddressFixture)
     });
      it('ip ::ffff:127.0.0.1 should return correct response', async () => {
-      await expect(ipservice.getIpInfo('::ffff:127.0.0.1')).rejects.toMatchObject(expect.any(BadRequestException))
+      await expect(ipservice.getIpInfo('::ffff:127.0.0.1')).rejects.toMatchObject(expect.any(InvalidIpException))
     });
   });
 });

From 928a6c907e6088c83e4a9580592e9212ff346598 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 18:01:55 +0300
Subject: [PATCH 039/221] Fix

---
 newback/jest.config.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/newback/jest.config.ts b/newback/jest.config.ts
index 3c8f317df..4fc767263 100644
--- a/newback/jest.config.ts
+++ b/newback/jest.config.ts
@@ -14,6 +14,9 @@ export default async(): Promise<Config.InitialOptions> => {
       "json",
       "ts"
     ],
+    "modulePathIgnorePatterns": [
+      "e2e.spec.ts"
+    ],
     "testRegex": ".*\\.spec\\.ts$",
     "transform": {
       "^.+\\.(t|j)s$": "ts-jest"

From 0dc046ab93638b2e1556741a2f08ff4cb7f31f63 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 18:39:35 +0300
Subject: [PATCH 040/221] Added test extracted new repo

---
 .../src/modules/api/auth/auth.module.spec.ts  | 100 +++++++++++++++++-
 newback/src/modules/api/auth/auth.service.ts  |  18 ++--
 .../modules/rest/database/database.module.ts  |   2 +
 .../database/repository/user.repository.ts    |  49 +--------
 .../repository/verification.repository.ts     |  60 +++++++++++
 5 files changed, 172 insertions(+), 57 deletions(-)
 create mode 100644 newback/src/modules/rest/database/repository/verification.repository.ts

diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 60d7e2c4e..c630d5e4a 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -34,11 +34,14 @@ import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
 import {IpService} from '@/modules/rest/ip/ip.service';
 import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 import {IpAddressModel} from '@/data/model/ip.address.model';
+import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
+import {VerificationType} from '@/data/types/frontend';
 
 describe('AuthModule', () => {
   let app: INestApplication;
   let request: supertest.SuperTest<supertest.Test>;
   let userRepository: UserRepository = {} as UserRepository;
+  let verificationRepository: VerificationRepository = {} as VerificationRepository;
   let ipRepository: IpRepository = {} as IpRepository;
   let roomRepository: RoomRepository = {} as RoomRepository;
   let redisService: RedisService = {} as RedisService;
@@ -102,6 +105,10 @@ describe('AuthModule', () => {
           provide: UserRepository,
           useValue: userRepository,
         },
+        {
+          provide: VerificationRepository,
+          useValue: verificationRepository
+        },
         {
           provide: IpRepository,
           useValue: ipRepository,
@@ -136,6 +143,7 @@ describe('AuthModule', () => {
     nodeApply = () => {
     };
     Object.keys(configService).forEach(key => delete configService[key]);
+    Object.keys(verificationRepository).forEach(key => delete configService[key]);
 
   });
 
@@ -402,7 +410,7 @@ describe('AuthModule', () => {
     });
     it('sends an email', async() => {
       sequelize.transaction = (resolve) => resolve();
-      userRepository.createVerification = jest.fn().mockResolvedValue(undefined);
+      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
       userRepository.createUser = jest.fn().mockResolvedValue(3);
@@ -549,4 +557,94 @@ describe('AuthModule', () => {
         });
     });
   });
+  describe('send-restore-password', () => {
+    it('sends password when by username', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
+        userAuth: {
+          email: 'asd'
+        },
+        id: 3,
+        username: 'forpassword'
+      })
+      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
+      mailerService.sendMail = jest.fn();
+      let spy = jest.spyOn(mailerService, 'sendMail');
+      ipRepository.getIp = jest.fn().mockResolvedValue({
+        country: 'Ukraine',
+        city: 'Mariupol',
+        isp: 'AZOV',
+      } as IpAddressModel)
+
+      await request
+        .post('/api/auth/send-restore-password').send({
+          username: 'a',
+        }).expect(201, {ok: true});
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
+    });
+    it('sends password when by email', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.getUserByEmail = jest.fn().mockResolvedValue({
+        email: 'asd',
+        user: {
+          id: 3,
+          username: 'forpassword'
+        }
+      })
+      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
+      mailerService.sendMail = jest.fn();
+      let spy = jest.spyOn(mailerService, 'sendMail');
+      ipRepository.getIp = jest.fn().mockResolvedValue({
+        country: 'Ukraine',
+        city: 'Mariupol',
+        isp: 'AZOV',
+      } as IpAddressModel)
+
+      await request
+        .post('/api/auth/send-restore-password').send({
+          email: 'a@gmail.com',
+        }).expect(201, {ok: true});
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
+    });
+    it('throws an error if user doesnt exists', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
+      await request
+        .post('/api/auth/send-restore-password').send({
+          username: 'a@gmail.com',
+        }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
+    });
+  });
+  describe('verify-token', () => {
+    it('should return error when token doesnt exist', async() => {
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+
+      await request
+        .post('/api/auth/verify-token').send({
+          token: 'a',
+        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+    });
+    it('should return ok when token valid', async() => {
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+        type: VerificationType.PASSWORD,
+        createdAt: new Date(),
+        user: {
+          username: 'a'
+        }
+      });
+
+      await request
+        .post('/api/auth/verify-token').send({
+          token: 'a',
+        }).expect(201, { ok: true, username: 'a'});
+    });
+    it('throws an error if user doesnt exists', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
+      await request
+        .post('/api/auth/send-restore-password').send({
+          username: 'a@gmail.com',
+        }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
+    });
+  });
 });
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 381410ab9..6f0fa8989 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -42,6 +42,7 @@ import {FacebookGetUserResponse} from '@/data/types/api';
 import {VerificationModel} from '@/data/model/verification.model';
 import {IpService} from '@/modules/rest/ip/ip.service';
 import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
 
 @Injectable()
 export class AuthService {
@@ -49,6 +50,7 @@ export class AuthService {
   constructor(
     private readonly userRepository: UserRepository,
     private readonly roomRepository: RoomRepository,
+    private readonly verificationRepository: VerificationRepository,
     private readonly passwordService: PasswordService,
     private readonly redisService: RedisService,
     private readonly emailService: EmailService,
@@ -164,7 +166,7 @@ export class AuthService {
       await this.sequelize.transaction(async(t) => {
         let token = await this.passwordService.generateRandomString(32);
         this.logger.log(`Generated token for userId ${userId}: ${token}`)
-        await this.userRepository.createVerification(email, userId, token, VerificationType.REGISTER, t)
+        await this.verificationRepository.createVerification(email, userId, token, VerificationType.REGISTER, t)
         let ipInfo = await this.ipCacheService.getIpString(ip)
         await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ipInfo)
       });
@@ -234,7 +236,7 @@ export class AuthService {
   }
 
   public async verifyToken(token: string): Promise<VerifyTokenResponse> {
-    let verificationModel: VerificationModel = await this.userRepository.getVerification(token);
+    let verificationModel: VerificationModel = await this.verificationRepository.getVerification(token);
     //https://pychat.org/#/auth/proceed-reset-password?token=evhv0zum3l8gavzql4xk5u16q2h9gqd2
     this.doTokenVerification(verificationModel, VerificationType.PASSWORD)
     return {
@@ -268,7 +270,7 @@ export class AuthService {
       }
       let token: string = await this.passwordService.generateRandomString(32);
       this.logger.log(`Generated token='${token}' to restore user email='${email}'`);
-      await this.userRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t)
+      await this.verificationRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t)
       let ipInfo = await this.ipCacheService.getIpString(ip);
       await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ipInfo)
     });
@@ -276,12 +278,12 @@ export class AuthService {
 
   public async acceptToken(body: AcceptTokenRequest): Promise<AcceptTokenResponse> {
     return this.sequelize.transaction(async(t) => {
-      let verificationModel: VerificationModel = await this.userRepository.getVerification(body.token, t);
+      let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
       this.doTokenVerification(verificationModel, VerificationType.PASSWORD);
       let password = await this.passwordService.createPassword(body.password);
       this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`);
       await this.userRepository.updateUserPassword(verificationModel.userId, password, t)
-      await this.userRepository.markVerificationVerified(verificationModel.id, t);
+      await this.verificationRepository.markVerificationVerified(verificationModel.id, t);
       let session = await this.createAndSaveSession(verificationModel.userId);
       let result: AcceptTokenResponse = {
         session
@@ -292,10 +294,10 @@ export class AuthService {
 
   public async confirmEmail(body: ConfirmEmailRequest): Promise<void> {
      this.sequelize.transaction(async(t) => {
-      let verificationModel: VerificationModel = await this.userRepository.getVerification(body.token, t);
+      let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
       this.doTokenVerification(verificationModel, VerificationType.REGISTER);
-      await this.userRepository.markVerificationVerified(verificationModel.id , t);
-      await this.userRepository.setUserVerification(verificationModel.userId, verificationModel.id , t);
+      await this.verificationRepository.markVerificationVerified(verificationModel.id , t);
+      await this.verificationRepository.setUserVerification(verificationModel.userId, verificationModel.id , t);
     })
   }
 }
diff --git a/newback/src/modules/rest/database/database.module.ts b/newback/src/modules/rest/database/database.module.ts
index ddc220d5e..a6c94b677 100644
--- a/newback/src/modules/rest/database/database.module.ts
+++ b/newback/src/modules/rest/database/database.module.ts
@@ -23,11 +23,13 @@ import {Logger} from '@nestjs/common/services/logger.service';
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
 import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
+import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
 
 const repositories = [
   UserRepository,
   RoomRepository,
   IpRepository,
+  VerificationRepository,
 ];
 
 @Module({
diff --git a/newback/src/modules/rest/database/repository/user.repository.ts b/newback/src/modules/rest/database/repository/user.repository.ts
index c46e55c11..ac3c553fd 100644
--- a/newback/src/modules/rest/database/repository/user.repository.ts
+++ b/newback/src/modules/rest/database/repository/user.repository.ts
@@ -2,13 +2,9 @@ import {Injectable} from '@nestjs/common';
 import {InjectModel} from '@nestjs/sequelize';
 import {UserModel} from '@/data/model/user.model';
 import {UserAuthModel} from '@/data/model/user.auth.model';
-import {
-  Gender,
-  VerificationType
-} from '@/data/types/frontend';
+import {Gender} from '@/data/types/frontend';
 import {UserProfileModel} from '@/data/model/user.profile.model';
 import {UserSettingsModel} from '@/data/model/user.settings.model';
-import {VerificationModel} from '@/data/model/verification.model';
 import {Transaction} from 'sequelize';
 
 
@@ -19,7 +15,6 @@ export class UserRepository {
     @InjectModel(UserAuthModel) private readonly userAuthModel: typeof UserAuthModel,
     @InjectModel(UserProfileModel) private readonly userProfileModel: typeof UserProfileModel,
     @InjectModel(UserSettingsModel) private readonly userSettingsModel: typeof UserSettingsModel,
-    @InjectModel(VerificationModel) private readonly verificationModel: typeof VerificationModel,
   ) {
   }
 
@@ -30,20 +25,6 @@ export class UserRepository {
     })
   }
 
- public async markVerificationVerified(id: number, transaction: Transaction) {
-    await this.verificationModel.update({verified: true}, {
-      where: {id},
-      transaction
-    })
-  }
-
-  public async setUserVerification(userId: number, emailVerificationId: number, transaction: Transaction) {
-    await this.userAuthModel.update({emailVerificationId}, {
-      where: {id: userId},
-      transaction
-    })
-  }
-
   public async createUser(data: {
     username: string;
     password: string;
@@ -105,34 +86,6 @@ export class UserRepository {
     }) != null
   }
 
-  public async getVerification(token: string, transaction?: Transaction): Promise<VerificationModel> {
-    return await this.verificationModel.findOne({
-      where: {token},
-      include: ['user'],
-      transaction
-    });
-  }
-
-  public async createVerification(email: string, userId: number, token: string, type: VerificationType, transaction: Transaction): Promise<void> {
-    let verification = await this.verificationModel.create({
-      type,
-      email,
-      userId,
-      token,
-    }, {
-      raw: true,
-      transaction
-    });
-    await this.userAuthModel.update({
-      emailVerificationId: verification.id,
-    }, {
-      where: {
-        id: userId,
-      },
-      transaction
-    })
-  }
-
   public async checkUserExistByEmail(email: string): Promise<boolean> {
     return await this.userAuthModel.findOne({
       where: {email},
diff --git a/newback/src/modules/rest/database/repository/verification.repository.ts b/newback/src/modules/rest/database/repository/verification.repository.ts
new file mode 100644
index 000000000..e1f9fd3dc
--- /dev/null
+++ b/newback/src/modules/rest/database/repository/verification.repository.ts
@@ -0,0 +1,60 @@
+import {Injectable} from '@nestjs/common';
+import {InjectModel} from '@nestjs/sequelize';
+import {UserAuthModel} from '@/data/model/user.auth.model';
+import {VerificationType} from '@/data/types/frontend';
+import {VerificationModel} from '@/data/model/verification.model';
+import {Transaction} from 'sequelize';
+
+
+@Injectable()
+export class VerificationRepository {
+  public constructor(
+    @InjectModel(UserAuthModel) private readonly userAuthModel: typeof UserAuthModel,
+    @InjectModel(VerificationModel) private readonly verificationModel: typeof VerificationModel,
+  ) {
+  }
+
+ public async markVerificationVerified(id: number, transaction: Transaction) {
+    await this.verificationModel.update({verified: true}, {
+      where: {id},
+      transaction
+    })
+  }
+
+  public async setUserVerification(userId: number, emailVerificationId: number, transaction: Transaction) {
+    await this.userAuthModel.update({emailVerificationId}, {
+      where: {id: userId},
+      transaction
+    })
+  }
+
+
+  public async getVerification(token: string, transaction?: Transaction): Promise<VerificationModel> {
+    return await this.verificationModel.findOne({
+      where: {token},
+      include: ['user'],
+      transaction
+    });
+  }
+
+  public async createVerification(email: string, userId: number, token: string, type: VerificationType, transaction: Transaction): Promise<void> {
+    let verification = await this.verificationModel.create({
+      type,
+      email,
+      userId,
+      token,
+    }, {
+      raw: true,
+      transaction
+    });
+    await this.userAuthModel.update({
+      emailVerificationId: verification.id,
+    }, {
+      where: {
+        id: userId,
+      },
+      transaction
+    })
+  }
+
+}

From a9b2a7643b3c573791c7c5e4d45a71c2bc179a18 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 19:04:04 +0300
Subject: [PATCH 041/221] Added more tests

---
 .../src/modules/api/auth/auth.module.spec.ts  | 63 +++++++++++++++++++
 newback/src/modules/api/auth/auth.service.ts  |  2 +-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index c630d5e4a..4db203d81 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -647,4 +647,67 @@ describe('AuthModule', () => {
         }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
     });
   });
+
+   describe('confirm-email', () => {
+    it('should return error when token doesnt exist', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+
+      await request
+        .post('/api/auth/confirm-email').send({
+          token: 'a',
+        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+    });
+    it('should set email confirmed', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
+      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+        type: VerificationType.REGISTER,
+        createdAt: new Date(),
+        user: {
+          username: 'a'
+        }
+      });
+
+      await request
+        .post('/api/auth/confirm-email').send({
+          token: 'a',
+        }).expect(201, {ok: true});
+    });
+  });
+   describe('accept-token', () => {
+    it('should return error when token doesnt exist', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+
+      await request
+        .post('/api/auth/accept-token').send({
+          token: 'a',
+          password: 'asd',
+        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+    });
+    it('should set email confirmed', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.updateUserPassword = jest.fn().mockResolvedValue(undefined);
+      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
+      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+        type: VerificationType.PASSWORD,
+        createdAt: new Date(),
+        user: {
+          username: 'a',
+          password: 'asd',
+        }
+      });
+
+      const {body} = await request
+        .post('/api/auth/accept-token').send({
+          token: 'a',
+          password: 'asd',
+        }).expect(201);
+      expect(body).toMatchObject({session: expect.any(String)});
+    });
+  });
 });
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 6f0fa8989..05265b7e0 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -293,7 +293,7 @@ export class AuthService {
   }
 
   public async confirmEmail(body: ConfirmEmailRequest): Promise<void> {
-     this.sequelize.transaction(async(t) => {
+     await this.sequelize.transaction(async(t) => {
       let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
       this.doTokenVerification(verificationModel, VerificationType.REGISTER);
       await this.verificationRepository.markVerificationVerified(verificationModel.id , t);

From a02ee078c1e673ce89511c3037772537afa6ebae Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 19:18:27 +0300
Subject: [PATCH 042/221] Added codecov

---
 .github/workflows/newback.yml | 10 +++++++++-
 newback/package.json          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/newback.yml b/.github/workflows/newback.yml
index 13d1c56f3..0f51fbbdf 100644
--- a/.github/workflows/newback.yml
+++ b/.github/workflows/newback.yml
@@ -20,6 +20,7 @@ jobs:
           path: |
             newback/node_modules
             newback/yarn-cache
+            newback/codecov
           key: ${{ runner.os }}-${{ hashFiles('newback/yarn.lock') }}
       - name: Install npm dependencies
         run: |
@@ -27,4 +28,11 @@ jobs:
           yarn config set cache-folder `pwd`/yarn-cache
           yarn install --frozen-lockfile
       - name: Run tests
-        run: cd newback && yarn test
+        run: cd newback && yarn jest --runInBand --coverage --detectOpenHandles --coverageReporters json text
+      - name: Coverage
+        run: |
+          cd newback
+          ls ./codecov ||  curl -Os https://uploader.codecov.io/latest/linux/codecov
+          chmod +x ./codecov
+          ./codecov -t 92ec2a69-f993-41ba-b6b7-60da24082d05 -f ./coverage/coverage-final.json 
+
diff --git a/newback/package.json b/newback/package.json
index 44d6dac45..dba7978e3 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -9,7 +9,7 @@
     "migrate": "ts-node  -r tsconfig-paths/register ./src/utils/migration.runner.ts ",
     "build": "nest build",
     "start": "nest start",
-    "test:debug": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
+    "test:html:coverage": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
     "test": "jest --runInBand --coverage --coverageReporters text"
   },
   "dependencies": {

From a93fd10a27e00bd6c6a924cdb1753f32e3d82157 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 19:35:39 +0300
Subject: [PATCH 043/221] test

---
 newback/.gitignore                                       | 1 +
 newback/jest.config.ts                                   | 1 +
 newback/jest.setup.ts                                    | 3 +++
 newback/src/fixtures/rendered.send.restore.password.html | 2 +-
 newback/src/fixtures/send.sign.up.email.html             | 2 +-
 newback/src/modules/rest/email/email.service.spec.ts     | 6 ++++++
 6 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 newback/jest.setup.ts

diff --git a/newback/.gitignore b/newback/.gitignore
index f17e0e9f0..54c5048f8 100644
--- a/newback/.gitignore
+++ b/newback/.gitignore
@@ -6,3 +6,4 @@ config/migration/*
 coverage
 # exception to the rule
 !config/migration/.gitkeep
+codecov
diff --git a/newback/jest.config.ts b/newback/jest.config.ts
index 4fc767263..9cc4f83d1 100644
--- a/newback/jest.config.ts
+++ b/newback/jest.config.ts
@@ -14,6 +14,7 @@ export default async(): Promise<Config.InitialOptions> => {
       "json",
       "ts"
     ],
+    "globalSetup": "./jest.setup.ts",
     "modulePathIgnorePatterns": [
       "e2e.spec.ts"
     ],
diff --git a/newback/jest.setup.ts b/newback/jest.setup.ts
new file mode 100644
index 000000000..3d1e8924f
--- /dev/null
+++ b/newback/jest.setup.ts
@@ -0,0 +1,3 @@
+module.exports = async () => {
+    process.env.TZ = 'UTC';
+};
diff --git a/newback/src/fixtures/rendered.send.restore.password.html b/newback/src/fixtures/rendered.send.restore.password.html
index 5bbae78b1..0665d1170 100644
--- a/newback/src/fixtures/rendered.send.restore.password.html
+++ b/newback/src/fixtures/rendered.send.restore.password.html
@@ -39,7 +39,7 @@ <h2 style="color: #102a80">Hello, a!</h2>
   <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
 </p>
 <p>
-  Link was generated Tue, 31 Mar 2020 21:00:00 GMT <br/>
+  Link was generated Wed, 01 Apr 2020 00:00:00 GMT <br/>
   IP: 192.168.1.1<br/>
   Chernihiv
 </p>
diff --git a/newback/src/fixtures/send.sign.up.email.html b/newback/src/fixtures/send.sign.up.email.html
index b6863c5ba..b5c6bffe9 100644
--- a/newback/src/fixtures/send.sign.up.email.html
+++ b/newback/src/fixtures/send.sign.up.email.html
@@ -40,7 +40,7 @@ <h2 style="color: #102a80">Hello, a!</h2>
   <b>Note</b>: Your magic link will expire in 1 day, and can only be used one time. <br>
 </p>
 <p>
-  Link was generated Tue, 31 Mar 2020 21:00:00 GMT <br/>
+  Link was generated Wed, 01 Apr 2020 00:00:00 GMT <br/>
   IP: 192.168.1.1<br/>
   Chernihiv
 </p>
diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
index 3e01e95d0..daef0e03a 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -45,6 +45,12 @@ describe('EmailSenderService', () => {
   })
 
   describe('sendRestorePasswordEmail', () => {
+     it('time should always be UTC', () => { // https://stackoverflow.com/a/56482581/3872976
+       // test below depends on new date to return specific time
+       // we mock it with jest, but it still depends on machine timezone so we need to ensure tz is same
+       // jest.setup.js fixes it
+       expect(new Date().getTimezoneOffset()).toBe(0);
+    });
     it('should render', async () => {
       let spy = jest.spyOn(mailer, 'sendMail');
       jest.useFakeTimers('modern');

From 8d21c64a8173cf06321671efc3620da159dd6ee0 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 19:40:59 +0300
Subject: [PATCH 044/221] Added codecov badge

---
 .github/workflows/newback.yml | 2 +-
 README.md                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/newback.yml b/.github/workflows/newback.yml
index 0f51fbbdf..fcd2b3768 100644
--- a/.github/workflows/newback.yml
+++ b/.github/workflows/newback.yml
@@ -34,5 +34,5 @@ jobs:
           cd newback
           ls ./codecov ||  curl -Os https://uploader.codecov.io/latest/linux/codecov
           chmod +x ./codecov
-          ./codecov -t 92ec2a69-f993-41ba-b6b7-60da24082d05 -f ./coverage/coverage-final.json 
+          ./codecov -t $CODECOV_TOKEN -f ./coverage/coverage-final.json 
 
diff --git a/README.md b/README.md
index 3575a0094..e09b9e2fd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/deathangel908/pychat.svg?label=docker%3Aprod)](https://hub.docker.com/r/deathangel908/pychat)
 [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/deathangel908/pychat-test.svg?label=docker%3Atest)](https://hub.docker.com/r/deathangel908/pychat-test) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Deathangel908/pychat/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Deathangel908/pychat/?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/b508fef8efba4a5f8b5e8411c0803af5)](https://www.codacy.com/app/nightmarequake/pychat?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Deathangel908/pychat&amp;utm_campaign=Badge_Grade)[![Code Health](https://landscape.io/github/akoidan/pychat/master/landscape.svg?style=flat&v=1)](https://landscape.io/github/akoidan/pychat/master) [![Upload Frontend pychat.org](https://github.com/akoidan/pychat/workflows/FE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3AFE%3Apychat.org) [![Refresh backend pychat.org](https://github.com/akoidan/pychat/workflows/BE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3ABE%3Apychat.org)
 [![Github actions](https://github.com/akoidan/pychat/workflows/NEWBE:pychat.org/badge.svg)](https://github.com/akoidan/pychat/actions)
-
+[![codecov](https://codecov.io/gh/akoidan/pychat/branch/master/graph/badge.svg?token=aQlNwbpTIw)](https://codecov.io/gh/akoidan/pychat)
 # Live demo: [pychat.org](https://pychat.org/), [video](https://www.youtube.com/watch?v=m6sJ-blTidg)
 <span>pychat.org is not available due to server location in Ukraine because of war ;(. Please support Ukraine. Russian invaders suffer in hell!</span>
 

From acf0c78dfe1d3f1c78b5145819668eff22034db0 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 19:45:35 +0300
Subject: [PATCH 045/221] readme badges

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e09b9e2fd..33595a00b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/deathangel908/pychat.svg?label=docker%3Aprod)](https://hub.docker.com/r/deathangel908/pychat)
-[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/deathangel908/pychat-test.svg?label=docker%3Atest)](https://hub.docker.com/r/deathangel908/pychat-test) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Deathangel908/pychat/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Deathangel908/pychat/?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/b508fef8efba4a5f8b5e8411c0803af5)](https://www.codacy.com/app/nightmarequake/pychat?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Deathangel908/pychat&amp;utm_campaign=Badge_Grade)[![Code Health](https://landscape.io/github/akoidan/pychat/master/landscape.svg?style=flat&v=1)](https://landscape.io/github/akoidan/pychat/master) [![Upload Frontend pychat.org](https://github.com/akoidan/pychat/workflows/FE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3AFE%3Apychat.org) [![Refresh backend pychat.org](https://github.com/akoidan/pychat/workflows/BE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3ABE%3Apychat.org)
+[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/deathangel908/pychat-test.svg?label=docker%3Atest)](https://hub.docker.com/r/deathangel908/pychat-test)
+[![Upload Frontend pychat.org](https://github.com/akoidan/pychat/workflows/FE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3AFE%3Apychat.org)
+[![Refresh backend pychat.org](https://github.com/akoidan/pychat/workflows/BE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3ABE%3Apychat.org)
 [![Github actions](https://github.com/akoidan/pychat/workflows/NEWBE:pychat.org/badge.svg)](https://github.com/akoidan/pychat/actions)
 [![codecov](https://codecov.io/gh/akoidan/pychat/branch/master/graph/badge.svg?token=aQlNwbpTIw)](https://codecov.io/gh/akoidan/pychat)
 # Live demo: [pychat.org](https://pychat.org/), [video](https://www.youtube.com/watch?v=m6sJ-blTidg)

From dbc86cc43ee48771dc36cd581f7222803b885c1a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 19:57:08 +0300
Subject: [PATCH 046/221] Fix login

---
 frontend/src/vue/auth/SignIn.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/vue/auth/SignIn.vue b/frontend/src/vue/auth/SignIn.vue
index 7cd3c2d25..9a19d21cd 100644
--- a/frontend/src/vue/auth/SignIn.vue
+++ b/frontend/src/vue/auth/SignIn.vue
@@ -90,6 +90,7 @@ export default class SignIn extends Vue {
       response = await this.$api.signIn({
         email: this.username,
         password: this.password,
+        captcha: this.captcha,
       });
     } else {
       response = await this.$api.signIn({

From c31a90fb520dd4ecb474889d2726599214e336ab Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 21:35:20 +0300
Subject: [PATCH 047/221] Added ws split auth and verify

---
 frontend/src/ts/message_handlers/Api.ts       |   8 +-
 newback/package.json                          |   2 +
 newback/src/main.ts                           |   3 +-
 .../src/modules/api/auth/auth.controller.ts   |  34 +--
 .../src/modules/api/auth/auth.module.spec.ts  | 201 ++-----------
 newback/src/modules/api/auth/auth.module.ts   |   4 +-
 newback/src/modules/api/auth/auth.service.ts  | 116 +------
 .../accept.token.request.validator.ts         |   0
 .../confirm.email.request.validator.ts        |   2 +-
 .../send.restore.password.validator.ts        |   0
 .../verify.token.request.validator.ts         |   0
 .../modules/api/verify/verify.controller.ts   |  57 ++++
 .../modules/api/verify/verify.module.spec.ts  | 283 ++++++++++++++++++
 .../src/modules/api/verify/verify.module.ts   |  21 ++
 .../src/modules/api/verify/verify.service.ts  | 118 ++++++++
 .../api/websocket/websocket.gateway.ts        |  26 ++
 newback/src/modules/app/app.module.ts         |  13 +-
 .../password}/password.service.ts             |   0
 .../modules/rest/session/session.service.ts   |  24 ++
 newback/yarn.lock                             |  36 ++-
 20 files changed, 607 insertions(+), 341 deletions(-)
 rename newback/src/modules/api/{auth => verify}/validators/accept.token.request.validator.ts (100%)
 rename newback/src/modules/api/{auth => verify}/validators/confirm.email.request.validator.ts (72%)
 rename newback/src/modules/api/{auth => verify}/validators/send.restore.password.validator.ts (100%)
 rename newback/src/modules/api/{auth => verify}/validators/verify.token.request.validator.ts (100%)
 create mode 100644 newback/src/modules/api/verify/verify.controller.ts
 create mode 100644 newback/src/modules/api/verify/verify.module.spec.ts
 create mode 100644 newback/src/modules/api/verify/verify.module.ts
 create mode 100644 newback/src/modules/api/verify/verify.service.ts
 create mode 100644 newback/src/modules/api/websocket/websocket.gateway.ts
 rename newback/src/modules/{api/auth => rest/password}/password.service.ts (100%)
 create mode 100644 newback/src/modules/rest/session/session.service.ts

diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 1c69bc65e..0046d4d1b 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -87,7 +87,7 @@ export default class Api extends MessageHandler {
 
   public async sendRestorePassword(params: SendRestorePasswordRequest): Promise<OkResponse> {
     return this.xhr.doPost<OkResponse>({
-      url: "/auth/send-restore-password",
+      url: "/verify/send-restore-password",
       params: params as any,
     });
   }
@@ -235,7 +235,7 @@ export default class Api extends MessageHandler {
 
   public async confirmEmail(params: ConfirmEmailRequest): Promise<ConfirmEmailResponse> {
     return this.xhr.doPost({
-      url: '/auth/confirm-email',
+      url: '/verify/confirm-email',
       params
     });
   }
@@ -266,14 +266,14 @@ export default class Api extends MessageHandler {
 
   public async verifyToken(params: VerifyTokenRequest): Promise<VerifyTokenResponse> {
     return this.xhr.doPost<VerifyTokenResponse>({
-      url: "/auth/verify-token",
+      url: "/verify/verify-token",
       params,
     });
   }
 
   public async acceptToken(params: AcceptTokenRequest): Promise<AcceptTokenResponse> {
     return this.xhr.doPost({
-      url: "/auth/accept-token",
+      url: "/verify/accept-token",
       params,
     });
   }
diff --git a/newback/package.json b/newback/package.json
index dba7978e3..1f83b7868 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -17,8 +17,10 @@
     "@nestjs/common": "^8.4.4",
     "@nestjs/core": "^8.4.4",
     "@nestjs/platform-express": "^8.4.4",
+    "@nestjs/platform-ws": "^8.4.4",
     "@nestjs/sequelize": "^8.0.0",
     "@nestjs/swagger": "^5.2.1",
+    "@nestjs/websockets": "^8.4.4",
     "@types/bcrypt": "^5.0.0",
     "@types/node-fetch": "^2.6.1",
     "@types/nodemailer": "^6.4.4",
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 481403e67..3d105c54d 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -8,6 +8,7 @@ import {
 } from '@nestjs/common';
 import {readFile} from 'fs';
 import {promisify} from 'util';
+import {WsAdapter} from '@nestjs/platform-ws';
 
 async function bootstrap() {
   const key  = await promisify(readFile)(config.application.keyPath, 'utf-8');
@@ -25,7 +26,7 @@ async function bootstrap() {
        cert
     }
   });
-
+  app.useWebSocketAdapter(new WsAdapter(app));
   app.useGlobalPipes(new ValidationPipe());
   app.useLogger(app.get(Logger))
   await app.listen(config.application.port);
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 5ac8d8766..92f6aaa4b 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -27,11 +27,7 @@ import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.a
 import {CaptchaGuard} from '@/modules/app/guards/captcha.guard';
 import {ValidateEmailRequestValidator} from '@/modules/api/auth/validators/validate.email.request.validator';
 import {FacebookAuthRequestValidator} from '@/modules/api/auth/validators/facebook.auth.request.validator';
-import {SendRestorePasswordValidator} from '@/modules/api/auth/validators/send.restore.password.validator';
-import {VerifyTokenRequestValidator} from '@/modules/api/auth/validators/verify.token.request.validator';
-import {VerifyTokenResponse} from '@/data/types/frontend';
-import {AcceptTokenRequestValidator} from '@/modules/api/auth/validators/accept.token.request.validator';
-import {ConfirmEmailRequestValidator} from '@/modules/api/auth/validators/confirm.email.request.validator';
+
 
 @Controller({
   path: '/api/auth'
@@ -39,7 +35,6 @@ import {ConfirmEmailRequestValidator} from '@/modules/api/auth/validators/confir
 export class AuthController {
   constructor(
     private readonly authservice: AuthService,
-    private readonly logger: Logger
   ) {
   }
 
@@ -72,33 +67,6 @@ export class AuthController {
     }
   }
 
- @UseGuards(CaptchaGuard)
- @Post('/send-restore-password')
-  public async sendRestorePassword(@Body() body: SendRestorePasswordValidator, @Ip() ip: string): Promise<SendRestorePasswordResponse> {
-    await this.authservice.sendRestorePassword(body, ip);
-    return {
-      ok: true
-    }
-  }
-
- @Post('/verify-token')
-  public async verifyToken(@Body() body: VerifyTokenRequestValidator): Promise<VerifyTokenResponse> {
-    return  this.authservice.verifyToken(body.token);
-  }
-
-  @Post('/confirm-email')
-  public async confirmEmail(@Body() body: ConfirmEmailRequestValidator): Promise<ConfirmEmailResponse> {
-    await this.authservice.confirmEmail(body);
-    return {
-      ok: true,
-    }
-  }
-
- @Post('/accept-token')
-  public async acceptToken(@Body() body: AcceptTokenRequestValidator): Promise<AcceptTokenResponse> {
-    return this.authservice.acceptToken(body);
-  }
-
   @Post('/validate-user')
   public async validateUser(@Body() body: ValidateUserRequestValidator): Promise<ValidateUserResponse> {
     await this.authservice.validateUser(body.username);
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 4db203d81..7cde26ac8 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -8,7 +8,7 @@ import {Test} from '@nestjs/testing';
 import {AuthService} from '@/modules/api/auth/auth.service';
 import {AuthController} from '@/modules/api/auth/auth.controller';
 import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {PasswordService} from '@/modules/api/auth/password.service';
+import {PasswordService} from '@/modules/rest/password/password.service';
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
 import {RedisService} from '@/modules/rest/redis/redis.service';
@@ -36,6 +36,7 @@ import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 import {IpAddressModel} from '@/data/model/ip.address.model';
 import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
 import {VerificationType} from '@/data/types/frontend';
+import {SessionService} from '@/modules/rest/session/session.service';
 
 describe('AuthModule', () => {
   let app: INestApplication;
@@ -59,6 +60,14 @@ describe('AuthModule', () => {
         LoggerModule,
       ],
       providers: [
+        PasswordService,
+        AuthService,
+        HtmlService,
+        EmailService,
+        SessionService,
+        IpCacheService,
+        IpService,
+        FacebookAuthService,
         {
           provide: ConfigService,
           useValue: configService,
@@ -71,28 +80,6 @@ describe('AuthModule', () => {
           provide: Sequelize,
           useValue: sequelize
         },
-        {
-          provide: HttpService,
-          inject: [Logger],
-          useFactory: (logger) => new HttpService(logger, new Proxy(() => {
-          }, {
-            apply: function (target: {}, thisArg: any, argArray: any[]): any {
-              return nodeApply(...argArray)
-            }
-          }) as typeof fetch)
-        },
-        {
-          provide: GoogleAuthService,
-          inject: [Logger],
-          useFactory: (logger) => new GoogleAuthService(logger, oauth2Client)
-        },
-        PasswordService,
-        AuthService,
-        HtmlService,
-        EmailService,
-        IpCacheService,
-        IpService,
-        FacebookAuthService,
         {
           provide: MailerService,
           useValue: mailerService,
@@ -117,6 +104,21 @@ describe('AuthModule', () => {
           provide: RoomRepository,
           useValue: roomRepository,
         },
+        {
+          provide: GoogleAuthService,
+          inject: [Logger],
+          useFactory: (logger) => new GoogleAuthService(logger, oauth2Client)
+        },
+        {
+          provide: HttpService,
+          inject: [Logger],
+          useFactory: (logger) => new HttpService(logger, new Proxy(() => {
+          }, {
+            apply: function (target: {}, thisArg: any, argArray: any[]): any {
+              return nodeApply(...argArray)
+            }
+          }) as typeof fetch)
+        },
       ],
       controllers: [AuthController]
     })
@@ -557,157 +559,4 @@ describe('AuthModule', () => {
         });
     });
   });
-  describe('send-restore-password', () => {
-    it('sends password when by username', async() => {
-      sequelize.transaction = (resolve) => resolve();
-      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
-        userAuth: {
-          email: 'asd'
-        },
-        id: 3,
-        username: 'forpassword'
-      })
-      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
-      mailerService.sendMail = jest.fn();
-      let spy = jest.spyOn(mailerService, 'sendMail');
-      ipRepository.getIp = jest.fn().mockResolvedValue({
-        country: 'Ukraine',
-        city: 'Mariupol',
-        isp: 'AZOV',
-      } as IpAddressModel)
-
-      await request
-        .post('/api/auth/send-restore-password').send({
-          username: 'a',
-        }).expect(201, {ok: true});
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
-    });
-    it('sends password when by email', async() => {
-      sequelize.transaction = (resolve) => resolve();
-      userRepository.getUserByEmail = jest.fn().mockResolvedValue({
-        email: 'asd',
-        user: {
-          id: 3,
-          username: 'forpassword'
-        }
-      })
-      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
-      mailerService.sendMail = jest.fn();
-      let spy = jest.spyOn(mailerService, 'sendMail');
-      ipRepository.getIp = jest.fn().mockResolvedValue({
-        country: 'Ukraine',
-        city: 'Mariupol',
-        isp: 'AZOV',
-      } as IpAddressModel)
-
-      await request
-        .post('/api/auth/send-restore-password').send({
-          email: 'a@gmail.com',
-        }).expect(201, {ok: true});
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
-    });
-    it('throws an error if user doesnt exists', async() => {
-      sequelize.transaction = (resolve) => resolve();
-      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request
-        .post('/api/auth/send-restore-password').send({
-          username: 'a@gmail.com',
-        }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
-    });
-  });
-  describe('verify-token', () => {
-    it('should return error when token doesnt exist', async() => {
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
-
-      await request
-        .post('/api/auth/verify-token').send({
-          token: 'a',
-        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
-    });
-    it('should return ok when token valid', async() => {
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
-        type: VerificationType.PASSWORD,
-        createdAt: new Date(),
-        user: {
-          username: 'a'
-        }
-      });
-
-      await request
-        .post('/api/auth/verify-token').send({
-          token: 'a',
-        }).expect(201, { ok: true, username: 'a'});
-    });
-    it('throws an error if user doesnt exists', async() => {
-      sequelize.transaction = (resolve) => resolve();
-      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request
-        .post('/api/auth/send-restore-password').send({
-          username: 'a@gmail.com',
-        }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
-    });
-  });
-
-   describe('confirm-email', () => {
-    it('should return error when token doesnt exist', async() => {
-      sequelize.transaction = (resolve) => resolve();
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
-
-      await request
-        .post('/api/auth/confirm-email').send({
-          token: 'a',
-        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
-    });
-    it('should set email confirmed', async() => {
-      sequelize.transaction = (resolve) => resolve();
-      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
-      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
-        type: VerificationType.REGISTER,
-        createdAt: new Date(),
-        user: {
-          username: 'a'
-        }
-      });
-
-      await request
-        .post('/api/auth/confirm-email').send({
-          token: 'a',
-        }).expect(201, {ok: true});
-    });
-  });
-   describe('accept-token', () => {
-    it('should return error when token doesnt exist', async() => {
-      sequelize.transaction = (resolve) => resolve();
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
-
-      await request
-        .post('/api/auth/accept-token').send({
-          token: 'a',
-          password: 'asd',
-        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
-    });
-    it('should set email confirmed', async() => {
-      sequelize.transaction = (resolve) => resolve();
-      userRepository.updateUserPassword = jest.fn().mockResolvedValue(undefined);
-      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
-      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
-        type: VerificationType.PASSWORD,
-        createdAt: new Date(),
-        user: {
-          username: 'a',
-          password: 'asd',
-        }
-      });
-
-      const {body} = await request
-        .post('/api/auth/accept-token').send({
-          token: 'a',
-          password: 'asd',
-        }).expect(201);
-      expect(body).toMatchObject({session: expect.any(String)});
-    });
-  });
 });
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index 9527c2563..3d775ebd2 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -8,13 +8,14 @@ import {DatabaseModule} from '@/modules/rest/database/database.module';
 import {RedisService} from '@/modules/rest/redis/redis.service';
 import {EmailModule} from '@/modules/rest/email/email.module';
 import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
-import {PasswordService} from '@/modules/api/auth/password.service';
+import {PasswordService} from '@/modules/rest/password/password.service';
 import {OAuth2Client} from 'google-auth-library';
 import {config} from 'node-ts-config';
 import {HttpModule} from '@/modules/rest/http/http.module';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
 import {ConfigService} from '@/modules/rest/config/config.service';
 import {IpModule} from '@/modules/rest/ip/ip.module';
+import {SessionService} from '@/modules/rest/session/session.service';
 
 @Module({
   imports: [DatabaseModule, EmailModule, HttpModule, IpModule],
@@ -24,6 +25,7 @@ import {IpModule} from '@/modules/rest/ip/ip.module';
     PasswordService,
     RedisService,
     FacebookAuthService,
+    SessionService,
     {
       provide: GoogleAuthService,
       useFactory: (logger) => {
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 05265b7e0..01a24d003 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -1,36 +1,28 @@
 import {
-  BadRequestException,
   ConflictException,
   Injectable,
   Logger,
   UnauthorizedException
 } from '@nestjs/common';
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {PasswordService} from '@/modules/api/auth/password.service';
+import {PasswordService} from '@/modules/rest/password/password.service';
 import {
-  AcceptTokenRequest,
-  AcceptTokenResponse,
-  ConfirmEmailRequest,
-  ConfirmEmailResponse,
   FaceBookAuthRequest,
   FacebookSignInResponse,
   Gender,
   GoogleAuthRequest,
   GoogleSignInResponse,
-  SendRestorePasswordRequest,
   SignInRequest,
   SignInResponse,
   SignUpRequest,
   SignUpResponse,
-  VerificationType,
-  VerifyTokenResponse
+  VerificationType
 } from '@/data/types/frontend';
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
 import {
   ALL_ROOM_ID,
   MAX_USERNAME_LENGTH
 } from '@/utils/consts';
-import {RedisService} from '@/modules/rest/redis/redis.service';
 import {EmailService} from '@/modules/rest/email/email.service';
 import {Transaction} from 'sequelize';
 import {Sequelize} from 'sequelize-typescript';
@@ -39,10 +31,9 @@ import {TokenPayload} from 'google-auth-library';
 import {generateUserName} from '@/utils/helpers';
 import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
 import {FacebookGetUserResponse} from '@/data/types/api';
-import {VerificationModel} from '@/data/model/verification.model';
-import {IpService} from '@/modules/rest/ip/ip.service';
 import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
 import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
+import {SessionService} from '@/modules/rest/session/session.service';
 
 @Injectable()
 export class AuthService {
@@ -52,13 +43,13 @@ export class AuthService {
     private readonly roomRepository: RoomRepository,
     private readonly verificationRepository: VerificationRepository,
     private readonly passwordService: PasswordService,
-    private readonly redisService: RedisService,
     private readonly emailService: EmailService,
     private readonly googleAuthService: GoogleAuthService,
     private readonly ipCacheService: IpCacheService,
     private readonly facebookService: FacebookAuthService,
     private readonly sequelize: Sequelize,
     private readonly logger: Logger,
+    private readonly sessionService: SessionService,
   ) {
   }
 
@@ -68,7 +59,7 @@ export class AuthService {
     return this.sequelize.transaction(async(t) => {
       let userAuth = await this.userRepository.getUserMyAuthFacebook(fbResponse.id, t)
       if (userAuth) {
-        let session = await this.createAndSaveSession(userAuth.id);
+        let session = await this.sessionService.createAndSaveSession(userAuth.id);
         let response: GoogleSignInResponse = {session, isNewAccount: false};
         return response;
       } else {
@@ -90,7 +81,7 @@ export class AuthService {
         }, t)
         await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
 
-        let session = await this.createAndSaveSession(userId);
+        let session = await this.sessionService.createAndSaveSession(userId);
         let response: GoogleSignInResponse = {session, isNewAccount: true, username};
         return response;
       }
@@ -103,7 +94,7 @@ export class AuthService {
     return this.sequelize.transaction(async(t) => {
       let userAuth = await this.userRepository.getUserMyAuthGoogle(googleResponse.email, t)
       if (userAuth) {
-        let session = await this.createAndSaveSession(userAuth.id);
+        let session = await this.sessionService.createAndSaveSession(userAuth.id);
         let response: GoogleSignInResponse = {session, isNewAccount: false};
         return response;
       } else {
@@ -131,7 +122,7 @@ export class AuthService {
         }, t)
         await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
 
-        let session = await this.createAndSaveSession(userId);
+        let session = await this.sessionService.createAndSaveSession(userId);
         let response: GoogleSignInResponse = {session, isNewAccount: true, username};
         return response;
       }
@@ -156,7 +147,7 @@ export class AuthService {
     if (!matches) {
       throw new UnauthorizedException("Invalid password");
     }
-    const session = await this.createAndSaveSession(userId);
+    const session = await this.sessionService.createAndSaveSession(userId);
     return {session}
   }
 
@@ -179,7 +170,7 @@ export class AuthService {
   public async registerUser(data: SignUpRequest, ip: string): Promise<SignUpResponse> {
     const {session, userId} = await this.sequelize.transaction(async(t) => {
       let userId = await this.createUser(data, t);
-      let session = await this.createAndSaveSession(userId);
+      let session = await this.sessionService.createAndSaveSession(userId);
       return {session, userId};
     });
     if (data.email) {
@@ -188,13 +179,6 @@ export class AuthService {
     return {session};
   }
 
-  private async createAndSaveSession(userId: number) {
-    let session = await this.passwordService.generateRandomString(32);
-    this.logger.log(`Generated session for userId ${userId}: ${session}`)
-    await this.redisService.saveSession(session, userId);
-    return session;
-  }
-
   public async validateEmail(email: string): Promise<void> {
     let exist = await this.userRepository.checkUserExistByEmail(email);
     if (exist) {
@@ -220,84 +204,4 @@ export class AuthService {
     return userId;
   }
 
-  private doTokenVerification(data: VerificationModel, typ: VerificationType): void {
-    if (!data) {
-      throw new BadRequestException("Invalid token");
-    }
-    if (data.type != typ) {
-      throw new BadRequestException("Invalid operation");
-    }
-    if (data.verified) {
-      throw new BadRequestException("This token is already used");
-    }
-    if (Date.now() - data.createdAt.getTime() > 24 * 3600 * 1000) { // 24 hours
-      throw new BadRequestException("This token is already expired");
-    }
-  }
-
-  public async verifyToken(token: string): Promise<VerifyTokenResponse> {
-    let verificationModel: VerificationModel = await this.verificationRepository.getVerification(token);
-    //https://pychat.org/#/auth/proceed-reset-password?token=evhv0zum3l8gavzql4xk5u16q2h9gqd2
-    this.doTokenVerification(verificationModel, VerificationType.PASSWORD)
-    return {
-      ok: true,
-      username: verificationModel.user.username
-    }
-  }
-
-  public async sendRestorePassword(body: SendRestorePasswordRequest, ip: string): Promise<void> {
-    return this.sequelize.transaction(async(t) => {
-      let email, userId, username;
-      if (body.email) {
-        const user = await this.userRepository.getUserByEmail(body.email, t);
-        if (!user) {
-          throw new BadRequestException("User with this email doesnt exit");
-        }
-        username = user.user.username;
-        userId = user.id;
-        email = body.email;
-      } else if (body.username) {
-        const user = await this.userRepository.getUserByUserName(body.username, ['userAuth'], t);
-        if (!user) {
-          throw new BadRequestException("User with this username doesnt exit");
-        }
-        if (!user.userAuth.email) {
-          throw new BadRequestException("This user didnt specify an email");
-        }
-        email = user.userAuth.email;
-        username = user.username;
-        userId = user.id;
-      }
-      let token: string = await this.passwordService.generateRandomString(32);
-      this.logger.log(`Generated token='${token}' to restore user email='${email}'`);
-      await this.verificationRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t)
-      let ipInfo = await this.ipCacheService.getIpString(ip);
-      await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ipInfo)
-    });
-  }
-
-  public async acceptToken(body: AcceptTokenRequest): Promise<AcceptTokenResponse> {
-    return this.sequelize.transaction(async(t) => {
-      let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
-      this.doTokenVerification(verificationModel, VerificationType.PASSWORD);
-      let password = await this.passwordService.createPassword(body.password);
-      this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`);
-      await this.userRepository.updateUserPassword(verificationModel.userId, password, t)
-      await this.verificationRepository.markVerificationVerified(verificationModel.id, t);
-      let session = await this.createAndSaveSession(verificationModel.userId);
-      let result: AcceptTokenResponse = {
-        session
-      }
-      return result;
-    })
-  }
-
-  public async confirmEmail(body: ConfirmEmailRequest): Promise<void> {
-     await this.sequelize.transaction(async(t) => {
-      let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
-      this.doTokenVerification(verificationModel, VerificationType.REGISTER);
-      await this.verificationRepository.markVerificationVerified(verificationModel.id , t);
-      await this.verificationRepository.setUserVerification(verificationModel.userId, verificationModel.id , t);
-    })
-  }
 }
diff --git a/newback/src/modules/api/auth/validators/accept.token.request.validator.ts b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
similarity index 100%
rename from newback/src/modules/api/auth/validators/accept.token.request.validator.ts
rename to newback/src/modules/api/verify/validators/accept.token.request.validator.ts
diff --git a/newback/src/modules/api/auth/validators/confirm.email.request.validator.ts b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
similarity index 72%
rename from newback/src/modules/api/auth/validators/confirm.email.request.validator.ts
rename to newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
index 4f61e8b12..94052e1c5 100644
--- a/newback/src/modules/api/auth/validators/confirm.email.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
@@ -1,5 +1,5 @@
 import {IsString,} from 'class-validator';
-import {ConfirmEmailRequest,} from '@/data/types/frontend';
+import {ConfirmEmailRequest} from '@/data/types/frontend';
 
 
 export class ConfirmEmailRequestValidator implements ConfirmEmailRequest {
diff --git a/newback/src/modules/api/auth/validators/send.restore.password.validator.ts b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
similarity index 100%
rename from newback/src/modules/api/auth/validators/send.restore.password.validator.ts
rename to newback/src/modules/api/verify/validators/send.restore.password.validator.ts
diff --git a/newback/src/modules/api/auth/validators/verify.token.request.validator.ts b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
similarity index 100%
rename from newback/src/modules/api/auth/validators/verify.token.request.validator.ts
rename to newback/src/modules/api/verify/validators/verify.token.request.validator.ts
diff --git a/newback/src/modules/api/verify/verify.controller.ts b/newback/src/modules/api/verify/verify.controller.ts
new file mode 100644
index 000000000..775ff1327
--- /dev/null
+++ b/newback/src/modules/api/verify/verify.controller.ts
@@ -0,0 +1,57 @@
+import {
+  Body,
+  Controller,
+  Ip,
+  Post,
+  UseGuards
+} from '@nestjs/common';
+import {CaptchaGuard} from '@/modules/app/guards/captcha.guard';
+import {SendRestorePasswordValidator} from '@/modules/api/verify/validators/send.restore.password.validator';
+import {
+  AcceptTokenResponse,
+  ConfirmEmailResponse,
+  SendRestorePasswordResponse,
+  VerifyTokenResponse
+} from '@/data/types/frontend';
+import {VerifyTokenRequestValidator} from '@/modules/api/verify/validators/verify.token.request.validator';
+import {ConfirmEmailRequestValidator} from '@/modules/api/verify/validators/confirm.email.request.validator';
+import {AcceptTokenRequestValidator} from '@/modules/api/verify/validators/accept.token.request.validator';
+import {VerifyService} from '@/modules/api/verify/verify.service';
+
+
+@Controller({
+  path: '/api/verify'
+})
+export class VerifyController {
+  constructor(
+    private readonly verifyService: VerifyService,
+  ) {
+  }
+
+@UseGuards(CaptchaGuard)
+ @Post('/send-restore-password')
+  public async sendRestorePassword(@Body() body: SendRestorePasswordValidator, @Ip() ip: string): Promise<SendRestorePasswordResponse> {
+    await this.verifyService.sendRestorePassword(body, ip);
+    return {
+      ok: true
+    }
+  }
+
+ @Post('/verify-token')
+  public async verifyToken(@Body() body: VerifyTokenRequestValidator): Promise<VerifyTokenResponse> {
+    return  this.verifyService.verifyToken(body.token);
+  }
+
+  @Post('/confirm-email')
+  public async confirmEmail(@Body() body: ConfirmEmailRequestValidator): Promise<ConfirmEmailResponse> {
+    await this.verifyService.confirmEmail(body);
+    return {
+      ok: true,
+    }
+  }
+
+ @Post('/accept-token')
+  public async acceptToken(@Body() body: AcceptTokenRequestValidator): Promise<AcceptTokenResponse> {
+    return this.verifyService.acceptToken(body);
+  }
+}
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
new file mode 100644
index 000000000..ceb93f3b2
--- /dev/null
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -0,0 +1,283 @@
+import {
+  INestApplication,
+  Logger,
+  ValidationPipe
+} from '@nestjs/common';
+import * as supertest from 'supertest';
+import {Test} from '@nestjs/testing';
+import {LoggerModule} from '@/modules/rest/logger/logger.module';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {EmailService} from '@/modules/rest/email/email.service';
+import {MailerService} from '@nestjs-modules/mailer';
+import {Sequelize} from 'sequelize-typescript';
+import {HtmlService} from '@/modules/rest/html/html.service';
+import {HttpService} from '@/modules/rest/http/http.service';
+import fetch from 'node-fetch';
+import {ConfigService} from '@/modules/rest/config/config.service';
+import {config} from 'node-ts-config';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {IpService} from '@/modules/rest/ip/ip.service';
+import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
+import {IpAddressModel} from '@/data/model/ip.address.model';
+import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
+import {VerificationType} from '@/data/types/frontend';
+import {VerifyController} from '@/modules/api/verify/verify.controller';
+import {VerifyService} from '@/modules/api/verify/verify.service';
+import {SessionService} from '@/modules/rest/session/session.service';
+
+describe('VerifyModule', () => {
+  let app: INestApplication;
+  let request: supertest.SuperTest<supertest.Test>;
+  let userRepository: UserRepository = {} as UserRepository;
+  let verificationRepository: VerificationRepository = {} as VerificationRepository;
+  let ipRepository: IpRepository = {} as IpRepository;
+  let roomRepository: RoomRepository = {} as RoomRepository;
+  let redisService: RedisService = {} as RedisService;
+  let sequelize: Sequelize = {} as Sequelize;
+  let mailerService: MailerService = {} as MailerService;
+  let configService: ConfigService = {} as ConfigService;
+  beforeAll(async() => {
+    //required to compile Guards like CaptchaGuard
+    configService.getConfig = jest.fn().mockReturnValue(config)
+    const moduleFixture = await Test.createTestingModule({
+      imports: [
+        LoggerModule,
+      ],
+      providers: [
+        PasswordService,
+        HtmlService,
+        SessionService,
+        VerifyService,
+        EmailService,
+        IpCacheService,
+        IpService,
+        {
+          provide: ConfigService,
+          useValue: configService,
+        },
+        {
+          provide: MailerService,
+          useValue: mailerService
+        },
+        {
+          provide: Sequelize,
+          useValue: sequelize
+        },
+        {
+          provide: MailerService,
+          useValue: mailerService,
+        },
+        {
+          provide: RedisService,
+          useValue: redisService,
+        },
+        {
+          provide: UserRepository,
+          useValue: userRepository,
+        },
+        {
+          provide: VerificationRepository,
+          useValue: verificationRepository
+        },
+        {
+          provide: IpRepository,
+          useValue: ipRepository,
+        },
+        {
+          provide: HttpService,
+          inject: [Logger],
+          useFactory: (logger) => new HttpService(logger, new Proxy(() => {
+          }, {
+            apply: function (target: {}, thisArg: any, argArray: any[]): any {
+               throw Error("Unsupported");
+            }
+          }) as typeof fetch)
+        },
+      ],
+      controllers: [VerifyController]
+    })
+      .compile();
+    app = moduleFixture.createNestApplication();
+    app.useGlobalPipes(new ValidationPipe());
+    await app.init();
+    request = supertest(app.getHttpServer());
+  });
+
+  beforeEach(() => {
+    configService.getConfig = jest.fn().mockReturnValue(config)
+  })
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    Object.keys(userRepository).forEach(key => delete userRepository[key]);
+    Object.keys(roomRepository).forEach(key => delete roomRepository[key]);
+    Object.keys(redisService).forEach(key => delete redisService[key]);
+    Object.keys(sequelize).forEach(key => delete sequelize[key]);
+    Object.keys(mailerService).forEach(key => delete mailerService[key]);
+    Object.keys(ipRepository).forEach(key => delete ipRepository[key]);
+    Object.keys(configService).forEach(key => delete configService[key]);
+    Object.keys(verificationRepository).forEach(key => delete configService[key]);
+
+  });
+
+  afterAll(async() => {
+    await app.close()
+  });
+
+  describe('send-restore-password', () => {
+    it('sends password when by username', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
+        userAuth: {
+          email: 'asd'
+        },
+        id: 3,
+        username: 'forpassword'
+      })
+      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
+      mailerService.sendMail = jest.fn();
+      let spy = jest.spyOn(mailerService, 'sendMail');
+      ipRepository.getIp = jest.fn().mockResolvedValue({
+        country: 'Ukraine',
+        city: 'Mariupol',
+        isp: 'AZOV',
+      } as IpAddressModel)
+
+      await request
+        .post('/api/verify/send-restore-password').send({
+          username: 'a',
+        }).expect(201, {ok: true});
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
+    });
+    it('sends password when by email', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.getUserByEmail = jest.fn().mockResolvedValue({
+        email: 'asd',
+        user: {
+          id: 3,
+          username: 'forpassword'
+        }
+      })
+      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
+      mailerService.sendMail = jest.fn();
+      let spy = jest.spyOn(mailerService, 'sendMail');
+      ipRepository.getIp = jest.fn().mockResolvedValue({
+        country: 'Ukraine',
+        city: 'Mariupol',
+        isp: 'AZOV',
+      } as IpAddressModel)
+
+      await request
+        .post('/api/verify/send-restore-password').send({
+          email: 'a@gmail.com',
+        }).expect(201, {ok: true});
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
+    });
+    it('throws an error if user doesnt exists', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
+      await request
+        .post('/api/verify/send-restore-password').send({
+          username: 'a@gmail.com',
+        }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
+    });
+  });
+  describe('verify-token', () => {
+    it('should return error when token doesnt exist', async() => {
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+
+      await request
+        .post('/api/verify/verify-token').send({
+          token: 'a',
+        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+    });
+    it('should return ok when token valid', async() => {
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+        type: VerificationType.PASSWORD,
+        createdAt: new Date(),
+        user: {
+          username: 'a'
+        }
+      });
+
+      await request
+        .post('/api/verify/verify-token').send({
+          token: 'a',
+        }).expect(201, { ok: true, username: 'a'});
+    });
+    it('throws an error if user doesnt exists', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
+      await request
+        .post('/api/verify/send-restore-password').send({
+          username: 'a@gmail.com',
+        }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
+    });
+  });
+
+   describe('confirm-email', () => {
+    it('should return error when token doesnt exist', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+
+      await request
+        .post('/api/verify/confirm-email').send({
+          token: 'a',
+        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+    });
+    it('should set email confirmed', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
+      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+        type: VerificationType.REGISTER,
+        createdAt: new Date(),
+        user: {
+          username: 'a'
+        }
+      });
+
+      await request
+        .post('/api/verify/confirm-email').send({
+          token: 'a',
+        }).expect(201, {ok: true});
+    });
+  });
+   describe('accept-token', () => {
+    it('should return error when token doesnt exist', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+
+      await request
+        .post('/api/verify/accept-token').send({
+          token: 'a',
+          password: 'asd',
+        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+    });
+    it('should set email confirmed', async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.updateUserPassword = jest.fn().mockResolvedValue(undefined);
+      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
+      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+        type: VerificationType.PASSWORD,
+        createdAt: new Date(),
+        user: {
+          username: 'a',
+          password: 'asd',
+        }
+      });
+
+      const {body} = await request
+        .post('/api/verify/accept-token').send({
+          token: 'a',
+          password: 'asd',
+        }).expect(201);
+      expect(body).toMatchObject({session: expect.any(String)});
+    });
+  });
+});
diff --git a/newback/src/modules/api/verify/verify.module.ts b/newback/src/modules/api/verify/verify.module.ts
new file mode 100644
index 000000000..c4ce38d15
--- /dev/null
+++ b/newback/src/modules/api/verify/verify.module.ts
@@ -0,0 +1,21 @@
+import {Module} from '@nestjs/common';
+import {DatabaseModule} from '@/modules/rest/database/database.module';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {EmailModule} from '@/modules/rest/email/email.module';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {HttpModule} from '@/modules/rest/http/http.module';
+import {IpModule} from '@/modules/rest/ip/ip.module';
+import {VerifyController} from '@/modules/api/verify/verify.controller';
+import {SessionService} from '@/modules/rest/session/session.service';
+
+@Module({
+  imports: [DatabaseModule, EmailModule, HttpModule, IpModule],
+  controllers: [VerifyController],
+  providers: [
+    SessionService,
+    PasswordService,
+    RedisService,
+  ],
+})
+export class VerifyModule {
+}
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
new file mode 100644
index 000000000..b4b4ce3de
--- /dev/null
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -0,0 +1,118 @@
+import {
+  BadRequestException,
+  Injectable,
+  Logger
+} from '@nestjs/common';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {
+  AcceptTokenRequest,
+  AcceptTokenResponse,
+  ConfirmEmailRequest,
+  SendRestorePasswordRequest,
+  VerificationType,
+  VerifyTokenResponse
+} from '@/data/types/frontend';
+import {EmailService} from '@/modules/rest/email/email.service';
+import {Sequelize} from 'sequelize-typescript';
+import {VerificationModel} from '@/data/model/verification.model';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
+import {SessionService} from '@/modules/rest/session/session.service';
+
+@Injectable()
+export class VerifyService {
+  constructor(
+    private readonly userRepository: UserRepository,
+    private readonly verificationRepository: VerificationRepository,
+    private readonly passwordService: PasswordService,
+    private readonly emailService: EmailService,
+    private readonly ipCacheService: IpCacheService,
+    private readonly sequelize: Sequelize,
+    private readonly logger: Logger,
+    private readonly sessionService: SessionService,
+  ) {
+  }
+
+
+  private doTokenVerification(data: VerificationModel, typ: VerificationType): void {
+    if (!data) {
+      throw new BadRequestException("Invalid token");
+    }
+    if (data.type != typ) {
+      throw new BadRequestException("Invalid operation");
+    }
+    if (data.verified) {
+      throw new BadRequestException("This token is already used");
+    }
+    if (Date.now() - data.createdAt.getTime() > 24 * 3600 * 1000) { // 24 hours
+      throw new BadRequestException("This token is already expired");
+    }
+  }
+
+  public async verifyToken(token: string): Promise<VerifyTokenResponse> {
+    let verificationModel: VerificationModel = await this.verificationRepository.getVerification(token);
+    //https://pychat.org/#/auth/proceed-reset-password?token=evhv0zum3l8gavzql4xk5u16q2h9gqd2
+    this.doTokenVerification(verificationModel, VerificationType.PASSWORD)
+    return {
+      ok: true,
+      username: verificationModel.user.username
+    }
+  }
+
+  public async sendRestorePassword(body: SendRestorePasswordRequest, ip: string): Promise<void> {
+    return this.sequelize.transaction(async(t) => {
+      let email, userId, username;
+      if (body.email) {
+        const user = await this.userRepository.getUserByEmail(body.email, t);
+        if (!user) {
+          throw new BadRequestException("User with this email doesnt exit");
+        }
+        username = user.user.username;
+        userId = user.id;
+        email = body.email;
+      } else if (body.username) {
+        const user = await this.userRepository.getUserByUserName(body.username, ['userAuth'], t);
+        if (!user) {
+          throw new BadRequestException("User with this username doesnt exit");
+        }
+        if (!user.userAuth.email) {
+          throw new BadRequestException("This user didnt specify an email");
+        }
+        email = user.userAuth.email;
+        username = user.username;
+        userId = user.id;
+      }
+      let token: string = await this.passwordService.generateRandomString(32);
+      this.logger.log(`Generated token='${token}' to restore user email='${email}'`);
+      await this.verificationRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t)
+      let ipInfo = await this.ipCacheService.getIpString(ip);
+      await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ipInfo)
+    });
+  }
+
+  public async acceptToken(body: AcceptTokenRequest): Promise<AcceptTokenResponse> {
+    return this.sequelize.transaction(async(t) => {
+      let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
+      this.doTokenVerification(verificationModel, VerificationType.PASSWORD);
+      let password = await this.passwordService.createPassword(body.password);
+      this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`);
+      await this.userRepository.updateUserPassword(verificationModel.userId, password, t)
+      await this.verificationRepository.markVerificationVerified(verificationModel.id, t);
+      let session = await this.sessionService.createAndSaveSession(verificationModel.userId);
+      let result: AcceptTokenResponse = {
+        session
+      }
+      return result;
+    })
+  }
+
+  public async confirmEmail(body: ConfirmEmailRequest): Promise<void> {
+     await this.sequelize.transaction(async(t) => {
+      let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
+      this.doTokenVerification(verificationModel, VerificationType.REGISTER);
+      await this.verificationRepository.markVerificationVerified(verificationModel.id , t);
+      await this.verificationRepository.setUserVerification(verificationModel.userId, verificationModel.id , t);
+    })
+  }
+}
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
new file mode 100644
index 000000000..4f39353cc
--- /dev/null
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -0,0 +1,26 @@
+import {
+  MessageBody,
+  OnGatewayConnection,
+  SubscribeMessage,
+  WebSocketGateway,
+  WebSocketServer,
+} from '@nestjs/websockets';
+import { Server } from 'ws';
+
+@WebSocketGateway({ path: '/ws' })
+export class EventsGateway implements OnGatewayConnection {
+  @WebSocketServer()
+  server!: Server;
+
+  async handleConnection(socket: WebSocket) {
+    console.log('socket.OPEN', socket.OPEN);
+  }
+
+  @SubscribeMessage('events')
+  handleEvent(@MessageBody() data: string): any {
+    const event = 'events';
+    this.server.clients.forEach((client) => {
+      client.send(JSON.stringify({ event, data }));
+    });
+  }
+}
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 3ff0cb811..cd923c831 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -1,17 +1,20 @@
 import {Module} from '@nestjs/common';
 import {AuthModule} from '@/modules/api/auth/auth.module';
 import {LoggingInterceptor} from '@/modules/app/interceptors/logging.interceptor';
-import {
-  APP_INTERCEPTOR,
-  RouterModule
-} from '@nestjs/core';
+import {APP_INTERCEPTOR} from '@nestjs/core';
 import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {RedisModule} from '@nestjs-modules/ioredis';
 import {config} from 'node-ts-config';
 import {ConfigModule} from '@/modules/rest/config/config.module';
+import {VerifyModule} from '@/modules/api/verify/verify.module';
 
 @Module({
-  imports: [AuthModule, LoggerModule, ConfigModule, RedisModule.forRoot({
+  imports: [
+    AuthModule,
+    LoggerModule,
+    ConfigModule,
+    VerifyModule,
+    RedisModule.forRoot({
     config: {
       host: config.redis.host,
       port: config.redis.port,
diff --git a/newback/src/modules/api/auth/password.service.ts b/newback/src/modules/rest/password/password.service.ts
similarity index 100%
rename from newback/src/modules/api/auth/password.service.ts
rename to newback/src/modules/rest/password/password.service.ts
diff --git a/newback/src/modules/rest/session/session.service.ts b/newback/src/modules/rest/session/session.service.ts
new file mode 100644
index 000000000..3ca11217b
--- /dev/null
+++ b/newback/src/modules/rest/session/session.service.ts
@@ -0,0 +1,24 @@
+import {
+  Injectable,
+  Logger
+} from '@nestjs/common';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+
+@Injectable()
+export class SessionService {
+
+  constructor(
+    private readonly passwordService: PasswordService,
+    private readonly redisService: RedisService,
+    private readonly logger: Logger,
+  ) {
+  }
+
+   public async createAndSaveSession(userId: number) {
+    let session = await this.passwordService.generateRandomString(32);
+    this.logger.log(`Generated session for userId ${userId}: ${session}`)
+    await this.redisService.saveSession(session, userId);
+    return session;
+  }
+}
diff --git a/newback/yarn.lock b/newback/yarn.lock
index a266495d1..65af2dcfa 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -609,13 +609,6 @@
     handlebars "^4.7.6"
     pug "^3.0.1"
 
-"@nestjs/axios@^0.0.7":
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/@nestjs/axios/-/axios-0.0.7.tgz#7f134636db13c2c1e8299365c7eceb73cd782b67"
-  integrity sha512-at8nj+1Nb8UleHcIN5QqZYeWX54m4m9s9gxzVE1qWy00neX2rg0+h2TfbWsnDi2tc23zIxqexanxMOJZbzO0CA==
-  dependencies:
-    axios "0.26.0"
-
 "@nestjs/cli@^8.2.5":
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/@nestjs/cli/-/cli-8.2.5.tgz#02094177f4eac576d1a559b259d541393e49e0bb"
@@ -683,6 +676,14 @@
     multer "1.4.4"
     tslib "2.3.1"
 
+"@nestjs/platform-ws@^8.4.4":
+  version "8.4.4"
+  resolved "https://registry.yarnpkg.com/@nestjs/platform-ws/-/platform-ws-8.4.4.tgz#ec158f2f2410a847385376173f28a80fe8bf5e96"
+  integrity sha512-fMrBlBiBkFX0I8Glm17B38bG0XUk0yOajzh2DNAtZG/q0Jn1WSsDDnvleHQaThffJ3PVmEdDcSPd+k2uQA/N7A==
+  dependencies:
+    tslib "2.3.1"
+    ws "7.5.6"
+
 "@nestjs/schematics@^8.0.10", "@nestjs/schematics@^8.0.3":
   version "8.0.10"
   resolved "https://registry.yarnpkg.com/@nestjs/schematics/-/schematics-8.0.10.tgz#4f951ea1ac94721ba6a6ccfae6461f8b22949573"
@@ -718,6 +719,15 @@
     optional "0.1.4"
     tslib "2.3.1"
 
+"@nestjs/websockets@^8.4.4":
+  version "8.4.4"
+  resolved "https://registry.yarnpkg.com/@nestjs/websockets/-/websockets-8.4.4.tgz#11d6384a3bde5f97ac8a401032cf5c011901b53b"
+  integrity sha512-c7GPbdxDaAR9uTfZHibIIyhFli+YopUVC0nrKGisS8rSsId1wuEIvWo73RLcRekcO85LPGZGf2f+wsP/SxD3yw==
+  dependencies:
+    iterare "1.2.1"
+    object-hash "3.0.0"
+    tslib "2.3.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1533,13 +1543,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-axios@0.26.0:
-  version "0.26.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz#9a318f1c69ec108f8cd5f3c3d390366635e13928"
-  integrity sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==
-  dependencies:
-    follow-redirects "^1.14.8"
-
 axios@0.26.1:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
@@ -6932,6 +6935,11 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
+ws@7.5.6:
+  version "7.5.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
+  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
+
 ws@^7.4.6:
   version "7.5.7"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"

From 3f4027d8fa0796a9acb0ec03f060c588adf8386b Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 21:37:08 +0300
Subject: [PATCH 048/221] Cleanup code

---
 common/dto.ts                                 | 15 ++--
 newback/src/data/model/room.model.ts          |  4 +-
 newback/src/data/types/api.ts                 |  8 ++-
 newback/src/main.ts                           |  6 +-
 .../src/modules/api/auth/auth.controller.ts   |  6 --
 .../src/modules/api/auth/auth.module.spec.ts  |  1 -
 newback/src/modules/api/auth/auth.module.ts   |  2 +-
 .../modules/api/auth/facebook.auth.service.ts |  1 -
 .../modules/api/auth/google.auth.service.ts   |  7 +-
 .../facebook.auth.request.validator.ts        |  4 +-
 .../google.auth.reques.validator.ts           |  2 -
 .../validators/sign.up.request.validator.ts   |  1 -
 .../accept.token.request.validator.ts         |  7 +-
 .../verify.token.request.validator.ts         |  7 +-
 .../modules/api/verify/verify.controller.ts   | 10 +--
 .../modules/api/verify/verify.module.spec.ts  | 26 +++----
 .../src/modules/api/verify/verify.service.ts  | 37 +++++-----
 .../api/websocket/websocket.gateway.ts        |  6 +-
 newback/src/modules/app/app.module.ts         | 12 ++--
 .../src/modules/app/guards/captcha.guard.ts   | 40 +++++------
 .../rest/database/repository/ip.repository.ts |  3 -
 .../database/repository/user.repository.ts    |  2 +-
 .../repository/verification.repository.ts     |  2 +-
 .../modules/rest/email/email.service.spec.ts  | 68 +++++++++++--------
 .../src/modules/rest/email/email.service.ts   | 24 +++----
 newback/src/modules/rest/http/http.service.ts | 46 ++++++-------
 .../modules/rest/ip/invalid.ip.exception.ts   |  3 +-
 .../src/modules/rest/ip/ip.cache.service.ts   |  3 +-
 newback/src/modules/rest/ip/ip.module.ts      |  1 -
 .../modules/rest/ip/ip.service.e2e.spec.ts    | 33 +++++----
 newback/src/modules/rest/ip/ip.service.ts     |  2 +-
 .../modules/rest/session/session.service.ts   |  2 +-
 newback/src/utils/helpers.spec.ts             |  2 +-
 newback/src/utils/helpers.ts                  |  1 +
 newback/src/utils/migration.runner.ts         |  2 +-
 35 files changed, 191 insertions(+), 205 deletions(-)

diff --git a/common/dto.ts b/common/dto.ts
index 7e8ef44b3..bcfe33c42 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -1,4 +1,4 @@
-export interface SignInRequest extends CaptchaRequest{
+export interface SignInRequest extends CaptchaRequest {
   username?: string;
   password: string;
   email?: string;
@@ -56,7 +56,8 @@ export interface ConfirmEmailRequest {
   token: string;
 }
 
-export interface ConfirmEmailResponse extends OkResponse {}
+export interface ConfirmEmailResponse extends OkResponse {
+}
 
 export interface SessionResponse {
   session: string;
@@ -67,22 +68,24 @@ export interface SignInResponse extends SessionResponse {
 }
 
 
-interface TypeGeneratorForOauth1 extends SessionResponse{
+interface TypeGeneratorForOauth1 extends SessionResponse {
   isNewAccount: true;
   username: string;
 }
 
-interface TypeGeneratorForOauth2 extends SessionResponse{
+interface TypeGeneratorForOauth2 extends SessionResponse {
   isNewAccount: false
 }
 
-export type OauthSessionResponse = TypeGeneratorForOauth1 | TypeGeneratorForOauth2;
+export type OauthSessionResponse =
+  TypeGeneratorForOauth1
+  | TypeGeneratorForOauth2;
 
 
 export type GoogleSignInResponse = OauthSessionResponse;
 export type FacebookSignInResponse = OauthSessionResponse;
 
-export interface SignUpResponse extends SessionResponse{
+export interface SignUpResponse extends SessionResponse {
 
 }
 
diff --git a/newback/src/data/model/room.model.ts b/newback/src/data/model/room.model.ts
index d75a35f93..b4eac51ff 100644
--- a/newback/src/data/model/room.model.ts
+++ b/newback/src/data/model/room.model.ts
@@ -66,8 +66,8 @@ export class RoomModel extends Model<RoomModel> {
     allowNull: true,
     defaultValue: null,
   })
-  public creatorId: number|null;
+  public creatorId: number | null;
 
   @BelongsTo(() => UserModel)
-  public creator: UserModel|null;
+  public creator: UserModel | null;
 }
diff --git a/newback/src/data/types/api.ts b/newback/src/data/types/api.ts
index e2fc2891a..296c9254d 100644
--- a/newback/src/data/types/api.ts
+++ b/newback/src/data/types/api.ts
@@ -8,9 +8,10 @@ export interface IpFailedInfoResponse {
   message: string;
   status: 'fail';
 }
+
 export const IP_FAIL = 'fail';
 
-export interface IpSuccessInfoResponse  {
+export interface IpSuccessInfoResponse {
   status: 'success';
   country: string;
   countryCode: string;
@@ -26,4 +27,7 @@ export interface IpSuccessInfoResponse  {
   as: string;
   query: string;
 }
-export type IpInfoResponse = IpFailedInfoResponse | IpSuccessInfoResponse;
+
+export type IpInfoResponse =
+  IpFailedInfoResponse
+  | IpSuccessInfoResponse;
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 3d105c54d..c2f5e55f2 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -11,7 +11,7 @@ import {promisify} from 'util';
 import {WsAdapter} from '@nestjs/platform-ws';
 
 async function bootstrap() {
-  const key  = await promisify(readFile)(config.application.keyPath, 'utf-8');
+  const key = await promisify(readFile)(config.application.keyPath, 'utf-8');
   const cert = await promisify(readFile)(config.application.crtPath, 'utf-8');
 
   const app = await NestFactory.create(AppModule, {
@@ -22,8 +22,8 @@ async function bootstrap() {
       origin: "*"
     },
     httpsOptions: {
-       key,
-       cert
+      key,
+      cert
     }
   });
   app.useWebSocketAdapter(new WsAdapter(app));
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 92f6aaa4b..bcd996d25 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -1,9 +1,7 @@
 import {
   Body,
   Controller,
-  HttpCode,
   Ip,
-  Logger,
   Post,
   UseGuards
 } from '@nestjs/common';
@@ -12,15 +10,11 @@ import {LoginRequestValidator} from '@/modules/api/auth/validators/login.request
 import {SignUpRequestValidator} from '@/modules/api/auth/validators/sign.up.request.validator';
 import {ValidateUserRequestValidator} from '@/modules/api/auth/validators/validate.user.request.validator';
 import {
-  AcceptTokenResponse,
-  ConfirmEmailResponse,
   FacebookSignInResponse,
   GoogleSignInResponse,
-  SendRestorePasswordResponse,
   SignInResponse,
   SignUpResponse,
   ValidateEmailResponse,
-  ValidateUserEmailRequest,
   ValidateUserResponse
 } from '@/data/types/frontend';
 import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.auth.reques.validator';
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 7cde26ac8..4bb1ac69c 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -35,7 +35,6 @@ import {IpService} from '@/modules/rest/ip/ip.service';
 import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 import {IpAddressModel} from '@/data/model/ip.address.model';
 import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
-import {VerificationType} from '@/data/types/frontend';
 import {SessionService} from '@/modules/rest/session/session.service';
 
 describe('AuthModule', () => {
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index 3d775ebd2..b26d4967c 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -31,7 +31,7 @@ import {SessionService} from '@/modules/rest/session/session.service';
       useFactory: (logger) => {
         return new GoogleAuthService(logger, config.auth?.google?.clientId ? new OAuth2Client(
           config.auth.google.clientId,
-        ): null)
+        ) : null)
       },
       inject: [Logger, ConfigService]
     },
diff --git a/newback/src/modules/api/auth/facebook.auth.service.ts b/newback/src/modules/api/auth/facebook.auth.service.ts
index c47790d32..7199821bf 100644
--- a/newback/src/modules/api/auth/facebook.auth.service.ts
+++ b/newback/src/modules/api/auth/facebook.auth.service.ts
@@ -1,4 +1,3 @@
-import {TokenPayload} from 'google-auth-library';
 import {
   BadRequestException,
   Injectable,
diff --git a/newback/src/modules/api/auth/google.auth.service.ts b/newback/src/modules/api/auth/google.auth.service.ts
index 2e25eef79..cd5772df6 100644
--- a/newback/src/modules/api/auth/google.auth.service.ts
+++ b/newback/src/modules/api/auth/google.auth.service.ts
@@ -1,4 +1,7 @@
-import { OAuth2Client, TokenPayload } from 'google-auth-library';
+import {
+  OAuth2Client,
+  TokenPayload
+} from 'google-auth-library';
 import {
   ForbiddenException,
   Injectable,
@@ -11,7 +14,7 @@ export class GoogleAuthService {
 
   public constructor(
     private readonly logger: Logger,
-    private readonly oauth2Client: OAuth2Client|null,
+    private readonly oauth2Client: OAuth2Client | null,
   ) {
 
   }
diff --git a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
index 6a83bd801..a34d3b2c0 100644
--- a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
@@ -1,7 +1,5 @@
 import {IsString} from 'class-validator';
-import {
-  FaceBookAuthRequest,
-} from '@/data/types/frontend';
+import {FaceBookAuthRequest,} from '@/data/types/frontend';
 
 export class FacebookAuthRequestValidator implements FaceBookAuthRequest {
 
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
index 253f52bbf..c91e074ba 100644
--- a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -1,5 +1,3 @@
-
-
 import {IsString,} from 'class-validator';
 import {GoogleAuthRequest} from '@/data/types/frontend';
 
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index da1a6d4a2..67bcc70ff 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -5,7 +5,6 @@ import {
   IsString,
   Length,
   Matches,
-  ValidateIf,
 } from 'class-validator';
 import {
   Gender,
diff --git a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
index 537ea793f..85ee7d48d 100644
--- a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
@@ -1,14 +1,9 @@
 import {
-  IsEmail,
   IsString,
   Length,
   Matches,
-  ValidateIf,
 } from 'class-validator';
-import {
-  AcceptTokenRequest,
-  VerifyTokenRequest
-} from '@/data/types/frontend';
+import {AcceptTokenRequest} from '@/data/types/frontend';
 
 
 export class AcceptTokenRequestValidator implements AcceptTokenRequest {
diff --git a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
index 4364cc9b9..880f5cab0 100644
--- a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
@@ -1,9 +1,4 @@
-import {
-  IsEmail,
-  IsString,
-  Matches,
-  ValidateIf,
-} from 'class-validator';
+import {IsString,} from 'class-validator';
 import {VerifyTokenRequest} from '@/data/types/frontend';
 
 
diff --git a/newback/src/modules/api/verify/verify.controller.ts b/newback/src/modules/api/verify/verify.controller.ts
index 775ff1327..55321fe35 100644
--- a/newback/src/modules/api/verify/verify.controller.ts
+++ b/newback/src/modules/api/verify/verify.controller.ts
@@ -28,8 +28,8 @@ export class VerifyController {
   ) {
   }
 
-@UseGuards(CaptchaGuard)
- @Post('/send-restore-password')
+  @UseGuards(CaptchaGuard)
+  @Post('/send-restore-password')
   public async sendRestorePassword(@Body() body: SendRestorePasswordValidator, @Ip() ip: string): Promise<SendRestorePasswordResponse> {
     await this.verifyService.sendRestorePassword(body, ip);
     return {
@@ -37,9 +37,9 @@ export class VerifyController {
     }
   }
 
- @Post('/verify-token')
+  @Post('/verify-token')
   public async verifyToken(@Body() body: VerifyTokenRequestValidator): Promise<VerifyTokenResponse> {
-    return  this.verifyService.verifyToken(body.token);
+    return this.verifyService.verifyToken(body.token);
   }
 
   @Post('/confirm-email')
@@ -50,7 +50,7 @@ export class VerifyController {
     }
   }
 
- @Post('/accept-token')
+  @Post('/accept-token')
   public async acceptToken(@Body() body: AcceptTokenRequestValidator): Promise<AcceptTokenResponse> {
     return this.verifyService.acceptToken(body);
   }
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index ceb93f3b2..54cea9911 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -92,7 +92,7 @@ describe('VerifyModule', () => {
           useFactory: (logger) => new HttpService(logger, new Proxy(() => {
           }, {
             apply: function (target: {}, thisArg: any, argArray: any[]): any {
-               throw Error("Unsupported");
+              throw Error("Unsupported");
             }
           }) as typeof fetch)
         },
@@ -187,15 +187,15 @@ describe('VerifyModule', () => {
   });
   describe('verify-token', () => {
     it('should return error when token doesnt exist', async() => {
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+      verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
       await request
         .post('/api/verify/verify-token').send({
           token: 'a',
-        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+        }).expect(400, {statusCode: 400, message: 'Invalid token', error: 'Bad Request'});
     });
     it('should return ok when token valid', async() => {
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+      verificationRepository.getVerification = jest.fn().mockResolvedValue({
         type: VerificationType.PASSWORD,
         createdAt: new Date(),
         user: {
@@ -206,7 +206,7 @@ describe('VerifyModule', () => {
       await request
         .post('/api/verify/verify-token').send({
           token: 'a',
-        }).expect(201, { ok: true, username: 'a'});
+        }).expect(201, {ok: true, username: 'a'});
     });
     it('throws an error if user doesnt exists', async() => {
       sequelize.transaction = (resolve) => resolve();
@@ -218,21 +218,21 @@ describe('VerifyModule', () => {
     });
   });
 
-   describe('confirm-email', () => {
+  describe('confirm-email', () => {
     it('should return error when token doesnt exist', async() => {
       sequelize.transaction = (resolve) => resolve();
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+      verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
       await request
         .post('/api/verify/confirm-email').send({
           token: 'a',
-        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+        }).expect(400, {statusCode: 400, message: 'Invalid token', error: 'Bad Request'});
     });
     it('should set email confirmed', async() => {
       sequelize.transaction = (resolve) => resolve();
       verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
       verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+      verificationRepository.getVerification = jest.fn().mockResolvedValue({
         type: VerificationType.REGISTER,
         createdAt: new Date(),
         user: {
@@ -246,16 +246,16 @@ describe('VerifyModule', () => {
         }).expect(201, {ok: true});
     });
   });
-   describe('accept-token', () => {
+  describe('accept-token', () => {
     it('should return error when token doesnt exist', async() => {
       sequelize.transaction = (resolve) => resolve();
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue(undefined);
+      verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
       await request
         .post('/api/verify/accept-token').send({
           token: 'a',
           password: 'asd',
-        }).expect(400, { statusCode: 400, message: 'Invalid token', error: 'Bad Request' });
+        }).expect(400, {statusCode: 400, message: 'Invalid token', error: 'Bad Request'});
     });
     it('should set email confirmed', async() => {
       sequelize.transaction = (resolve) => resolve();
@@ -263,7 +263,7 @@ describe('VerifyModule', () => {
       verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
       verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      verificationRepository.getVerification =  jest.fn().mockResolvedValue({
+      verificationRepository.getVerification = jest.fn().mockResolvedValue({
         type: VerificationType.PASSWORD,
         createdAt: new Date(),
         user: {
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index b4b4ce3de..ce95cd9d0 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -34,22 +34,6 @@ export class VerifyService {
   ) {
   }
 
-
-  private doTokenVerification(data: VerificationModel, typ: VerificationType): void {
-    if (!data) {
-      throw new BadRequestException("Invalid token");
-    }
-    if (data.type != typ) {
-      throw new BadRequestException("Invalid operation");
-    }
-    if (data.verified) {
-      throw new BadRequestException("This token is already used");
-    }
-    if (Date.now() - data.createdAt.getTime() > 24 * 3600 * 1000) { // 24 hours
-      throw new BadRequestException("This token is already expired");
-    }
-  }
-
   public async verifyToken(token: string): Promise<VerifyTokenResponse> {
     let verificationModel: VerificationModel = await this.verificationRepository.getVerification(token);
     //https://pychat.org/#/auth/proceed-reset-password?token=evhv0zum3l8gavzql4xk5u16q2h9gqd2
@@ -108,11 +92,26 @@ export class VerifyService {
   }
 
   public async confirmEmail(body: ConfirmEmailRequest): Promise<void> {
-     await this.sequelize.transaction(async(t) => {
+    await this.sequelize.transaction(async(t) => {
       let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
       this.doTokenVerification(verificationModel, VerificationType.REGISTER);
-      await this.verificationRepository.markVerificationVerified(verificationModel.id , t);
-      await this.verificationRepository.setUserVerification(verificationModel.userId, verificationModel.id , t);
+      await this.verificationRepository.markVerificationVerified(verificationModel.id, t);
+      await this.verificationRepository.setUserVerification(verificationModel.userId, verificationModel.id, t);
     })
   }
+
+  private doTokenVerification(data: VerificationModel, typ: VerificationType): void {
+    if (!data) {
+      throw new BadRequestException("Invalid token");
+    }
+    if (data.type != typ) {
+      throw new BadRequestException("Invalid operation");
+    }
+    if (data.verified) {
+      throw new BadRequestException("This token is already used");
+    }
+    if (Date.now() - data.createdAt.getTime() > 24 * 3600 * 1000) { // 24 hours
+      throw new BadRequestException("This token is already expired");
+    }
+  }
 }
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 4f39353cc..8d304caf0 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -5,9 +5,9 @@ import {
   WebSocketGateway,
   WebSocketServer,
 } from '@nestjs/websockets';
-import { Server } from 'ws';
+import {Server} from 'ws';
 
-@WebSocketGateway({ path: '/ws' })
+@WebSocketGateway({path: '/ws'})
 export class EventsGateway implements OnGatewayConnection {
   @WebSocketServer()
   server!: Server;
@@ -20,7 +20,7 @@ export class EventsGateway implements OnGatewayConnection {
   handleEvent(@MessageBody() data: string): any {
     const event = 'events';
     this.server.clients.forEach((client) => {
-      client.send(JSON.stringify({ event, data }));
+      client.send(JSON.stringify({event, data}));
     });
   }
 }
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index cd923c831..0013a0725 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -15,12 +15,12 @@ import {VerifyModule} from '@/modules/api/verify/verify.module';
     ConfigModule,
     VerifyModule,
     RedisModule.forRoot({
-    config: {
-      host: config.redis.host,
-      port: config.redis.port,
-      db: config.redis.database,
-    }
-  })],
+      config: {
+        host: config.redis.host,
+        port: config.redis.port,
+        db: config.redis.database,
+      }
+    })],
   providers: [
     {
       provide: APP_INTERCEPTOR,
diff --git a/newback/src/modules/app/guards/captcha.guard.ts b/newback/src/modules/app/guards/captcha.guard.ts
index c123b7dd5..428e77443 100644
--- a/newback/src/modules/app/guards/captcha.guard.ts
+++ b/newback/src/modules/app/guards/captcha.guard.ts
@@ -1,25 +1,21 @@
 import {
-	Injectable,
-	CanActivate,
-	ExecutionContext,
-	BadRequestException,
-	Logger,
-	UnauthorizedException,
-
+  BadRequestException,
+  CanActivate,
+  ExecutionContext,
+  Injectable,
+  Logger,
+  UnauthorizedException,
 } from '@nestjs/common';
 
-import {
-	Recaptcha
-} from 'node-ts-config';
-
 import {ConfigService} from '@/modules/rest/config/config.service';
 import {HttpService} from '@/modules/rest/http/http.service';
+
 @Injectable()
 export class CaptchaGuard implements CanActivate {
   constructor(
     private readonly logger: Logger,
-		private readonly httpService: HttpService,
-		private readonly configService: ConfigService,
+    private readonly httpService: HttpService,
+    private readonly configService: ConfigService,
   ) {
   }
 
@@ -35,14 +31,14 @@ export class CaptchaGuard implements CanActivate {
       throw new BadRequestException("Captcha is missing");
     }
 
-		let response = await this.httpService.postUrlEncoded("https://www.google.com/recaptcha/api/siteverify", {
-			secret: this.configService.getConfig().recaptcha.privateKey,
-			response: captcha,
-			remoteip: ip
-		});
-		if (!response.success) {
-			throw new UnauthorizedException(response && response['error-codes'] ? `Captcha error: ${response['error-codes'][0]}` : 'Unable to validate captcha');
-		}
-		return true;
+    let response = await this.httpService.postUrlEncoded("https://www.google.com/recaptcha/api/siteverify", {
+      secret: this.configService.getConfig().recaptcha.privateKey,
+      response: captcha,
+      remoteip: ip
+    });
+    if (!response.success) {
+      throw new UnauthorizedException(response && response['error-codes'] ? `Captcha error: ${response['error-codes'][0]}` : 'Unable to validate captcha');
+    }
+    return true;
   }
 }
diff --git a/newback/src/modules/rest/database/repository/ip.repository.ts b/newback/src/modules/rest/database/repository/ip.repository.ts
index 39b210140..f230f58dc 100644
--- a/newback/src/modules/rest/database/repository/ip.repository.ts
+++ b/newback/src/modules/rest/database/repository/ip.repository.ts
@@ -1,8 +1,5 @@
 import {Injectable} from '@nestjs/common';
 import {InjectModel} from '@nestjs/sequelize';
-import {RoomModel} from '@/data/model/room.model';
-import {RoomUsersModel} from '@/data/model/room.users.model';
-import {Transaction} from 'sequelize';
 import {IpAddressModel} from '@/data/model/ip.address.model';
 
 
diff --git a/newback/src/modules/rest/database/repository/user.repository.ts b/newback/src/modules/rest/database/repository/user.repository.ts
index ac3c553fd..f28c8932c 100644
--- a/newback/src/modules/rest/database/repository/user.repository.ts
+++ b/newback/src/modules/rest/database/repository/user.repository.ts
@@ -103,7 +103,7 @@ export class UserRepository {
     })
   }
 
-  public async getUserByUserName(username: string, includeFields: ('userAuth'|'userProfile')[], transaction?: Transaction): Promise<UserModel | null> {
+  public async getUserByUserName(username: string, includeFields: ('userAuth' | 'userProfile')[], transaction?: Transaction): Promise<UserModel | null> {
     return this.userModel.findOne({
       where: {username},
       transaction,
diff --git a/newback/src/modules/rest/database/repository/verification.repository.ts b/newback/src/modules/rest/database/repository/verification.repository.ts
index e1f9fd3dc..3e582f871 100644
--- a/newback/src/modules/rest/database/repository/verification.repository.ts
+++ b/newback/src/modules/rest/database/repository/verification.repository.ts
@@ -14,7 +14,7 @@ export class VerificationRepository {
   ) {
   }
 
- public async markVerificationVerified(id: number, transaction: Transaction) {
+  public async markVerificationVerified(id: number, transaction: Transaction) {
     await this.verificationModel.update({verified: true}, {
       where: {id},
       transaction
diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
index daef0e03a..8eac32459 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -19,24 +19,24 @@ describe('EmailSenderService', () => {
   beforeAll(
     async() => {
 
-    moduleFixture = await Test.createTestingModule({
-      imports: [
-        LoggerModule,
-        ConfigModule
-      ],
-      providers: [
-        {
-          provide: MailerService,
-          useValue: { sendMail: () => jest.fn().mockResolvedValue(undefined)}
-        },
-        HtmlService,
-        EmailService,
-      ]
-    }).compile();
-    sender = moduleFixture.get(EmailService);
-    mailer = moduleFixture.get(MailerService);
-  })
-  afterAll(async () => {
+      moduleFixture = await Test.createTestingModule({
+        imports: [
+          LoggerModule,
+          ConfigModule
+        ],
+        providers: [
+          {
+            provide: MailerService,
+            useValue: {sendMail: () => jest.fn().mockResolvedValue(undefined)}
+          },
+          HtmlService,
+          EmailService,
+        ]
+      }).compile();
+      sender = moduleFixture.get(EmailService);
+      mailer = moduleFixture.get(MailerService);
+    })
+  afterAll(async() => {
     await moduleFixture.close()
   })
 
@@ -45,30 +45,38 @@ describe('EmailSenderService', () => {
   })
 
   describe('sendRestorePasswordEmail', () => {
-     it('time should always be UTC', () => { // https://stackoverflow.com/a/56482581/3872976
-       // test below depends on new date to return specific time
-       // we mock it with jest, but it still depends on machine timezone so we need to ensure tz is same
-       // jest.setup.js fixes it
-       expect(new Date().getTimezoneOffset()).toBe(0);
+    it('time should always be UTC', () => { // https://stackoverflow.com/a/56482581/3872976
+      // test below depends on new date to return specific time
+      // we mock it with jest, but it still depends on machine timezone so we need to ensure tz is same
+      // jest.setup.js fixes it
+      expect(new Date().getTimezoneOffset()).toBe(0);
     });
-    it('should render', async () => {
+    it('should render', async() => {
       let spy = jest.spyOn(mailer, 'sendMail');
       jest.useFakeTimers('modern');
       jest.setSystemTime(new Date(2020, 3, 1));
-      await sender.sendRestorePasswordEmail('a', 3 , 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
+      await sender.sendRestorePasswordEmail('a', 3, 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
       const content = await promisify(readFile)(resolve(__dirname, '..', '..', '..', 'fixtures', 'rendered.send.restore.password.html'), 'utf-8');
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: content,  "subject": "Reset pychat password", "text": expect.any(String)}))
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({
+        html: content,
+        "subject": "Reset pychat password",
+        "text": expect.any(String)
+      }))
     });
   });
 
-   describe('sendSignUpEmail', () => {
-    it('should render', async () => {
+  describe('sendSignUpEmail', () => {
+    it('should render', async() => {
       let spy = jest.spyOn(mailer, 'sendMail');
       jest.useFakeTimers('modern');
       jest.setSystemTime(new Date(2020, 3, 1));
-      await sender.sendSignUpEmail('a', 3 , 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
+      await sender.sendSignUpEmail('a', 3, 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
       const content = await promisify(readFile)(resolve(__dirname, '..', '..', '..', 'fixtures', 'send.sign.up.email.html'), 'utf-8');
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: content,  "subject": "Confirm Pychat registration", "text": expect.any(String)}))
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({
+        html: content,
+        "subject": "Confirm Pychat registration",
+        "text": expect.any(String)
+      }))
     });
   });
 });
diff --git a/newback/src/modules/rest/email/email.service.ts b/newback/src/modules/rest/email/email.service.ts
index 702455f80..e378724fd 100644
--- a/newback/src/modules/rest/email/email.service.ts
+++ b/newback/src/modules/rest/email/email.service.ts
@@ -28,6 +28,18 @@ export class EmailService {
     await this.sendEmail('change.password.start', userId, email, 'Reset pychat password', context);
   }
 
+  public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
+    let context: Record<string, string> = {
+      issueReportLink: this.configService.getConfig().frontend.issueReportLink,
+      magicLink: `${this.configService.getConfig().frontend.address}/#/confirm-email?token=${token}`,
+      username,
+      ip,
+      timeCreated: (new Date() as any).toGMTString(),
+      ipInfo
+    };
+    await this.sendEmail('sign.up.email', userId, email, 'Confirm Pychat registration', context);
+  }
+
   private async sendEmail(templateName: string, userId, email, subject: string, context: Record<string, string>) {
     if (!this.configService.getConfig().email) {
       this.loggerService.warn(`Email to userId ${userId} ${email} won't be sent since email settings is not set in config`);
@@ -44,16 +56,4 @@ export class EmailService {
     })
   }
 
-  public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
-    let context: Record<string, string> = {
-      issueReportLink: this.configService.getConfig().frontend.issueReportLink,
-      magicLink: `${this.configService.getConfig().frontend.address}/#/confirm-email?token=${token}`,
-      username,
-      ip,
-      timeCreated: (new Date() as any).toGMTString(),
-      ipInfo
-    };
-    await this.sendEmail('sign.up.email', userId, email, 'Confirm Pychat registration', context);
-  }
-
 }
diff --git a/newback/src/modules/rest/http/http.service.ts b/newback/src/modules/rest/http/http.service.ts
index a79e44712..8d2706dd8 100644
--- a/newback/src/modules/rest/http/http.service.ts
+++ b/newback/src/modules/rest/http/http.service.ts
@@ -15,6 +15,28 @@ export class HttpService {
   ) {
   }
 
+  public async postUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
+    const body = new URLSearchParams();
+    Object.entries(data).forEach(([k, v]) => {
+      body.append(k, v);
+    })
+    return this.post<T>(url, body, {})
+  }
+
+  public async getUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any> = {}): Promise<T> {
+    const params = new URLSearchParams();
+    Object.entries(data).forEach(([k, v]) => {
+      params.append(k, v);
+    })
+    return this.get<T>(`${url}?${params.toString()}`, {})
+  }
+
+  public async postData<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
+    let body = JSON.stringify(data);
+    let headers = {'Content-Type': 'application/json'};
+    return this.post<T>(url, body, headers);
+  }
+
   private async post<T = Record<string, any>>(url, body: any, headers: Record<string, string>): Promise<T> {
     let requestId = ++this.requestId;
     this.logger.debug(`POST[${requestId}]: url='${url}'; data=${body}; headers=${JSON.stringify(headers)} `)
@@ -28,7 +50,7 @@ export class HttpService {
     return responseBody;
   }
 
-   private async get<T = Record<string, any>>(url, headers: Record<string, string>): Promise<T> {
+  private async get<T = Record<string, any>>(url, headers: Record<string, string>): Promise<T> {
     let requestId = ++this.requestId;
     this.logger.debug(`GET[${requestId}]: url='${url}'; headers=${JSON.stringify(headers)} `)
     const response = await this.nodeFetch(url, {
@@ -40,26 +62,4 @@ export class HttpService {
     return responseBody;
   }
 
-  public async postUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
-    const body = new URLSearchParams();
-    Object.entries(data).forEach(([k,v]) => {
-      body.append(k, v);
-    })
-    return this.post<T>(url, body, {})
-  }
-
-  public async getUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any> = {}): Promise<T> {
-    const params = new URLSearchParams();
-    Object.entries(data).forEach(([k,v]) => {
-      params.append(k, v);
-    })
-    return this.get<T>(`${url}?${params.toString()}`, {})
-  }
-
-  public async postData<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
-    let body = JSON.stringify(data);
-    let headers = {'Content-Type': 'application/json'};
-    return this.post<T>(url, body, headers);
-  }
-
 }
diff --git a/newback/src/modules/rest/ip/invalid.ip.exception.ts b/newback/src/modules/rest/ip/invalid.ip.exception.ts
index 98644cfc5..abc545c73 100644
--- a/newback/src/modules/rest/ip/invalid.ip.exception.ts
+++ b/newback/src/modules/rest/ip/invalid.ip.exception.ts
@@ -3,8 +3,9 @@ import {HttpException} from '@nestjs/common';
 export class InvalidIpException extends HttpException {
   public readonly networkError: boolean;
   public readonly ip: string;
+
   constructor(ip: string, error: string, networkError: boolean) {
-    super(error,networkError ? 500 : 400);
+    super(error, networkError ? 500 : 400);
     this.networkError = networkError;
     this.ip = ip;
   }
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/rest/ip/ip.cache.service.ts
index 38fd5377c..4858d7794 100644
--- a/newback/src/modules/rest/ip/ip.cache.service.ts
+++ b/newback/src/modules/rest/ip/ip.cache.service.ts
@@ -2,7 +2,6 @@ import {
   Injectable,
   Logger
 } from '@nestjs/common';
-import {IP_FAIL} from '@/data/types/api';
 import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 import {IpService} from '@/modules/rest/ip/ip.service';
 import {IpAddressModel} from '@/data/model/ip.address.model';
@@ -48,7 +47,7 @@ export class IpCacheService {
       await this.ipRepository.saveIP(model)
       return model;
     } catch (e: any) {
-       this.logger.error(`Unable to get Ip Address Info ${ip}`, e.stack, e.error)
+      this.logger.error(`Unable to get Ip Address Info ${ip}`, e.stack, e.error)
       if (!(e as InvalidIpException).networkError) {
         await this.ipRepository.saveIP({ip, status: false})
         return null;
diff --git a/newback/src/modules/rest/ip/ip.module.ts b/newback/src/modules/rest/ip/ip.module.ts
index 4b81c0c40..8872c43b7 100644
--- a/newback/src/modules/rest/ip/ip.module.ts
+++ b/newback/src/modules/rest/ip/ip.module.ts
@@ -1,6 +1,5 @@
 import {
   Global,
-  Logger,
   Module
 } from '@nestjs/common';
 import {IpService} from '@/modules/rest/ip/ip.service';
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
index 757ebca90..48d935b36 100644
--- a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
+++ b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
@@ -5,7 +5,6 @@ import {
 import {IpService} from '@/modules/rest/ip/ip.service';
 import {HttpModule} from '@/modules/rest/http/http.module';
 import * as pychatIpAddressFixture from '@/fixtures/ip.134.249.113.11.json';
-import {BadRequestException} from '@nestjs/common';
 import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
 
@@ -16,19 +15,19 @@ describe('IpService', () => {
   beforeAll(
     async() => {
 
-    moduleFixture = await Test.createTestingModule({
-      imports: [
-        LoggerModule,
-        HttpModule
-      ],
-      providers: [
-        IpService,
-      ]
-    }).compile();
-    ipservice = moduleFixture.get(IpService);
-  })
+      moduleFixture = await Test.createTestingModule({
+        imports: [
+          LoggerModule,
+          HttpModule
+        ],
+        providers: [
+          IpService,
+        ]
+      }).compile();
+      ipservice = moduleFixture.get(IpService);
+    })
 
-  afterAll(async () => {
+  afterAll(async() => {
     await moduleFixture.close()
   })
 
@@ -37,11 +36,11 @@ describe('IpService', () => {
   })
 
   describe('getIpInfo', () => {
-    it('ip 134.249.113.11 should return correct response', async () => {
-     let data = await ipservice.getIpInfo('134.249.113.11');
-     expect(data).toEqual(pychatIpAddressFixture)
+    it('ip 134.249.113.11 should return correct response', async() => {
+      let data = await ipservice.getIpInfo('134.249.113.11');
+      expect(data).toEqual(pychatIpAddressFixture)
     });
-     it('ip ::ffff:127.0.0.1 should return correct response', async () => {
+    it('ip ::ffff:127.0.0.1 should return correct response', async() => {
       await expect(ipservice.getIpInfo('::ffff:127.0.0.1')).rejects.toMatchObject(expect.any(InvalidIpException))
     });
   });
diff --git a/newback/src/modules/rest/ip/ip.service.ts b/newback/src/modules/rest/ip/ip.service.ts
index 85251d3fb..042f146e3 100644
--- a/newback/src/modules/rest/ip/ip.service.ts
+++ b/newback/src/modules/rest/ip/ip.service.ts
@@ -19,7 +19,7 @@ export class IpService {
       throw new InvalidIpException(ip, response.message, false);
     }
     if (response.status !== 'success') {
-        throw new InvalidIpException(ip, 'Unknown', true);
+      throw new InvalidIpException(ip, 'Unknown', true);
     }
     return response;
   }
diff --git a/newback/src/modules/rest/session/session.service.ts b/newback/src/modules/rest/session/session.service.ts
index 3ca11217b..f57fd93b1 100644
--- a/newback/src/modules/rest/session/session.service.ts
+++ b/newback/src/modules/rest/session/session.service.ts
@@ -15,7 +15,7 @@ export class SessionService {
   ) {
   }
 
-   public async createAndSaveSession(userId: number) {
+  public async createAndSaveSession(userId: number) {
     let session = await this.passwordService.generateRandomString(32);
     this.logger.log(`Generated session for userId ${userId}: ${session}`)
     await this.redisService.saveSession(session, userId);
diff --git a/newback/src/utils/helpers.spec.ts b/newback/src/utils/helpers.spec.ts
index 18df68d2f..871e8d267 100644
--- a/newback/src/utils/helpers.spec.ts
+++ b/newback/src/utils/helpers.spec.ts
@@ -4,7 +4,7 @@ describe('helper', () => {
 
   describe('generateUserName', () => {
     it('should remove email domain', () => {
-        expect(generateUserName('deathangel@gmail.com')).toEqual('deathangel')
+      expect(generateUserName('deathangel@gmail.com')).toEqual('deathangel')
     });
 
     it('should cut to 16 symbolx', () => {
diff --git a/newback/src/utils/helpers.ts b/newback/src/utils/helpers.ts
index 4495737f4..12b150d62 100644
--- a/newback/src/utils/helpers.ts
+++ b/newback/src/utils/helpers.ts
@@ -6,6 +6,7 @@ import {config} from 'node-ts-config';
 export function generateUserName(email: string) {
   return email.split('@')[0].replace(/[^0-9a-zA-Z-_]+/g, '-').substring(0, MAX_USERNAME_LENGTH);
 }
+
 export function generateOrmConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, 'ssl'> {
   const sync = false;
   return {
diff --git a/newback/src/utils/migration.runner.ts b/newback/src/utils/migration.runner.ts
index 3ac5ce6b8..96e3a9209 100644
--- a/newback/src/utils/migration.runner.ts
+++ b/newback/src/utils/migration.runner.ts
@@ -27,5 +27,5 @@ connection.connect(async function (err) {
   });
   await migrations.run('init')
   await migrations.run('migrate')
-  await new Promise((resolve, reject) => connection.end((err) =>err ? reject() : resolve(undefined)));
+  await new Promise((resolve, reject) => connection.end((err) => err ? reject() : resolve(undefined)));
 });

From bce4ebfc65f7ee8b3a5a8a00df1a0fc38e564570 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 21:39:08 +0300
Subject: [PATCH 049/221] fixed codecov

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 33595a00b..0f9074e5b 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Upload Frontend pychat.org](https://github.com/akoidan/pychat/workflows/FE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3AFE%3Apychat.org)
 [![Refresh backend pychat.org](https://github.com/akoidan/pychat/workflows/BE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3ABE%3Apychat.org)
 [![Github actions](https://github.com/akoidan/pychat/workflows/NEWBE:pychat.org/badge.svg)](https://github.com/akoidan/pychat/actions)
-[![codecov](https://codecov.io/gh/akoidan/pychat/branch/master/graph/badge.svg?token=aQlNwbpTIw)](https://codecov.io/gh/akoidan/pychat)
+[![codecov](https://codecov.io/gh/akoidan/pychat/branch/nestjs/graph/badge.svg?token=aQlNwbpTIw)](https://codecov.io/gh/akoidan/pychat)
 # Live demo: [pychat.org](https://pychat.org/), [video](https://www.youtube.com/watch?v=m6sJ-blTidg)
 <span>pychat.org is not available due to server location in Ukraine because of war ;(. Please support Ukraine. Russian invaders suffer in hell!</span>
 

From ca2d9250dd6d278d72186ae2620148bd9e84a94f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 21:46:04 +0300
Subject: [PATCH 050/221] Fix module

---
 newback/src/modules/api/verify/verify.module.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/newback/src/modules/api/verify/verify.module.ts b/newback/src/modules/api/verify/verify.module.ts
index c4ce38d15..55e898ea3 100644
--- a/newback/src/modules/api/verify/verify.module.ts
+++ b/newback/src/modules/api/verify/verify.module.ts
@@ -7,12 +7,14 @@ import {HttpModule} from '@/modules/rest/http/http.module';
 import {IpModule} from '@/modules/rest/ip/ip.module';
 import {VerifyController} from '@/modules/api/verify/verify.controller';
 import {SessionService} from '@/modules/rest/session/session.service';
+import {VerifyService} from '@/modules/api/verify/verify.service';
 
 @Module({
   imports: [DatabaseModule, EmailModule, HttpModule, IpModule],
   controllers: [VerifyController],
   providers: [
     SessionService,
+    VerifyService,
     PasswordService,
     RedisService,
   ],

From 457ef17647b2f98126eb52ab3f90796eae35b984 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 13 Apr 2022 22:04:38 +0300
Subject: [PATCH 051/221] Fix ws, added node version

---
 frontend/package.json                                  | 3 +++
 newback/package.json                                   | 3 +++
 newback/src/modules/api/websocket/websocket.gateway.ts | 3 ++-
 newback/src/modules/app/app.module.ts                  | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 50e1d58f7..a76560705 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -24,6 +24,9 @@
   "bugs": {
     "url": "https://github.com/akoidan/pychat/issues"
   },
+  "engines": {
+    "node": "14.17"
+  },
   "homepage": "https://github.com/akoidan/pychat#readme",
   "devDependencies": {
     "@babel/types": "^7.17.0",
diff --git a/newback/package.json b/newback/package.json
index 1f83b7868..946bd3ff6 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -12,6 +12,9 @@
     "test:html:coverage": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
     "test": "jest --runInBand --coverage --coverageReporters text"
   },
+  "engines": {
+    "node": ">=16.0.0"
+  },
   "dependencies": {
     "@nestjs-modules/mailer": "^1.6.1",
     "@nestjs/common": "^8.4.4",
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 8d304caf0..f01716398 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -8,12 +8,13 @@ import {
 import {Server} from 'ws';
 
 @WebSocketGateway({path: '/ws'})
-export class EventsGateway implements OnGatewayConnection {
+export class WebsocketGateway implements OnGatewayConnection {
   @WebSocketServer()
   server!: Server;
 
   async handleConnection(socket: WebSocket) {
     console.log('socket.OPEN', socket.OPEN);
+    socket.send(JSON.stringify({a: 3}))
   }
 
   @SubscribeMessage('events')
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 0013a0725..e66fb6367 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -7,6 +7,7 @@ import {RedisModule} from '@nestjs-modules/ioredis';
 import {config} from 'node-ts-config';
 import {ConfigModule} from '@/modules/rest/config/config.module';
 import {VerifyModule} from '@/modules/api/verify/verify.module';
+import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
 
 @Module({
   imports: [
@@ -14,6 +15,7 @@ import {VerifyModule} from '@/modules/api/verify/verify.module';
     LoggerModule,
     ConfigModule,
     VerifyModule,
+    WebsocketGateway,
     RedisModule.forRoot({
       config: {
         host: config.redis.host,

From 8bfea63b05898e7168d2153311e7c959fbd779fe Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 14 Apr 2022 01:04:05 +0300
Subject: [PATCH 052/221] Added ws

---
 newback/package.json                          |   5 +-
 newback/src/main.ts                           |   7 +-
 .../api/websocket/websocket.gateway.ts        |  86 +++++++++++++-
 .../src/modules/rest/ws.adapter/ws.adapter.ts | 105 ++++++++++++++++++
 newback/yarn.lock                             |  25 ++---
 5 files changed, 206 insertions(+), 22 deletions(-)
 create mode 100644 newback/src/modules/rest/ws.adapter/ws.adapter.ts

diff --git a/newback/package.json b/newback/package.json
index 946bd3ff6..9e3f12ffb 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -20,7 +20,6 @@
     "@nestjs/common": "^8.4.4",
     "@nestjs/core": "^8.4.4",
     "@nestjs/platform-express": "^8.4.4",
-    "@nestjs/platform-ws": "^8.4.4",
     "@nestjs/sequelize": "^8.0.0",
     "@nestjs/swagger": "^5.2.1",
     "@nestjs/websockets": "^8.4.4",
@@ -28,6 +27,7 @@
     "@types/node-fetch": "^2.6.1",
     "@types/nodemailer": "^6.4.4",
     "@types/supertest": "^2.0.12",
+    "@types/ws": "^8.5.3",
     "bcrypt": "^5.0.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -42,7 +42,8 @@
     "rxjs": "^7",
     "sequelize": "^6.18.0",
     "sequelize-typescript": "^2.1.3",
-    "swagger-ui-express": "^4.3.0"
+    "swagger-ui-express": "^4.3.0",
+    "ws": "^8.5.0"
   },
   "devDependencies": {
     "@nestjs-modules/ioredis": "^1.0.0",
diff --git a/newback/src/main.ts b/newback/src/main.ts
index c2f5e55f2..4aed9a0f4 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -8,7 +8,7 @@ import {
 } from '@nestjs/common';
 import {readFile} from 'fs';
 import {promisify} from 'util';
-import {WsAdapter} from '@nestjs/platform-ws';
+import {WsAdapter} from '@/modules/rest/ws.adapter/ws.adapter';
 
 async function bootstrap() {
   const key = await promisify(readFile)(config.application.keyPath, 'utf-8');
@@ -26,9 +26,10 @@ async function bootstrap() {
       cert
     }
   });
-  app.useWebSocketAdapter(new WsAdapter(app));
+  let logger = app.get(Logger);
+  app.useLogger(logger)
+  app.useWebSocketAdapter(new WsAdapter((app as any).getUnderlyingHttpServer(), logger));
   app.useGlobalPipes(new ValidationPipe());
-  app.useLogger(app.get(Logger))
   await app.listen(config.application.port);
 }
 
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index f01716398..6adca151e 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -7,17 +7,95 @@ import {
 } from '@nestjs/websockets';
 import {Server} from 'ws';
 
-@WebSocketGateway({path: '/ws'})
+@WebSocketGateway({
+  path: '/ws'
+})
 export class WebsocketGateway implements OnGatewayConnection {
   @WebSocketServer()
   server!: Server;
 
+  private sockets = [];
+
   async handleConnection(socket: WebSocket) {
-    console.log('socket.OPEN', socket.OPEN);
-    socket.send(JSON.stringify({a: 3}))
+    this.sockets.push(socket);
+    console.log(this.sockets);
+
+    // session_key = self.get_argument('sessionId', None)
+		// user_id = self.sync_redis.hget('sessions', session_key)
+		// if user_id is None:
+		// 	self.logger.warning('!! Session key %s has been rejected' % session_key)
+		// 	self.close(403, "Session key %s has been rejected" % session_key)
+		// 	return
+		// self.user_id = int(user_id)
+		// try:
+		// 	user_db = UserProfile.objects.get(id=self.user_id)
+		// except UserProfile.DoesNotExist:
+		// 	self.logger.warning('Database has been cleared, but redis %s not. Logging out current user' % session_key)
+		// 	self.close(403, "This user no more longer exists")
+		// 	return
+		// self.ip = self.get_client_ip()
+		// self.generate_self_id()
+		// self.save_ip()
+		// self.message_creator = WebRtcMessageCreator(self.user_id, self.id)
+		// self._logger = logging.LoggerAdapter(parent_logger, {
+		// 	'id': self.id,
+		// 	'ip': self.ip
+		// })
+		// self.logger.debug("!! Incoming connection, session %s, thread hash %s", session_key, self.id)
+		// self.async_redis.connect()
+		// self.async_redis_publisher.sadd(RedisPrefix.ONLINE_VAR, self.id)
+		// # since we add user to online first, latest trigger will always show correct online
+		//
+		// online = self.get_dict_users_from_redis()
+		// # current user is already online
+		// my_online = online.setdefault(self.user_id, [])
+		// if self.id not in my_online:
+		// 	my_online.append(self.id)
+		//
+		// user_rooms_query = Room.objects.filter(users__id=self.user_id, disabled=False) \
+		// 	.values('id', 'name', 'creator_id', 'is_main_in_channel', 'channel_id', 'p2p', 'roomusers__notifications', 'roomusers__volume')
+		// room_users = [{
+		// 	VarNames.ROOM_ID: room['id'],
+		// 	VarNames.ROOM_NAME: room['name'],
+		// 	VarNames.CHANNEL_ID: room['channel_id'],
+		// 	VarNames.ROOM_CREATOR_ID: room['creator_id'],
+		// 	VarNames.IS_MAIN_IN_CHANNEL: room['is_main_in_channel'],
+		// 	VarNames.NOTIFICATIONS: room['roomusers__notifications'],
+		// 	VarNames.P2P: room['p2p'],
+		// 	VarNames.VOLUME: room['roomusers__volume'],
+		// 	VarNames.ROOM_USERS: []
+		// } for room in user_rooms_query]
+		// user_rooms_dict = {room[VarNames.ROOM_ID]: room for room in room_users}
+		// channels_ids = [channel[VarNames.CHANNEL_ID] for channel in room_users if channel[VarNames.CHANNEL_ID]]
+		// channels_db = Channel.objects.filter(Q(id__in=channels_ids) | Q(creator=self.user_id), disabled=False)
+		// channels = [{
+		// 	VarNames.CHANNEL_ID: channel.id,
+		// 	VarNames.CHANNEL_NAME: channel.name,
+		// 	VarNames.CHANNEL_CREATOR_ID: channel.creator_id
+		// } for channel in channels_db]
+		// room_ids = [room_id[VarNames.ROOM_ID] for room_id in room_users]
+		// rooms_users = RoomUsers.objects.filter(room_id__in=room_ids).values('user_id', 'room_id')
+		// for ru in rooms_users:
+		// 	user_rooms_dict[ru['room_id']][VarNames.ROOM_USERS].append(ru['user_id'])
+		// # get all missed messages
+		// self.channels = room_ids  # py2 doesn't support clear()
+		// self.channels.append(self.channel)
+		// self.channels.append(self.id)
+		// self.listen(self.channels)
+		// # this was replaced to syncHistory method that's called from browser and passes existing ids
+		// # off_messages, history = self.get_offline_messages(room_users, was_online, self.get_argument('history', False))
+		// # for room in room_users:
+		// # 	room_id = room[VarNames.ROOM_ID]
+		// # 	h = history.get(room_id)
+		// # 	o = off_messages.get(room_id)
+		// # 	if h:
+		// # 		room[VarNames.LOAD_MESSAGES_HISTORY] = h
+		// # 	if o:
+		// # 		room[VarNames.LOAD_MESSAGES_OFFLINE] = o
+    //
   }
 
-  @SubscribeMessage('events')
+  @SubscribeMessage('hello') //ws.ws.send(JSON.stringify({action: 'hello'}))
   handleEvent(@MessageBody() data: string): any {
     const event = 'events';
     this.server.clients.forEach((client) => {
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
new file mode 100644
index 000000000..6b38340a5
--- /dev/null
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -0,0 +1,105 @@
+import {
+  INestApplicationContext,
+  Logger
+} from '@nestjs/common';
+import {
+  AbstractWsAdapter,
+  BaseWsInstance
+} from '@nestjs/websockets';
+import {
+  CLOSE_EVENT,
+  CONNECTION_EVENT,
+  ERROR_EVENT,
+  MESSAGE_METADATA,
+  DISCONNECT_EVENT
+} from '@nestjs/websockets/constants';
+import {MessageMappingProperties} from '@nestjs/websockets/gateway-metadata-explorer';
+import {Observable} from 'rxjs';
+import { isFunction } from '@nestjs/common/utils/shared.utils';
+import {
+  WebSocket,
+  WebSocketServer
+} from "ws";
+import {NestApplication} from '@nestjs/core';
+
+
+enum READY_STATE {
+  CONNECTING_STATE = 0,
+  OPEN_STATE = 1,
+  CLOSING_STATE = 2,
+  CLOSED_STATE = 3,
+}
+
+
+export class WsAdapter  {
+
+  private wsServer: WebSocketServer;
+
+  constructor(
+    private httpServer: any,
+    private readonly logger: Logger
+  ) {
+
+  }
+
+  public bindClientConnect(server: BaseWsInstance, callback: Function) {
+    server.on(CONNECTION_EVENT, callback);
+  }
+
+  public bindClientDisconnect(client: BaseWsInstance, callback: Function) {
+    client.on(DISCONNECT_EVENT, callback);
+  }
+
+  public async close(server: BaseWsInstance) {
+    const isCallable = server && isFunction(server.close);
+    isCallable && (await new Promise(resolve => server.close(resolve)));
+  }
+
+  public create(
+    port: number,
+    {path}: {path: string},
+  ) {
+    if (port !== 0 || !this.httpServer || !path) {
+      throw Error("Unsupported server configuration");
+    }
+    this.wsServer = new WebSocketServer({
+      noServer: true,
+      path,
+    });
+
+    this.httpServer.on('upgrade', (request, socket, head) => {
+      this.wsServer.handleUpgrade(request, socket, head, (ws: unknown) => {
+        this.wsServer.emit('connection', ws, request);
+      });
+    });
+
+    this.httpServer.on(CONNECTION_EVENT, (ws: any) =>
+      ws.on(ERROR_EVENT, (err: any) => this.logger.error(err)),
+    );
+    this.httpServer.on(ERROR_EVENT, (err: any) => this.logger.error(err));
+    return this.wsServer;
+  }
+
+  public bindMessageHandlers(
+    client: WebSocket,
+    handlers: MessageMappingProperties[],
+    transform: (data: any) => Observable<any>,
+  ) {
+    client.on(MESSAGE_METADATA, (data) => {
+      if (client.readyState !== READY_STATE.OPEN_STATE) {
+        throw Error('asd')
+      }
+      const parsed = JSON.parse(data as any);
+      if (!parsed.action) {
+        throw Error("invalid message")
+      }
+      handlers.find(handler => handler.message === parsed.action).callback(parsed);
+    });
+
+  }
+
+  public async dispose() {
+    await this.httpServer.close();
+  }
+
+}
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 65af2dcfa..a67adc6e2 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -676,14 +676,6 @@
     multer "1.4.4"
     tslib "2.3.1"
 
-"@nestjs/platform-ws@^8.4.4":
-  version "8.4.4"
-  resolved "https://registry.yarnpkg.com/@nestjs/platform-ws/-/platform-ws-8.4.4.tgz#ec158f2f2410a847385376173f28a80fe8bf5e96"
-  integrity sha512-fMrBlBiBkFX0I8Glm17B38bG0XUk0yOajzh2DNAtZG/q0Jn1WSsDDnvleHQaThffJ3PVmEdDcSPd+k2uQA/N7A==
-  dependencies:
-    tslib "2.3.1"
-    ws "7.5.6"
-
 "@nestjs/schematics@^8.0.10", "@nestjs/schematics@^8.0.3":
   version "8.0.10"
   resolved "https://registry.yarnpkg.com/@nestjs/schematics/-/schematics-8.0.10.tgz#4f951ea1ac94721ba6a6ccfae6461f8b22949573"
@@ -1076,6 +1068,13 @@
   resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.2.tgz#a2114225d9be743fb154b06c29b8257aaca42922"
   integrity sha512-KFcchQ3h0OPQgFirBRPZr5F/sVjxZsOrQHedj3zi8AH3Zv/hOLx2OLR4hxR5HcfoU+33n69ZuOfzthKVdMoTiw==
 
+"@types/ws@^8.5.3":
+  version "8.5.3"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d"
+  integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==
+  dependencies:
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
@@ -6935,16 +6934,16 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@7.5.6:
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
-  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
-
 ws@^7.4.6:
   version "7.5.7"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
+ws@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

From 1dce7e28ed88d2413580c97e52cf1b2ae36bb7b3 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 14 Apr 2022 18:22:32 +0300
Subject: [PATCH 053/221] Fixed model types

---
 .../migration-template/202204110326-init.sql  | 37 +++++++++----------
 newback/src/data/model/room.model.ts          |  5 +++
 newback/src/data/model/user.model.ts          | 12 +++++-
 newback/src/data/model/user.settings.model.ts |  6 +--
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/newback/config/migration-template/202204110326-init.sql b/newback/config/migration-template/202204110326-init.sql
index 38666e7b6..21ce04a1f 100644
--- a/newback/config/migration-template/202204110326-init.sql
+++ b/newback/config/migration-template/202204110326-init.sql
@@ -1,9 +1,8 @@
 -- set force = true in sequelize.config.js
-
 CREATE TABLE `user`
 (
     `id`               INTEGER auto_increment,
-    `last_time_online` DATETIME                         NOT NULL,
+    `last_time_online` BIGINT                           NOT NULL,
     `username`         VARCHAR(16)                      NOT NULL UNIQUE,
     `sex`              ENUM ('MALE', 'FEMALE', 'OTHER') NOT NULL DEFAULT 'OTHER',
     `thumbnail`        VARCHAR(100)                              DEFAULT NULL,
@@ -18,7 +17,7 @@ CREATE TABLE `channel`
 (
     `id`         INTEGER auto_increment,
     `name`       VARCHAR(16) NOT NULL,
-    `creator_id` INTEGER NOT NULL,
+    `creator_id` INTEGER     NOT NULL,
     `created_at` DATETIME    NOT NULL,
     `updated_at` DATETIME    NOT NULL,
     `deleted_at` DATETIME,
@@ -91,7 +90,7 @@ CREATE TABLE `ip_address`
 (
     `id`           INTEGER auto_increment,
     `ip`           VARCHAR(32) NOT NULL UNIQUE,
-    `status`       TINYINT(1) NOT NULL DEFAULT true,
+    `status`       TINYINT(1)  NOT NULL DEFAULT true,
     `isp`          VARCHAR(255),
     `country_code` VARCHAR(16),
     `country`      VARCHAR(64),
@@ -150,7 +149,7 @@ CREATE TABLE `room_user`
     `deleted_at`    DATETIME,
     UNIQUE `unique_room_user_room_id_user_id` (`room_id`, `user_id`),
     PRIMARY KEY (`id`),
-    FOREIGN KEY (`room_id`) REFERENCES `room` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE,
+    FOREIGN KEY (`room_id`) REFERENCES `room` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
     FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
@@ -206,13 +205,13 @@ CREATE TABLE `uploaded_file`
 CREATE TABLE `verification`
 (
     `id`         INTEGER auto_increment,
-    `type`       ENUM ('REGISTER', 'PASSWORD', 'EMAIL', 'CONFIRM_EMAIL') NOT NULL,
-    `token`      VARCHAR(32)                                             NOT NULL,
-    `user_id`    INTEGER                                                 NOT NULL,
-    `verified`   TINYINT(1)                                              NOT NULL DEFAULT false,
+    `type`       ENUM ('REGISTER', 'PASSWORD', 'EMAIL') NOT NULL,
+    `token`      VARCHAR(32)                            NOT NULL,
+    `user_id`    INTEGER                                NOT NULL,
+    `verified`   TINYINT(1)                             NOT NULL DEFAULT false,
     `email`      VARCHAR(190),
-    `created_at` DATETIME                                                NOT NULL,
-    `updated_at` DATETIME                                                NOT NULL,
+    `created_at` DATETIME                               NOT NULL,
+    `updated_at` DATETIME                               NOT NULL,
     `deleted_at` DATETIME,
     PRIMARY KEY (`id`),
     FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
@@ -258,13 +257,13 @@ CREATE TABLE `user_profile`
     `name`       VARCHAR(30),
     `city`       VARCHAR(50),
     `surname`    VARCHAR(30),
-    `birthday`   DATETIME NULL,
+    `birthday`   DATETIME,
     `contacts`   VARCHAR(100),
     `created_at` DATETIME NOT NULL,
     `updated_at` DATETIME NOT NULL,
     `deleted_at` DATETIME,
     PRIMARY KEY (`id`),
-    FOREIGN KEY (`id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+    FOREIGN KEY (`id`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE utf8mb4_general_ci;
@@ -272,27 +271,27 @@ CREATE TABLE `user_settings`
 (
     `id`                       INTEGER,
     `suggestions`              TINYINT(1)                                                                                          NOT NULL DEFAULT true,
-    `show_when_im_typing`      TINYINT(1)                                                                                          NOT NULL DEFAULT true,
+    `show_when_i_typing`       TINYINT(1)                                                                                          NOT NULL DEFAULT true,
     `embedded_youtube`         TINYINT(1)                                                                                          NOT NULL DEFAULT true,
     `highlight_code`           TINYINT(1)                                                                                          NOT NULL DEFAULT true,
     `message_sound`            TINYINT(1)                                                                                          NOT NULL DEFAULT false,
     `incoming_file_call_sound` TINYINT(1)                                                                                          NOT NULL DEFAULT false,
-    `online_change_messages`   TINYINT(1)                                                                                          NOT NULL DEFAULT false,
-    `devtools_logs`            ENUM ('log_raise_error', 'log_with_warnings', 'trace', 'debug', 'info', 'warn', 'error', 'disable') NOT NULL DEFAULT 'error',
+    `online_change_sound`      TINYINT(1)                                                                                          NOT NULL DEFAULT false,
+    `logs`                     ENUM ('log_raise_error', 'log_with_warnings', 'trace', 'debug', 'info', 'warn', 'error', 'disable') NOT NULL DEFAULT 'error',
     `theme`                    ENUM ('COLOR_LOR', 'COLOR_REG', 'COLOR_WHITE')                                                      NOT NULL DEFAULT 'COLOR_REG',
     `created_at`               DATETIME                                                                                            NOT NULL,
     `updated_at`               DATETIME                                                                                            NOT NULL,
     `deleted_at`               DATETIME,
     PRIMARY KEY (`id`),
-    FOREIGN KEY (`id`) REFERENCES `user` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
+    FOREIGN KEY (`id`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE utf8mb4_general_ci;
 
-INSERT INTO user (id, last_time_online, username, sex, thumbnail, created_at, updated_at, deleted_at) VALUES (1, '2022-04-13 13:37:37', '1', 'OTHER', null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO user (id, last_time_online, username, sex, thumbnail, created_at, updated_at, deleted_at) VALUES (1, 1649949638861, '1', 'OTHER', null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
 INSERT INTO channel (id, name, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, '2022-04-13 16:32:11', '2022-04-13 16:32:09', null);
 INSERT INTO room (id, name, is_main_in_channel, p2p, channel_id, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, DEFAULT, 1, 1, '2022-04-13 16:35:16', '2022-04-13 16:35:20', null);
 INSERT INTO user_profile (id, name, city, surname, birthday, contacts, created_at, updated_at, deleted_at) VALUES (1, null, null, null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
 INSERT INTO user_auth (id, password, email, facebook_id, google_id, email_verification_id, created_at, updated_at, deleted_at) VALUES (1, '$2b$10$8RTcHp1.oCEYGiPgLbTHH.Fk8MC6YUySzJ8AxGFxnjFqb.zsdlH7m', 'deathangel908@gmail.com', null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
-INSERT INTO user_settings (id, suggestions, show_when_im_typing, embedded_youtube, highlight_code, message_sound, incoming_file_call_sound, online_change_messages, devtools_logs, theme, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 'error', 'COLOR_REG', '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO user_settings (id, suggestions, show_when_i_typing, embedded_youtube, highlight_code, message_sound, incoming_file_call_sound, online_change_sound, logs, theme, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 'error', 'COLOR_REG', '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
 INSERT INTO room_user (id, room_id, user_id, volume, notifications, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 2, 0, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
diff --git a/newback/src/data/model/room.model.ts b/newback/src/data/model/room.model.ts
index b4eac51ff..efc772161 100644
--- a/newback/src/data/model/room.model.ts
+++ b/newback/src/data/model/room.model.ts
@@ -3,12 +3,14 @@ import {
   Column,
   DataType,
   ForeignKey,
+  HasMany,
   Model,
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/model/user.model';
 import {ChannelModel} from '@/data/model/channel.model';
+import {RoomUsersModel} from '@/data/model/room.users.model';
 
 
 // 	constraint admin_should_not_be_define_for_private_rooms
@@ -60,6 +62,9 @@ export class RoomModel extends Model<RoomModel> {
   @BelongsTo(() => ChannelModel)
   public channel: ChannelModel;
 
+  @HasMany(() => RoomUsersModel)
+  public roomUsers: RoomUsersModel[];
+
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index 061f9d85d..3c769c723 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -9,6 +9,8 @@ import {Injectable} from '@nestjs/common';
 import {Gender} from '@/data/types/frontend';
 import {UserAuthModel} from '@/data/model/user.auth.model';
 import {MAX_USERNAME_LENGTH} from '@/utils/consts';
+import {UserProfileModel} from '@/data/model/user.profile.model';
+import {UserSettingsModel} from '@/data/model/user.settings.model';
 
 
 @Injectable()
@@ -22,10 +24,10 @@ export class UserModel extends Model<UserModel> {
   public id: number;
 
   @Column({
-    type: DataType.DATE,
+    type: DataType.BIGINT,
     allowNull: false,
   })
-  public lastTimeOnline: Date;
+  public lastTimeOnline: number;
 
   @Column({
     allowNull: false,
@@ -37,6 +39,12 @@ export class UserModel extends Model<UserModel> {
   @HasOne(() => UserAuthModel, 'id')
   public userAuth: UserAuthModel;
 
+  @HasOne(() => UserProfileModel, 'id')
+  public userProfile: UserProfileModel;
+
+  @HasOne(() => UserSettingsModel, 'id')
+  public userSettings: UserSettingsModel;
+
   @Column({
     type: DataType.ENUM(...Object.keys(Gender)),
     allowNull: false,
diff --git a/newback/src/data/model/user.settings.model.ts b/newback/src/data/model/user.settings.model.ts
index 101c551a9..994a13e16 100644
--- a/newback/src/data/model/user.settings.model.ts
+++ b/newback/src/data/model/user.settings.model.ts
@@ -40,7 +40,7 @@ export class UserSettingsModel extends Model<UserSettingsModel> {
     allowNull: false,
     defaultValue: true,
   })
-  public showWhenImTyping: boolean;
+  public showWhenITyping: boolean;
 
   @Column({
     type: DataType.BOOLEAN,
@@ -75,14 +75,14 @@ export class UserSettingsModel extends Model<UserSettingsModel> {
     allowNull: false,
     defaultValue: false,
   })
-  public onlineChangeMessages: boolean;
+  public onlineChangeSound: boolean;
 
   @Column({
     type: DataType.ENUM(...Object.keys(logLevels)),
     allowNull: false,
     defaultValue: 'error',
   })
-  public devtoolsLogs: LogLevel;
+  public logs: LogLevel;
 
   @Column({
     type: DataType.ENUM(...Object.keys(Theme)),

From f6f6cf880abdc8ae30e756314d072590c9af60c4 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 14 Apr 2022 19:02:01 +0300
Subject: [PATCH 054/221] ttsc ttypescript tsruntime movea all fe types to
 common file for future refactoring

---
 common/dto.ts                                 | 479 ++++++++++++++++++
 .../src/ts/classes/NotificationHandler.ts     |   2 +-
 frontend/src/ts/classes/Subscription.ts       |   2 +-
 frontend/src/ts/instances/routerInstance.ts   |   2 +-
 .../AbstractMessageProcessor.ts               |   8 +-
 frontend/src/ts/message_handlers/Api.ts       |   2 +-
 .../src/ts/message_handlers/MesageHandler.ts  |   2 +-
 .../src/ts/message_handlers/RomHandler.ts     |   4 +-
 frontend/src/ts/message_handlers/WsHandler.ts |  10 +-
 .../ts/message_handlers/WsMessageHandler.ts   |   4 +-
 .../ts/message_handlers/WsMessageProcessor.ts |   4 +-
 frontend/src/ts/types/dto.ts                  |  85 +---
 .../types/messages/baseMessagesInterfaces.ts  | 120 -----
 .../src/ts/types/messages/innerMessages.ts    |   2 +-
 frontend/src/ts/types/messages/p2pMessages.ts |   2 +-
 .../src/ts/types/messages/wsInMessages.ts     | 229 ---------
 .../src/ts/types/messages/wsOutMessages.ts    |  17 -
 frontend/src/ts/types/model.ts                |   7 -
 .../src/ts/webrtc/AbstractPeerConnection.ts   |   4 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           |   4 +-
 frontend/src/ts/webrtc/call/CallHandler.ts    |   4 +-
 .../src/ts/webrtc/call/CallPeerConnection.ts  |   4 +-
 frontend/src/ts/webrtc/file/FileHandler.ts    |   4 +-
 .../file/FileReceiveerPeerConnection.ts       |   4 +-
 .../webrtc/file/FileSenderPeerConnection.ts   |   4 +-
 .../webrtc/message/MessagePeerConnection.ts   |   2 +-
 .../webrtc/message/MessageTransferHandler.ts  |   2 +-
 frontend/src/vue/chat/chatbox/ChatBox.vue     |   2 +-
 frontend/src/vue/pages/UserProfileInfo.vue    |   2 +-
 .../src/vue/pages/UserProfileSettings.vue     |   2 +-
 frontend/yarn.lock                            |  89 +++-
 newback/config/env/test.json                  |   2 +-
 newback/jest.config.ts                        |   8 +-
 newback/package.json                          |  11 +-
 newback/src/data/types/internal.ts            |   4 +
 .../src/modules/api/auth/auth.module.spec.ts  |   3 +-
 newback/src/modules/api/auth/auth.service.ts  |   2 +-
 .../modules/api/verify/verify.module.spec.ts  |   3 +-
 .../websocket/websocket.gateway.e2e.spec.ts   |  99 ++++
 .../api/websocket/websocket.gateway.ts        | 156 +++---
 .../modules/api/websocket/ws.transformer.ts   |  92 ++++
 newback/src/modules/app/app.module.ts         |  16 +-
 .../src/modules/rest/config/config.service.ts |   6 +-
 .../rest/database/repository/ip.repository.ts |   9 +-
 .../database/repository/room.repository.ts    |  53 +-
 .../database/repository/user.repository.ts    |  36 +-
 .../repository/verification.repository.ts     |   1 +
 .../src/modules/rest/email/email.module.ts    |  13 +-
 .../modules/rest/email/email.service.spec.ts  |   4 +-
 .../src/modules/rest/email/email.service.ts   |   4 +-
 .../src/modules/rest/ip/ip.cache.service.ts   |   8 +
 .../modules/rest/ip/ip.service.e2e.spec.ts    |   4 +-
 .../modules/rest/password/password.service.ts |  14 +
 .../src/modules/rest/redis/redis.service.ts   |  41 +-
 .../modules/rest/session/session.service.ts   |  23 +-
 .../src/modules/rest/ws.adapter/ws.adapter.ts |  51 +-
 newback/src/utils/consts.ts                   |   6 +-
 newback/src/utils/decorators.ts               |  21 +
 newback/src/utils/helpers.ts                  |   5 +
 newback/tsconfig.json                         |   7 +
 newback/yarn.lock                             |  65 ++-
 61 files changed, 1226 insertions(+), 649 deletions(-)
 delete mode 100644 frontend/src/ts/types/messages/baseMessagesInterfaces.ts
 delete mode 100644 frontend/src/ts/types/messages/wsInMessages.ts
 delete mode 100644 frontend/src/ts/types/messages/wsOutMessages.ts
 create mode 100644 newback/src/data/types/internal.ts
 create mode 100644 newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
 create mode 100644 newback/src/modules/api/websocket/ws.transformer.ts
 create mode 100644 newback/src/utils/decorators.ts

diff --git a/common/dto.ts b/common/dto.ts
index bcfe33c42..ed5a2893c 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -1,3 +1,4 @@
+
 export interface SignInRequest extends CaptchaRequest {
   username?: string;
   password: string;
@@ -146,3 +147,481 @@ export enum UploadedFileChoices {
   PREVIEW = 'PREVIEW',
   ISSUE = 'ISSUE'
 }
+
+
+
+
+/** BasemessagesInterfaces.ts */
+
+
+export interface ChangeUserOnlineBase {
+  content: Record<number, string[]>;
+  userId: number;
+  lastTimeOnline: number;
+  time: number;
+}
+
+/*
+ * Any means that every every registered subscriber will be called with this handler if it exists
+ * this means, that handler that registered this event will be called
+ * void means that no handlers should process this signal
+ */
+export type HandlerName =
+  "*"
+  | "call"
+  | "notifier"
+  | "peerConnection:*"
+  | "room"
+  | "router"
+  | "void"
+  | "webrtc-message"
+  | "webrtc"
+  | "webrtcTransfer:*"
+  | "ws-message"
+  | "ws";
+export type CallHandlerName =
+  HandlerName
+  | "dummyCall";
+
+export type HandlerType<A extends string, H extends HandlerName> = (a: DefaultInMessage<A, H | "*">) => Promise<void> | void;
+
+export type HandlerTypes<K extends string, H extends HandlerName> = {
+  [Key in K]?: HandlerType<Key, H>
+};
+
+export interface AcceptFileContent {
+  received: number;
+}
+
+export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
+  content: BrowserBase;
+  userId: number;
+}
+
+export interface NewRoom {
+  inviterUserId: number;
+  time: number;
+}
+
+export interface RoomExistedBefore {
+  inviteeUserId: number[];
+}
+
+export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
+}
+
+export interface OpponentWsId {
+  opponentWsId: string;
+}
+
+export interface WebRtcDefaultMessage {
+  connId: string;
+}
+
+export interface OfferFileContent extends BrowserBase {
+  size: number;
+  name: string;
+}
+
+export type ChangeDeviceType =
+  "i_deleted"
+  | "invited"
+  | "room_created"
+  | "someone_joined"
+  | "someone_left";
+export type ChangeOnlineType =
+  "appear_online"
+  | "gone_offline";
+
+export interface BrowserBase {
+  browser: string;
+}
+
+export interface CallBackMessage {
+  // Request to send response with this callback id
+  cbId?: number;
+}
+
+export interface DefaultMessage<A extends string> {
+  action: A;
+}
+
+export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
+  handler: H;
+}
+
+export interface ResolveCallbackId {
+  resolveCbId?: number; // If this callback id is present, resolve it
+}
+
+export interface IMessageHandler {
+  handle(message: DefaultInMessage<string, HandlerName>): void;
+
+  getHandler<H extends HandlerName, A extends string>(message: DefaultInMessage<A, H>): HandlerType<A, H> | undefined;
+}
+
+export type CallStatus =
+  "accepted"
+  | "not_inited"
+  | "received_offer"
+  | "sent_offer";
+
+
+
+/** wsInMessages.ts */
+/**
+ * This file should only contain structures created by server. Only BE -> FE by websockets
+ * and processed by MessageHandler
+ */
+
+// import type {
+//   ChannelDto,
+//   LocationDto,
+//   MessageModelDto,
+//   RoomDto,
+//   RoomNoUsersDto,
+//   UserDto,
+//   UserProfileDto,
+//   UserProfileDtoWoImage,
+//   UserSettingsDto,
+// } from "@/ts/types/dto";
+//
+// import type {
+//   AcceptFileContent,
+//   AddRoomBase,
+//   BrowserBase,
+//   CallBackMessage,
+//   ChangeUserOnlineBase,
+//   DefaultInMessage,
+//   HandlerName,
+//   NewRoom,
+//   OfferFileContent,
+//   OpponentWsId,
+//   ReplyWebRtc,
+//   RoomExistedBefore,
+//   WebRtcDefaultMessage,
+// } from "@/ts/types/backend";
+// import type {MessageStatus} from "@/ts/types/model";
+
+export interface DefaultWsInMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H>, CallBackMessage {
+  cbBySender?: string;
+  cbId?: number;
+}
+
+export interface MessagesResponseMessage {
+  content: MessageModelDto[];
+}
+
+export interface SyncHistoryResponseMessage extends MessagesResponseMessage {
+  readMessageIds: number[];
+  receivedMessageIds: number[];
+}
+
+export interface DeleteMessage extends DefaultWsInMessage<"deleteMessage", "ws-message"> {
+  roomId: number;
+  id: number;
+  edited: number;
+}
+
+export interface SetMessageStatusMessage extends DefaultWsInMessage<"setMessageStatus", "ws-message"> {
+  roomId: number;
+  status: MessageStatus;
+  messagesIds: number[];
+}
+
+export interface EditMessage extends DefaultWsInMessage<"editMessage", "ws-message">, MessageModelDto {
+}
+
+export interface PrintMessage extends DefaultWsInMessage<"printMessage", "ws-message">, MessageModelDto {
+}
+
+export interface AddOnlineUserMessage extends DefaultWsInMessage<"addOnlineUser", "room">, ChangeUserOnlineBase {
+  opponentWsId: string;
+}
+
+export interface CreateNewUsedMessage extends DefaultWsInMessage<"createNewUser", "room">, UserDto {
+  rooms: {
+    roomId: number;
+    users: number[];
+  }[];
+}
+
+export interface RemoveOnlineUserMessage extends DefaultWsInMessage<"removeOnlineUser", "room">, ChangeUserOnlineBase {
+}
+
+export interface DeleteRoomMessage extends DefaultWsInMessage<"deleteRoom", "room"> {
+  roomId: number;
+}
+
+export interface GetCountryCodeMessage extends DefaultInMessage<"getCountryCode", "void"> {
+  content: Record<string, LocationDto>;
+}
+
+export interface LeaveUserMessage extends DefaultWsInMessage<"leaveUser", "room"> {
+  roomId: number;
+  userId: number;
+  users: number[];
+}
+
+export interface AddChannelMessage extends DefaultWsInMessage<"addChannel", "room">, ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
+  channelUsers: number[];
+}
+
+export interface InviteUserMessage extends NewRoom, RoomExistedBefore, DefaultWsInMessage<"inviteUser", "room"> {
+  roomId: number;
+  users: number[];
+}
+
+export interface AddInviteMessage extends AddRoomBase, RoomExistedBefore, DefaultWsInMessage<"addInvite", "room"> {
+}
+
+export interface SaveChannelSettingsMessage extends DefaultWsInMessage<"saveChannelSettings", "room">, ChannelDto {
+  notifications: boolean;
+  volume: number;
+  p2p: boolean;
+  userId: number;
+}
+
+export interface DeleteChannelMessage extends DefaultWsInMessage<"deleteChannel", "room"> {
+  channelId: number;
+  roomIds: number[];
+}
+
+export interface SaveRoomSettingsMessage extends DefaultWsInMessage<"saveRoomSettings", "room">, RoomNoUsersDto {
+}
+
+export interface ShowITypeMessage extends DefaultWsInMessage<"showIType", "room"> {
+  roomId: number;
+  userId: number;
+}
+
+export interface SetWsIdMessage extends DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
+  rooms: RoomDto[];
+  channels: ChannelDto[];
+  users: UserDto[];
+  online: Record<number, string[]>;
+  time: number;
+  profile: UserProfileDto;
+  settings: UserSettingsDto;
+}
+
+export interface WebRtcSetConnectionIdMessage extends WebRtcDefaultMessage, DefaultWsInMessage<"setConnectionId", "void"> {
+  time: number;
+}
+
+export interface AddRoomMessage extends AddRoomBase, DefaultWsInMessage<"addRoom", "room"> {
+  channelUsers: number[];
+  channelId: number;
+}
+
+export interface OfferFile extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerFile", "webrtc"> {
+  content: OfferFileContent;
+  roomId: number;
+  threadId: number | null;
+  userId: number;
+  time: number;
+}
+
+export interface OfferCall extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerCall", "webrtc"> {
+  content: BrowserBase;
+  roomId: number;
+  userId: number;
+  time: number;
+}
+
+export interface ReplyCallMessage extends ReplyWebRtc, DefaultWsInMessage<"replyCall", "webrtcTransfer:*"> {
+
+}
+
+export interface NotifyCallActiveMessage extends DefaultWsInMessage<"notifyCallActive", "webrtc">, WebRtcDefaultMessage, OpponentWsId {
+  roomId: number;
+  userId: number;
+}
+
+export interface DestroyCallConnection extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"destroyCallConnection", "peerConnection:*"> {
+  content: string;
+}
+
+export interface OfferMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerMessage", "webrtc"> {
+  content: BrowserBase;
+  roomId: number;
+  userId: number;
+  time: number;
+}
+
+export interface SetSettingsMessage extends DefaultWsInMessage<"setSettings", "ws"> {
+  content: UserSettingsDto;
+}
+
+export interface SetUserProfileMessage extends DefaultWsInMessage<"setUserProfile", "ws"> {
+  content: UserProfileDtoWoImage;
+}
+
+export interface UserProfileChangedMessage extends DefaultWsInMessage<"userProfileChanged", "ws">, UserDto {
+
+}
+
+export interface GrowlMessage {
+  content: string;
+  action: "growlError";
+}
+
+export interface PingMessage extends DefaultWsInMessage<"ping", "ws"> {
+  time: string;
+}
+
+export interface PongMessage extends DefaultWsInMessage<"pong", "ws"> {
+  time: string;
+}
+
+export interface ReplyFileMessage extends ReplyWebRtc, DefaultWsInMessage<"replyFile", "webrtcTransfer:*"> {
+
+}
+
+export interface SetProfileImageMessage extends DefaultWsInMessage<"setProfileImage", "ws"> {
+  content: string;
+}
+
+export interface AcceptCallMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"acceptCall", "webrtcTransfer:*"> {
+}
+
+export interface AcceptFileMessage extends DefaultWsInMessage<"acceptFile", "peerConnection:*"> {
+  content: AcceptFileContent;
+}
+
+export interface SendRtcDataMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"sendRtcData", "peerConnection:*"> {
+  content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
+}
+
+export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*">;
+
+export interface DestroyFileConnectionMessage extends DefaultWsInMessage<"destroyFileConnection", "peerConnection:*"> {
+  content: "decline" | "success";
+}
+
+/** wsOutMEssages */
+/**
+ * This file only contains messages that sent to backend api. FE -> BE by websockets
+ */
+
+// import type {DefaultMessage} from "@/ts/types/backend";
+
+export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {
+  cbId?: number;
+}
+
+export interface SyncHistoryOutMessage extends DefaultWsOutMessage<"syncHistory"> {
+  roomIds: number[];
+  messagesIds: number[];
+  onServerMessageIds: number[];
+  receivedMessageIds: number[];
+  lastSynced: number;
+}
+
+
+
+/// IMPORTED FROM OTHERS
+
+
+export interface MessageModelDto {
+  id: number;
+  time: number;
+  parentMessage: number;
+  files?: Record<number, FileModelDto>;
+  tags: Record<number, number>;
+  content: string;
+  status: MessageStatus;
+  symbol?: string;
+  deleted?: boolean;
+  threadMessagesCount: number;
+  edited: number;
+  roomId: number;
+  userId: number;
+}
+
+
+export interface UserDto {
+  username: string;
+  id: number;
+  thumbnail: string;
+  lastTimeOnline: number;
+  sex: Gender;
+}
+
+
+export interface UserProfileDtoWoImage {
+  username: string;
+  name: string;
+  city: string;
+  surname: string;
+  email: string;
+  birthday: Date;
+  contacts: string;
+  sex: Gender;
+  id: number;
+}
+
+export declare type LogLevel = 'log_raise_error' | 'log_with_warnings' | 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'disable';
+
+export interface UserSettingsDto {
+  embeddedYoutube: boolean;
+  highlightCode: boolean;
+  incomingFileCallSound: boolean;
+  messageSound: boolean;
+  onlineChangeSound: boolean;
+  showWhenITyping: boolean;
+  suggestions: boolean;
+  logs: LogLevel;
+  theme: string;
+}
+
+
+export interface RoomNoUsersDto {
+  channelId: number | null;
+  notifications: boolean;
+  p2p: boolean;
+  volume: number;
+  isMainInChannel: boolean;
+  id: number;
+  name: string;
+  creatorId: number;
+}
+
+export interface UserProfileDto extends UserProfileDtoWoImage {
+  thumbnail: string;
+}
+
+
+export interface LocationDto {
+  city: string;
+  country: string;
+  countryCode: string;
+  region: string;
+}
+
+
+export interface ChannelDto {
+  name: string;
+  id: number;
+  creatorId: number;
+}
+
+export interface RoomDto extends RoomNoUsersDto {
+  users: number[];
+}
+
+
+export interface FileModelDto {
+  url: string;
+  id: number;
+  type: BlobType;
+  preview: string;
+}
+
+export type BlobType =
+  "a"
+  | "f"
+  | "g"
+  | "i"
+  | "m"
+  | "v";
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index a20f952bf..bf923851a 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -13,7 +13,7 @@ import {
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {MainWindow} from "@/ts/classes/MainWindow";
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index 70cde41b2..89195ab58 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -4,7 +4,7 @@ import type {
   DefaultInMessage,
   HandlerName,
   IMessageHandler,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/innerMessages";
 
 export default class Subscription {
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index c4cc6aa7b..1b69433ed 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -33,7 +33,7 @@ import loggerFactory from "@/ts/instances/loggerFactory";
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {
   LoginMessage,
   LogoutMessage,
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 52d5e22ff..d35783f1c 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -2,12 +2,14 @@ import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {DefaultWsOutMessage} from "@/ts/types/messages/wsOutMessages";
-import type {DefaultWsInMessage} from "@/ts/types/messages/wsInMessages";
+import type {
+  DefaultWsInMessage,
+  DefaultWsOutMessage
+} from "@/ts/types/backend";
 import type {
   DefaultMessage,
   HandlerName,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 
 export default class AbstractMessageProcessor {
   protected readonly callBacks: Record<number, {resolve: Function; reject: Function}> = {};
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 0046d4d1b..66196aec5 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -19,7 +19,7 @@ import type Http from "@/ts/classes/Http";
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index f78b69018..c9f2186ba 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -5,7 +5,7 @@ import type {
   HandlerType,
   HandlerTypes,
   IMessageHandler,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 
 
 export default abstract class MessageHandler implements IMessageHandler {
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index afc53aa98..a1fa8f6d7 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -8,7 +8,7 @@ import type {
   ChangeDeviceType,
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {
   ChangeP2pRoomInfoMessage,
   ChangeUserOnlineInfoMessage,
@@ -50,7 +50,7 @@ import type {
   SaveChannelSettingsMessage,
   SaveRoomSettingsMessage,
   ShowITypeMessage,
-} from "@/ts/types/messages/wsInMessages";
+} from "@/ts/types/backend";
 import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import type {Logger} from "lines-logger";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 3da17c019..97e8757ed 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -39,6 +39,7 @@ import type {
   AddChannelMessage,
   AddInviteMessage,
   AddRoomMessage,
+  DefaultWsOutMessage,
   GetCountryCodeMessage,
   MessagesResponseMessage,
   PingMessage,
@@ -49,10 +50,11 @@ import type {
   SetSettingsMessage,
   SetUserProfileMessage,
   SetWsIdMessage,
+  SyncHistoryOutMessage,
   SyncHistoryResponseMessage,
   UserProfileChangedMessage,
   WebRtcSetConnectionIdMessage,
-} from "@/ts/types/messages/wsInMessages";
+} from "@/ts/types/backend";
 import type {
   InternetAppearMessage,
   LogoutMessage,
@@ -61,11 +63,7 @@ import type {
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
-import type {
-  DefaultWsOutMessage,
-  SyncHistoryOutMessage,
-} from "@/ts/types/messages/wsOutMessages";
+} from "@/ts/types/backend";
 import type Subscription from "@/ts/classes/Subscription";
 
 enum WsState {
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 1e14f7b9c..5fe47506a 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -31,7 +31,7 @@ import type {
   HandlerName,
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {
   DeleteMessage,
   EditMessage,
@@ -39,7 +39,7 @@ import type {
   PrintMessage,
   SetMessageStatusMessage,
   SyncHistoryResponseMessage,
-} from "@/ts/types/messages/wsInMessages";
+} from "@/ts/types/backend";
 import {savedFiles} from "@/ts/utils/htmlApi";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import {
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index e1614240e..9e0b5cb38 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -2,8 +2,8 @@ import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProce
 import type {
   DefaultWsInMessage,
   GrowlMessage,
-} from "@/ts/types/messages/wsInMessages";
-import type {HandlerName} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
+import type {HandlerName} from "@/ts/types/backend";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index e2b6a04ac..2eec78e3a 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -13,20 +13,11 @@ export * from '@/ts/types/backend';
 import type {LogLevel} from "lines-logger";
 import {Gender} from '@/ts/types/backend';
 
-export interface RoomNoUsersDto {
-  channelId: number | null;
-  notifications: boolean;
-  p2p: boolean;
-  volume: number;
-  isMainInChannel: boolean;
-  roomId: number;
-  name: string;
-  roomCreatorId: number;
-}
 
-export interface RoomDto extends RoomNoUsersDto {
-  users: number[];
-}
+
+
+
+
 
 export interface ViewUserProfileDto extends UserProfileDto {
   image: string;
@@ -34,39 +25,7 @@ export interface ViewUserProfileDto extends UserProfileDto {
 
 export type SaveFileResponse = Record<string, {fileId: number; previewFileId?: number}>;
 
-export interface ChannelDto {
-  channelName: string;
-  channelId: number;
-  channelCreatorId: number;
-}
-
-export interface UserDto {
-  user: string;
-  userId: number;
-  userImage: string;
-  lastTimeOnline: number;
-  sex: Gender;
-}
-
-export interface LocationDto {
-  city: string;
-  country: string;
-  countryCode: string;
-  region: string;
-}
 
-export interface UserSettingsDto {
-  embeddedYoutube: boolean;
-  highlightCode: boolean;
-  incomingFileCallSound: boolean;
-  messageSound: boolean;
-  onlineChangeSound: boolean;
-  sendLogs: boolean;
-  showWhenITyping: boolean;
-  suggestions: boolean;
-  logs: LogLevel;
-  theme: string;
-}
 
 export interface SetStateFromWS {
   roomsDict: RoomDictModel;
@@ -82,21 +41,7 @@ export interface SetStateFromStorage {
   allUsersDict: Record<number, UserModel>;
 }
 
-export interface UserProfileDtoWoImage {
-  user: string;
-  name: string;
-  city: string;
-  surname: string;
-  email: string;
-  birthday: string;
-  contacts: string;
-  sex: Gender;
-  userId: number;
-}
 
-export interface UserProfileDto extends UserProfileDtoWoImage {
-  userImage: string;
-}
 
 export interface GiphyDto {
   webp: string;
@@ -109,28 +54,6 @@ export interface OauthStatus {
   facebook: boolean;
 }
 
-export interface FileModelDto {
-  url: string;
-  id: number;
-  type: BlobType;
-  preview: string;
-}
-
-export interface MessageModelDto {
-  id: number;
-  time: number;
-  parentMessage: number;
-  files?: Record<number, FileModelDto>;
-  tags: Record<number, number>;
-  content: string;
-  status: MessageStatus;
-  symbol?: string;
-  deleted?: boolean;
-  threadMessagesCount: number;
-  edited: number;
-  roomId: number;
-  userId: number;
-}
 
 export interface WebRtcMessageModelDto extends Omit<MessageModelDto, "roomId" | "time" | "userId"> {
   timeDiff: number;
diff --git a/frontend/src/ts/types/messages/baseMessagesInterfaces.ts b/frontend/src/ts/types/messages/baseMessagesInterfaces.ts
deleted file mode 100644
index 05eab9623..000000000
--- a/frontend/src/ts/types/messages/baseMessagesInterfaces.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * This file should only contain interfaces that is used in this package (messages) by other interfaces
- */
-import type {
-  ChannelDto,
-  RoomDto,
-} from "@/ts/types/dto";
-
-
-export interface ChangeUserOnlineBase {
-  content: Record<number, string[]>;
-  userId: number;
-  lastTimeOnline: number;
-  time: number;
-}
-
-/*
- * Any means that every every registered subscriber will be called with this handler if it exists
- * this means, that handler that registered this event will be called
- * void means that no handlers should process this signal
- */
-export type HandlerName =
-  "*"
-  | "call"
-  | "notifier"
-  | "peerConnection:*"
-  | "room"
-  | "router"
-  | "void"
-  | "webrtc-message"
-  | "webrtc"
-  | "webrtcTransfer:*"
-  | "ws-message"
-  | "ws";
-export type CallHandlerName =
-  HandlerName
-  | "dummyCall";
-
-export type HandlerType<A extends string, H extends HandlerName> = (a: DefaultInMessage<A, H | "*">) => Promise<void> | void;
-
-export type HandlerTypes<K extends string, H extends HandlerName> = {
-  [Key in K]?: HandlerType<Key, H>
-};
-
-export interface AcceptFileContent {
-  received: number;
-}
-
-export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
-  content: BrowserBase;
-  userId: number;
-}
-
-export interface NewRoom {
-  inviterUserId: number;
-  time: number;
-}
-
-export interface RoomExistedBefore {
-  inviteeUserId: number[];
-}
-
-export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
-}
-
-export interface OpponentWsId {
-  opponentWsId: string;
-}
-
-export interface WebRtcDefaultMessage {
-  connId: string;
-}
-
-export interface OfferFileContent extends BrowserBase {
-  size: number;
-  name: string;
-}
-
-export type ChangeDeviceType =
-  "i_deleted"
-  | "invited"
-  | "room_created"
-  | "someone_joined"
-  | "someone_left";
-export type ChangeOnlineType =
-  "appear_online"
-  | "gone_offline";
-
-export interface BrowserBase {
-  browser: string;
-}
-
-export interface CallBackMessage {
-  // Request to send response with this callback id
-  cbId?: number;
-}
-
-export interface DefaultMessage<A extends string> {
-  action: A;
-}
-
-export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
-  handler: H;
-}
-
-export interface ResolveCallbackId {
-  resolveCbId?: number; // If this callback id is present, resolve it
-}
-
-export interface IMessageHandler {
-  handle(message: DefaultInMessage<string, HandlerName>): void;
-
-  getHandler<H extends HandlerName, A extends string>(message: DefaultInMessage<A, H>): HandlerType<A, H> | undefined;
-}
-
-export type CallStatus =
-  "accepted"
-  | "not_inited"
-  | "received_offer"
-  | "sent_offer";
diff --git a/frontend/src/ts/types/messages/innerMessages.ts b/frontend/src/ts/types/messages/innerMessages.ts
index 451793c1e..0a4917d67 100644
--- a/frontend/src/ts/types/messages/innerMessages.ts
+++ b/frontend/src/ts/types/messages/innerMessages.ts
@@ -13,7 +13,7 @@ import type {
   ChangeOnlineType,
   DefaultInMessage,
   HandlerName,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {MessageStatus} from "@/ts/types/model";
 
 
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index a13884a32..5d98d468a 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -7,7 +7,7 @@ import type {
   CallBackMessage,
   DefaultMessage,
   ResolveCallbackId,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {
   MessageP2pDto,
   MessagesInfo,
diff --git a/frontend/src/ts/types/messages/wsInMessages.ts b/frontend/src/ts/types/messages/wsInMessages.ts
deleted file mode 100644
index 4df25f61e..000000000
--- a/frontend/src/ts/types/messages/wsInMessages.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * This file should only contain structures created by server. Only BE -> FE by websockets
- * and processed by MessageHandler
- */
-
-import type {
-  ChannelDto,
-  LocationDto,
-  MessageModelDto,
-  RoomDto,
-  RoomNoUsersDto,
-  UserDto,
-  UserProfileDto,
-  UserProfileDtoWoImage,
-  UserSettingsDto,
-} from "@/ts/types/dto";
-
-import type {
-  AcceptFileContent,
-  AddRoomBase,
-  BrowserBase,
-  CallBackMessage,
-  ChangeUserOnlineBase,
-  DefaultInMessage,
-  HandlerName,
-  NewRoom,
-  OfferFileContent,
-  OpponentWsId,
-  ReplyWebRtc,
-  RoomExistedBefore,
-  WebRtcDefaultMessage,
-} from "@/ts/types/messages/baseMessagesInterfaces";
-import type {MessageStatus} from "@/ts/types/model";
-
-export interface DefaultWsInMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H>, CallBackMessage {
-  cbBySender?: string;
-  cbId?: number;
-}
-
-export interface MessagesResponseMessage {
-  content: MessageModelDto[];
-}
-
-export interface SyncHistoryResponseMessage extends MessagesResponseMessage {
-  readMessageIds: number[];
-  receivedMessageIds: number[];
-}
-
-export interface DeleteMessage extends DefaultWsInMessage<"deleteMessage", "ws-message"> {
-  roomId: number;
-  id: number;
-  edited: number;
-}
-
-export interface SetMessageStatusMessage extends DefaultWsInMessage<"setMessageStatus", "ws-message"> {
-  roomId: number;
-  status: MessageStatus;
-  messagesIds: number[];
-}
-
-export interface EditMessage extends DefaultWsInMessage<"editMessage", "ws-message">, MessageModelDto {
-}
-
-export interface PrintMessage extends DefaultWsInMessage<"printMessage", "ws-message">, MessageModelDto {
-}
-
-export interface AddOnlineUserMessage extends DefaultWsInMessage<"addOnlineUser", "room">, ChangeUserOnlineBase {
-  opponentWsId: string;
-}
-
-export interface CreateNewUsedMessage extends DefaultWsInMessage<"createNewUser", "room">, UserDto {
-  rooms: {
-    roomId: number;
-    users: number[];
-  }[];
-}
-
-export interface RemoveOnlineUserMessage extends DefaultWsInMessage<"removeOnlineUser", "room">, ChangeUserOnlineBase {
-}
-
-export interface DeleteRoomMessage extends DefaultWsInMessage<"deleteRoom", "room"> {
-  roomId: number;
-}
-
-export interface GetCountryCodeMessage extends DefaultInMessage<"getCountryCode", "void"> {
-  content: Record<string, LocationDto>;
-}
-
-export interface LeaveUserMessage extends DefaultWsInMessage<"leaveUser", "room"> {
-  roomId: number;
-  userId: number;
-  users: number[];
-}
-
-export interface AddChannelMessage extends DefaultWsInMessage<"addChannel", "room">, ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
-  channelUsers: number[];
-}
-
-export interface InviteUserMessage extends NewRoom, RoomExistedBefore, DefaultWsInMessage<"inviteUser", "room"> {
-  roomId: number;
-  users: number[];
-}
-
-export interface AddInviteMessage extends AddRoomBase, RoomExistedBefore, DefaultWsInMessage<"addInvite", "room"> {
-}
-
-export interface SaveChannelSettingsMessage extends DefaultWsInMessage<"saveChannelSettings", "room">, ChannelDto {
-  notifications: boolean;
-  volume: number;
-  p2p: boolean;
-  userId: number;
-}
-
-export interface DeleteChannelMessage extends DefaultWsInMessage<"deleteChannel", "room"> {
-  channelId: number;
-  roomIds: number[];
-}
-
-export interface SaveRoomSettingsMessage extends DefaultWsInMessage<"saveRoomSettings", "room">, RoomNoUsersDto {
-}
-
-export interface ShowITypeMessage extends DefaultWsInMessage<"showIType", "room"> {
-  roomId: number;
-  userId: number;
-}
-
-export interface SetWsIdMessage extends DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
-  rooms: RoomDto[];
-  channels: ChannelDto[];
-  users: UserDto[];
-  online: Record<number, string[]>;
-  time: number;
-  userInfo: UserProfileDto;
-  userSettings: UserSettingsDto;
-}
-
-export interface WebRtcSetConnectionIdMessage extends WebRtcDefaultMessage, DefaultWsInMessage<"setConnectionId", "void"> {
-  time: number;
-}
-
-export interface AddRoomMessage extends AddRoomBase, DefaultWsInMessage<"addRoom", "room"> {
-  channelUsers: number[];
-  channelId: number;
-}
-
-export interface OfferFile extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerFile", "webrtc"> {
-  content: OfferFileContent;
-  roomId: number;
-  threadId: number | null;
-  userId: number;
-  time: number;
-}
-
-export interface OfferCall extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerCall", "webrtc"> {
-  content: BrowserBase;
-  roomId: number;
-  userId: number;
-  time: number;
-}
-
-export interface ReplyCallMessage extends ReplyWebRtc, DefaultWsInMessage<"replyCall", "webrtcTransfer:*"> {
-
-}
-
-export interface NotifyCallActiveMessage extends DefaultWsInMessage<"notifyCallActive", "webrtc">, WebRtcDefaultMessage, OpponentWsId {
-  roomId: number;
-  userId: number;
-}
-
-export interface DestroyCallConnection extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"destroyCallConnection", "peerConnection:*"> {
-  content: string;
-}
-
-export interface OfferMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerMessage", "webrtc"> {
-  content: BrowserBase;
-  roomId: number;
-  userId: number;
-  time: number;
-}
-
-export interface SetSettingsMessage extends DefaultWsInMessage<"setSettings", "ws"> {
-  content: UserSettingsDto;
-}
-
-export interface SetUserProfileMessage extends DefaultWsInMessage<"setUserProfile", "ws"> {
-  content: UserProfileDtoWoImage;
-}
-
-export interface UserProfileChangedMessage extends DefaultWsInMessage<"userProfileChanged", "ws">, UserDto {
-
-}
-
-export interface GrowlMessage {
-  content: string;
-  action: "growlError";
-}
-
-export interface PingMessage extends DefaultWsInMessage<"ping", "ws"> {
-  time: string;
-}
-
-export interface PongMessage extends DefaultWsInMessage<"pong", "ws"> {
-  time: string;
-}
-
-export interface ReplyFileMessage extends ReplyWebRtc, DefaultWsInMessage<"replyFile", "webrtcTransfer:*"> {
-
-}
-
-export interface SetProfileImageMessage extends DefaultWsInMessage<"setProfileImage", "ws"> {
-  content: string;
-}
-
-export interface AcceptCallMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"acceptCall", "webrtcTransfer:*"> {
-}
-
-export interface AcceptFileMessage extends DefaultWsInMessage<"acceptFile", "peerConnection:*"> {
-  content: AcceptFileContent;
-}
-
-export interface SendRtcDataMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"sendRtcData", "peerConnection:*"> {
-  content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
-}
-
-export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*">;
-
-export interface DestroyFileConnectionMessage extends DefaultWsInMessage<"destroyFileConnection", "peerConnection:*"> {
-  content: "decline" | "success";
-}
diff --git a/frontend/src/ts/types/messages/wsOutMessages.ts b/frontend/src/ts/types/messages/wsOutMessages.ts
deleted file mode 100644
index ea6c3d297..000000000
--- a/frontend/src/ts/types/messages/wsOutMessages.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This file only contains messages that sent to backend api. FE -> BE by websockets
- */
-
-import type {DefaultMessage} from "@/ts/types/messages/baseMessagesInterfaces";
-
-export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {
-  cbId?: number;
-}
-
-export interface SyncHistoryOutMessage extends DefaultWsOutMessage<"syncHistory"> {
-  roomIds: number[];
-  messagesIds: number[];
-  onServerMessageIds: number[];
-  receivedMessageIds: number[];
-  lastSynced: number;
-}
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 82181f3d9..2fd1078ee 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -92,13 +92,6 @@ export interface Location {
  * a - audio
  * m - media (same as video, but you need to click on image, in order to load video)
  */
-export type BlobType =
-  "a"
-  | "f"
-  | "g"
-  | "i"
-  | "m"
-  | "v";
 
 export interface FileModel {
   url: string | null;
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index cc5bd6c09..4583e187a 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -6,12 +6,12 @@ import {bytesToSize} from "@/ts/utils/pureFunctions";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {HandlerName} from "@/ts/types/messages/baseMessagesInterfaces";
+import type {HandlerName} from "@/ts/types/backend";
 import type {
   CheckTransferDestroy,
   ConnectToRemoteMessage,
 } from "@/ts/types/messages/innerMessages";
-import type {SendRtcDataMessage} from "@/ts/types/messages/wsInMessages";
+import type {SendRtcDataMessage} from "@/ts/types/backend";
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
 
 
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 05a1e47ba..f425cf9ff 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -25,12 +25,12 @@ import type {
   OfferFile,
   OfferMessage,
   WebRtcSetConnectionIdMessage,
-} from "@/ts/types/messages/wsInMessages";
+} from "@/ts/types/backend";
 import type {
   HandlerName,
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {VideoType} from "@/ts/types/types";
 import type {
   ChangeP2pRoomInfoMessage,
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index b632fd953..8a63d4078 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -35,13 +35,13 @@ import type {
   CallStatus,
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 
 import type {
   AcceptCallMessage,
   OfferCall,
   ReplyCallMessage,
-} from "@/ts/types/messages/wsInMessages";
+} from "@/ts/types/backend";
 import type {
   ChangeStreamMessage,
   CheckTransferDestroy,
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index cb25c46b7..60be25e0b 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -17,11 +17,11 @@ import type {
   ConnectToRemoteMessage,
   DestroyPeerConnectionMessage,
 } from "@/ts/types/messages/innerMessages";
-import type {DestroyCallConnection} from "@/ts/types/messages/wsInMessages";
+import type {DestroyCallConnection} from "@/ts/types/backend";
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import {
   getStreamLog,
   getTrackLog,
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index a976c3779..24f3e26c2 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -7,8 +7,8 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
-import type {ReplyFileMessage} from "@/ts/types/messages/wsInMessages";
+} from "@/ts/types/backend";
+import type {ReplyFileMessage} from "@/ts/types/backend";
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 
 
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index a97941aaf..bb9a149e5 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -16,11 +16,11 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {
   DestroyFileConnectionMessage,
   RetryFileMessage,
-} from "@/ts/types/messages/wsInMessages";
+} from "@/ts/types/backend";
 import type Subscription from "@/ts/classes/Subscription";
 
 export default class FileReceiverPeerConnection extends FilePeerConnection {
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index a3e02b731..569ff4795 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -19,11 +19,11 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {
   AcceptFileMessage,
   DestroyFileConnectionMessage,
-} from "@/ts/types/messages/wsInMessages";
+} from "@/ts/types/backend";
 import type Subscription from "@/ts/classes/Subscription";
 
 export default class FileSenderPeerConnection extends FilePeerConnection {
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 97f09e238..0721448d0 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -7,7 +7,7 @@ import {P2PMessageProcessor} from "@/ts/message_handlers/P2PMessageProcessor";
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 import type {
   ConfirmReceivedP2pMessage,
   ConfirmSetMessageStatusRequest,
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 8590847f4..684b290c4 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -14,7 +14,7 @@ import type {
   SendSetMessagesStatusMessage,
   SyncP2PMessage,
 } from "@/ts/types/messages/innerMessages";
-import type {HandlerTypes} from "@/ts/types/messages/baseMessagesInterfaces";
+import type {HandlerTypes} from "@/ts/types/backend";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 
 /**
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 03bd3649f..6210f1771 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -124,7 +124,7 @@ import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/messages/baseMessagesInterfaces";
+} from "@/ts/types/backend";
 
 
 @Component({
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index 932a02bd9..1adacdc2c 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -126,7 +126,7 @@ import type {UserProfileDtoWoImage} from "@/ts/types/dto";
 
 import {currentUserInfoModelToDto} from "@/ts/types/converters";
 import AppInputDate from "@/vue/ui/AppInputDate.vue";
-import type {SetUserProfileMessage} from "@/ts/types/messages/wsInMessages";
+import type {SetUserProfileMessage} from "@/ts/types/backend";
 import type {LogoutMessage} from "@/ts/types/messages/innerMessages";
 import {Gender} from '@/ts/types/backend';
 
diff --git a/frontend/src/vue/pages/UserProfileSettings.vue b/frontend/src/vue/pages/UserProfileSettings.vue
index fb1c6abf6..8b6e1100d 100644
--- a/frontend/src/vue/pages/UserProfileSettings.vue
+++ b/frontend/src/vue/pages/UserProfileSettings.vue
@@ -134,7 +134,7 @@ import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {userSettingsDtoToModel} from "@/ts/types/converters";
 import type {UserSettingsDto} from "@/ts/types/dto";
-import type {SetSettingsMessage} from "@/ts/types/messages/wsInMessages";
+import type {SetSettingsMessage} from "@/ts/types/backend";
 import type {LogLevel} from "lines-logger";
 import {logLevels} from "lines-logger";
 import {
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index ca787ceb4..83dbe2df7 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -107,6 +107,16 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
+"@socket.io/base64-arraybuffer@~1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61"
+  integrity sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==
+
+"@socket.io/component-emitter@~3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz#8863915676f837d9dad7b76f50cb500c1e9422e9"
+  integrity sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q==
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -577,6 +587,11 @@ array.prototype.flat@^1.2.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.0"
 
+backo2@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -818,7 +833,7 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -926,6 +941,28 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+engine.io-client@~6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.1.1.tgz#800d4b9db5487d169686729e5bd887afa78d36b0"
+  integrity sha512-V05mmDo4gjimYW+FGujoGmmmxRaDsrVr7AXA3ZIfa04MWM1jOfZfUwou0oNqhNwy/votUDvGDt4JA4QF4e0b4g==
+  dependencies:
+    "@socket.io/component-emitter" "~3.0.0"
+    debug "~4.3.1"
+    engine.io-parser "~5.0.0"
+    has-cors "1.1.0"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
+    ws "~8.2.3"
+    xmlhttprequest-ssl "~2.0.0"
+    yeast "0.1.2"
+
+engine.io-parser@~5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.3.tgz#ca1f0d7b11e290b4bfda251803baea765ed89c09"
+  integrity sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==
+  dependencies:
+    "@socket.io/base64-arraybuffer" "~1.0.2"
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -1595,6 +1632,11 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -2290,6 +2332,16 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parseqs@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
+  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
+
+parseuri@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
+  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
+
 patch-package@^6.2.2:
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148"
@@ -2666,6 +2718,26 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+socket.io-client@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.4.1.tgz#b6aa9448149d09b8d0b2bbf3d2fac310631fdec9"
+  integrity sha512-N5C/L5fLNha5Ojd7Yeb/puKcPWWcoB/A09fEjjNsg91EDVr5twk/OEyO6VT9dlLSUNY85NpW6KBhVMvaLKQ3vQ==
+  dependencies:
+    "@socket.io/component-emitter" "~3.0.0"
+    backo2 "~1.0.2"
+    debug "~4.3.2"
+    engine.io-client "~6.1.1"
+    parseuri "0.0.6"
+    socket.io-parser "~4.1.1"
+
+socket.io-parser@~4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.1.2.tgz#0a97d4fb8e67022158a568450a6e41887e42035e"
+  integrity sha512-j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog==
+  dependencies:
+    "@socket.io/component-emitter" "~3.0.0"
+    debug "~4.3.1"
+
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -3239,6 +3311,16 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+ws@~8.2.3:
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
+  integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
+
+xmlhttprequest-ssl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
+  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
+
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -3297,3 +3379,8 @@ yauzl@^2.10.0:
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
diff --git a/newback/config/env/test.json b/newback/config/env/test.json
index c89d3ce9c..73d293d83 100644
--- a/newback/config/env/test.json
+++ b/newback/config/env/test.json
@@ -1,4 +1,4 @@
 {
   "recaptcha": null,
-  "email": {}
+  "email": null
 }
diff --git a/newback/jest.config.ts b/newback/jest.config.ts
index 9cc4f83d1..66704c601 100644
--- a/newback/jest.config.ts
+++ b/newback/jest.config.ts
@@ -1,6 +1,4 @@
 import type {Config} from '@jest/types';
-const tsconfig = require("./tsconfig.json")
-const moduleNameMapper = require("tsconfig-paths-jest")(tsconfig)
 
 // Sync object
 const config: Config.InitialOptions = {
@@ -9,6 +7,11 @@ const config: Config.InitialOptions = {
 
 export default async(): Promise<Config.InitialOptions> => {
   return {
+    globals: {
+      'ts-jest': {
+        compiler: 'ttypescript'
+      },
+    },
     "moduleFileExtensions": [
       "js",
       "json",
@@ -36,6 +39,5 @@ export default async(): Promise<Config.InitialOptions> => {
     ],
     "coverageDirectory": "./coverage",
     "testEnvironment": "node",
-    moduleNameMapper,
   }
 };
diff --git a/newback/package.json b/newback/package.json
index 9e3f12ffb..f9c91fbcf 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -6,9 +6,9 @@
   "license": "MIT",
   "scripts": {
     "generate-configs": "node-ts-config",
-    "migrate": "ts-node  -r tsconfig-paths/register ./src/utils/migration.runner.ts ",
-    "build": "nest build",
-    "start": "nest start",
+    "migrate": "ts-node --compiler ttypescript ./src/utils/migration.runner.ts ",
+    "build": "ttsc",
+    "start": "ts-node --compiler ttypescript src/main.ts",
     "test:html:coverage": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
     "test": "jest --runInBand --coverage --coverageReporters text"
   },
@@ -43,6 +43,10 @@
     "sequelize": "^6.18.0",
     "sequelize-typescript": "^2.1.3",
     "swagger-ui-express": "^4.3.0",
+    "tsruntime": "^3.0.0-beta.1",
+    "ttypescript": "^1.5.13",
+    "typend": "^1.1.1",
+    "typescript-transform-paths": "^3.3.1",
     "ws": "^8.5.0"
   },
   "devDependencies": {
@@ -64,7 +68,6 @@
     "ts-jest": "^27.1.4",
     "ts-loader": "^9.2.8",
     "ts-node": "^10.7.0",
-    "tsconfig-paths-jest": "^0.0.1",
     "typescript": "^4.6.3",
     "wait-for-expect": "^3.0.2"
   }
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
new file mode 100644
index 000000000..4b7b4fa49
--- /dev/null
+++ b/newback/src/data/types/internal.ts
@@ -0,0 +1,4 @@
+export interface WebSocketContextData {
+  userId: number;
+}
+export type UserOnlineData = Record<string, string[]>
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 4bb1ac69c..670dd4355 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -1,4 +1,5 @@
 import {
+  ConsoleLogger,
   INestApplication,
   Logger,
   ValidationPipe
@@ -120,7 +121,7 @@ describe('AuthModule', () => {
         },
       ],
       controllers: [AuthController]
-    })
+    }).setLogger(new ConsoleLogger())
       .compile();
     app = moduleFixture.createNestApplication();
     app.useGlobalPipes(new ValidationPipe());
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 01a24d003..96e74b5a1 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -193,7 +193,7 @@ export class AuthService {
     }
   }
 
-  private async createUser(data: SignUpRequest, transaction: Transaction) {
+  public async createUser(data: SignUpRequest, transaction?: Transaction): Promise<number>{
     await this.validateUser(data.username, transaction);
     if (data.email) {
       await this.validateEmail(data.email)
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index 54cea9911..8c2729c78 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -1,4 +1,5 @@
 import {
+  ConsoleLogger,
   INestApplication,
   Logger,
   ValidationPipe
@@ -98,7 +99,7 @@ describe('VerifyModule', () => {
         },
       ],
       controllers: [VerifyController]
-    })
+    }).setLogger(new ConsoleLogger())
       .compile();
     app = moduleFixture.createNestApplication();
     app.useGlobalPipes(new ValidationPipe());
diff --git a/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts b/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
new file mode 100644
index 000000000..330580182
--- /dev/null
+++ b/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
@@ -0,0 +1,99 @@
+import {
+  Test,
+  TestingModule
+} from '@nestjs/testing';
+import {IpService} from '@/modules/rest/ip/ip.service';
+import {HttpModule} from '@/modules/rest/http/http.module';
+import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
+import {LoggerModule} from '@/modules/rest/logger/logger.module';
+import {SessionService} from '@/modules/rest/session/session.service';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {DatabaseModule} from '@/modules/rest/database/database.module';
+import {RedisModule} from '@nestjs-modules/ioredis';
+import {config} from 'node-ts-config';
+import {ConsoleLogger} from '@nestjs/common';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {AuthModule} from '@/modules/api/auth/auth.module';
+import {AuthService} from '@/modules/api/auth/auth.service';
+import {ConfigModule} from '@/modules/rest/config/config.module';
+
+
+describe('WebsocketGateway', () => {
+
+  let gateway: WebsocketGateway;
+  let moduleFixture: TestingModule;
+  beforeAll(
+    async() => {
+      moduleFixture = await Test.createTestingModule({
+        imports: [
+          {
+            module: WebsocketGateway,
+            imports: [
+              LoggerModule,
+              ConfigModule,
+              AuthModule,
+              HttpModule,
+              DatabaseModule,
+              RedisModule.forRoot({
+                config: {
+                  host: config.redis.host,
+                  port: config.redis.port,
+                  db: config.redis.database,
+                }
+              }),
+            ],
+            providers: [
+              PasswordService,
+              RedisService,
+              IpCacheService,
+              SessionService,
+              IpService,
+            ]
+          },
+
+        ],
+      }).setLogger(new ConsoleLogger()).compile();
+
+      gateway = moduleFixture.get(WebsocketGateway);
+    })
+
+  afterAll(async() => {
+    await moduleFixture.close()
+  })
+
+  beforeAll(() => {
+    jest.clearAllMocks();
+  })
+
+  describe('handleConnection', () => {
+    it('should not throw an error', async() => {
+        let authService = moduleFixture.get(AuthService);
+        let userRepository = moduleFixture.get(UserRepository);
+        let user = await userRepository.getUserByUserName('test');
+        let userId;
+        if (user) {
+          userId = user.id;
+        } else {
+          userId = await authService.createUser({
+            password: 'test',
+            username: 'test',
+          })
+        }
+
+        let sessionService = moduleFixture.get(SessionService);
+        let session = await sessionService.createAndSaveSession(userId)
+        let a = await gateway.handleConnection({
+          _socket: {
+            remoteAddress: '192.168.1.1'
+          }
+        } as any, {url: `/ws?id=&sessionId=${session}`} as any, {} as any)
+
+
+        expect(1 + 1).toEqual(2)
+      }
+    )
+
+  });
+});
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 6adca151e..ba125fce2 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -3,103 +3,87 @@ import {
   OnGatewayConnection,
   SubscribeMessage,
   WebSocketGateway,
-  WebSocketServer,
 } from '@nestjs/websockets';
-import {Server} from 'ws';
+import {IncomingMessage} from 'http';
+import {UserId} from '@/utils/decorators';
+import {WebSocket} from 'ws';
+import {WebSocketContextData} from '@/data/types/internal';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {SessionService} from '@/modules/rest/session/session.service';
+import {UserModel} from '@/data/model/user.model';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {
+  ChannelDto,
+  RoomDto,
+  SetWsIdMessage,
+  UserDto
+} from '@/data/types/frontend';
+import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+import {transformSetWsId} from '@/modules/api/websocket/ws.transformer';
 
 @WebSocketGateway({
   path: '/ws'
 })
 export class WebsocketGateway implements OnGatewayConnection {
-  @WebSocketServer()
-  server!: Server;
 
-  private sockets = [];
+  constructor(
+    private readonly sessionService: SessionService,
+    private readonly passwordService: PasswordService,
+    private readonly ipCacheService: IpCacheService,
+    private readonly redisService: RedisService,
+    private readonly roomRepository: RoomRepository,
+    private readonly userRepository: UserRepository,
+  ) {
+  }
 
-  async handleConnection(socket: WebSocket) {
-    this.sockets.push(socket);
-    console.log(this.sockets);
+  async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) {
+    let url = new URLSearchParams(message.url);
+    let user: UserModel = await this.sessionService.getUserById(url.get('sessionId'));
+    let id = await this.passwordService.createWsId(user.id,  url.get('id'));
+    let ip = (socket as any)._socket.remoteAddress;
+    await this.ipCacheService.saveIp(user.id, ip);
+    await this.redisService.addOnline(id)
+    let online = await this.redisService.getOnline();
 
-    // session_key = self.get_argument('sessionId', None)
-		// user_id = self.sync_redis.hget('sessions', session_key)
-		// if user_id is None:
-		// 	self.logger.warning('!! Session key %s has been rejected' % session_key)
-		// 	self.close(403, "Session key %s has been rejected" % session_key)
-		// 	return
-		// self.user_id = int(user_id)
-		// try:
-		// 	user_db = UserProfile.objects.get(id=self.user_id)
-		// except UserProfile.DoesNotExist:
-		// 	self.logger.warning('Database has been cleared, but redis %s not. Logging out current user' % session_key)
-		// 	self.close(403, "This user no more longer exists")
-		// 	return
-		// self.ip = self.get_client_ip()
-		// self.generate_self_id()
-		// self.save_ip()
-		// self.message_creator = WebRtcMessageCreator(self.user_id, self.id)
-		// self._logger = logging.LoggerAdapter(parent_logger, {
-		// 	'id': self.id,
-		// 	'ip': self.ip
-		// })
-		// self.logger.debug("!! Incoming connection, session %s, thread hash %s", session_key, self.id)
-		// self.async_redis.connect()
-		// self.async_redis_publisher.sadd(RedisPrefix.ONLINE_VAR, self.id)
-		// # since we add user to online first, latest trigger will always show correct online
-		//
-		// online = self.get_dict_users_from_redis()
-		// # current user is already online
-		// my_online = online.setdefault(self.user_id, [])
-		// if self.id not in my_online:
-		// 	my_online.append(self.id)
-		//
-		// user_rooms_query = Room.objects.filter(users__id=self.user_id, disabled=False) \
-		// 	.values('id', 'name', 'creator_id', 'is_main_in_channel', 'channel_id', 'p2p', 'roomusers__notifications', 'roomusers__volume')
-		// room_users = [{
-		// 	VarNames.ROOM_ID: room['id'],
-		// 	VarNames.ROOM_NAME: room['name'],
-		// 	VarNames.CHANNEL_ID: room['channel_id'],
-		// 	VarNames.ROOM_CREATOR_ID: room['creator_id'],
-		// 	VarNames.IS_MAIN_IN_CHANNEL: room['is_main_in_channel'],
-		// 	VarNames.NOTIFICATIONS: room['roomusers__notifications'],
-		// 	VarNames.P2P: room['p2p'],
-		// 	VarNames.VOLUME: room['roomusers__volume'],
-		// 	VarNames.ROOM_USERS: []
-		// } for room in user_rooms_query]
-		// user_rooms_dict = {room[VarNames.ROOM_ID]: room for room in room_users}
-		// channels_ids = [channel[VarNames.CHANNEL_ID] for channel in room_users if channel[VarNames.CHANNEL_ID]]
-		// channels_db = Channel.objects.filter(Q(id__in=channels_ids) | Q(creator=self.user_id), disabled=False)
-		// channels = [{
-		// 	VarNames.CHANNEL_ID: channel.id,
-		// 	VarNames.CHANNEL_NAME: channel.name,
-		// 	VarNames.CHANNEL_CREATOR_ID: channel.creator_id
-		// } for channel in channels_db]
-		// room_ids = [room_id[VarNames.ROOM_ID] for room_id in room_users]
-		// rooms_users = RoomUsers.objects.filter(room_id__in=room_ids).values('user_id', 'room_id')
-		// for ru in rooms_users:
-		// 	user_rooms_dict[ru['room_id']][VarNames.ROOM_USERS].append(ru['user_id'])
-		// # get all missed messages
-		// self.channels = room_ids  # py2 doesn't support clear()
-		// self.channels.append(self.channel)
-		// self.channels.append(self.id)
-		// self.listen(self.channels)
-		// # this was replaced to syncHistory method that's called from browser and passes existing ids
-		// # off_messages, history = self.get_offline_messages(room_users, was_online, self.get_argument('history', False))
-		// # for room in room_users:
-		// # 	room_id = room[VarNames.ROOM_ID]
-		// # 	h = history.get(room_id)
-		// # 	o = off_messages.get(room_id)
-		// # 	if h:
-		// # 		room[VarNames.LOAD_MESSAGES_HISTORY] = h
-		// # 	if o:
-		// # 		room[VarNames.LOAD_MESSAGES_OFFLINE] = o
-    //
+    let myRooms = await this.roomRepository.getRoomsForUser(user.id);
+    let channelIds = myRooms.map(r => r.channelId).filter(c => c)
+    let channels = await this.roomRepository.getAllChannels(channelIds);
+    let allUsersInTheseRooms = await this.roomRepository.getRoomUsers(myRooms.map(r => r.id));
+    let userIds: number[] =  [...new Set(allUsersInTheseRooms.map(r => r.userId))];
+    let users: UserModel[] =  await this.userRepository.getUsersById(userIds);
+    let response = transformSetWsId(
+      {
+        id,
+        allUsersInTheseRooms,
+        online,
+        myRooms,
+        users,
+        user,
+        channels,
+        time: Date.now()
+      }
+    )
+    socket.send(JSON.stringify(response));
   }
 
   @SubscribeMessage('hello') //ws.ws.send(JSON.stringify({action: 'hello'}))
-  handleEvent(@MessageBody() data: string): any {
-    const event = 'events';
-    this.server.clients.forEach((client) => {
-      client.send(JSON.stringify({event, data}));
-    });
+  handleEvent(@MessageBody() data: string, @UserId() user): any {
+    console.log(user);
+    // const event = 'events';
+    // this.server.clients.forEach((client) => {
+    //   client.send(JSON.stringify({event, data}));
+    // });
+    return "asda";
+  }
+
+  @SubscribeMessage('hey') //ws.ws.send(JSON.stringify({action: 'hello'}))
+  handleHey(@MessageBody() data: string) {
+    console.log('asd2');
+    // const event = 'events';
+    // this.server.clients.forEach((client) => {
+    //   client.send(JSON.stringify({event, data}));
+    // });
   }
 }
diff --git a/newback/src/modules/api/websocket/ws.transformer.ts b/newback/src/modules/api/websocket/ws.transformer.ts
new file mode 100644
index 000000000..0d4dc1dfe
--- /dev/null
+++ b/newback/src/modules/api/websocket/ws.transformer.ts
@@ -0,0 +1,92 @@
+import {
+  ChannelDto,
+  RoomDto,
+  SetWsIdMessage,
+  UserDto
+} from '@/data/types/frontend';
+import {UserModel} from '@/data/model/user.model';
+import {UserOnlineData} from '@/data/types/internal';
+import {ChannelModel} from '@/data/model/channel.model';
+import {RoomUsersModel} from '@/data/model/room.users.model';
+import {GetRoomsForUser} from '@/modules/rest/database/repository/room.repository';
+
+
+export interface TransformSetWsIdData {
+  myRooms: GetRoomsForUser[];
+  allUsersInTheseRooms: Pick<RoomUsersModel, 'roomId' | 'userId'>[];
+  channels: ChannelModel[];
+  users: UserModel[];
+  online: UserOnlineData;
+  id: string;
+  time: number;
+  user: UserModel;
+}
+
+export function transformSetWsId({myRooms, allUsersInTheseRooms, channels, users, online, id, user, time}: TransformSetWsIdData): SetWsIdMessage {
+
+  let roomUsersIdInfoDict = allUsersInTheseRooms.reduce((previousValue, currentValue) => {
+    if (!previousValue[currentValue.roomId]) {
+      previousValue[currentValue.roomId] = []
+    }
+    previousValue[currentValue.roomId].push(currentValue.userId);
+    return previousValue;
+  }, {} as Record<string, number[]>);
+  let rooms: RoomDto[] = myRooms.map(room => ({
+    name: room.name,
+    id: room.id,
+    channelId: room.channelId,
+    p2p: room.p2p,
+    notifications: room.roomUsers.notifications,
+    users: roomUsersIdInfoDict[room.id],
+    isMainInChannel: room.isMainInChannel,
+    creatorId: room.creatorId,
+    volume: room.roomUsers.volume,
+  }))
+  let channelsResult: ChannelDto[] = channels.map(c => ({
+    name: c.name,
+    id: c.id,
+    creatorId: c.creatorId
+  }))
+  let resultUsers: UserDto[] = users.map(u => ({
+    username: u.username,
+    id: u.id,
+    thumbnail: u.thumbnail,
+    sex: u.sex,
+    lastTimeOnline: u.lastTimeOnline
+  }))
+
+  return {
+    action: "setWsId",
+    channels: channelsResult,
+    rooms,
+    handler: "ws",
+    time,
+    users: resultUsers,
+    online: online,
+    opponentWsId: id,
+    profile: {
+      username: user.username,
+      name: user.userProfile.name,
+      sex: user.sex,
+      id: user.id,
+      city: user.userProfile.city,
+      email: user.userAuth.email,
+      birthday: user.userProfile.birthday,
+      contacts: user.userProfile.contacts,
+      surname: user.userProfile.surname,
+      thumbnail: user.thumbnail
+    },
+    settings: {
+      embeddedYoutube: user.userSettings.embeddedYoutube,
+      highlightCode: user.userSettings.highlightCode,
+      incomingFileCallSound: user.userSettings.incomingFileCallSound,
+      messageSound: user.userSettings.messageSound,
+      onlineChangeSound: user.userSettings.onlineChangeSound,
+      showWhenITyping: user.userSettings.showWhenITyping,
+      suggestions: user.userSettings.suggestions,
+      theme: user.userSettings.theme,
+      logs: user.userSettings.logs
+    },
+  }
+
+}
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index e66fb6367..342a29361 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -8,6 +8,11 @@ import {config} from 'node-ts-config';
 import {ConfigModule} from '@/modules/rest/config/config.module';
 import {VerifyModule} from '@/modules/api/verify/verify.module';
 import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {SessionService} from '@/modules/rest/session/session.service';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {DatabaseModule} from '@/modules/rest/database/database.module';
 
 @Module({
   imports: [
@@ -15,7 +20,16 @@ import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
     LoggerModule,
     ConfigModule,
     VerifyModule,
-    WebsocketGateway,
+    DatabaseModule,
+    {
+      module: WebsocketGateway,
+      imports: [DatabaseModule],
+      providers: [
+        RedisService,
+        SessionService,
+        PasswordService,
+      ]
+    },
     RedisModule.forRoot({
       config: {
         host: config.redis.host,
diff --git a/newback/src/modules/rest/config/config.service.ts b/newback/src/modules/rest/config/config.service.ts
index dd41b2835..ff95e278c 100644
--- a/newback/src/modules/rest/config/config.service.ts
+++ b/newback/src/modules/rest/config/config.service.ts
@@ -1,13 +1,13 @@
 import {Injectable} from '@nestjs/common';
-import type {IConfig} from 'node-ts-config';
+import type {config as Blah} from 'node-ts-config';
 
 @Injectable()
 export class ConfigService {
 
-  constructor(private readonly config: IConfig) {
+  constructor(private readonly config: typeof Blah) {
   }
 
-  public getConfig(): IConfig {
+  public getConfig(): typeof Blah {
     return this.config;
   }
 
diff --git a/newback/src/modules/rest/database/repository/ip.repository.ts b/newback/src/modules/rest/database/repository/ip.repository.ts
index f230f58dc..b49ef6eaa 100644
--- a/newback/src/modules/rest/database/repository/ip.repository.ts
+++ b/newback/src/modules/rest/database/repository/ip.repository.ts
@@ -1,15 +1,21 @@
 import {Injectable} from '@nestjs/common';
 import {InjectModel} from '@nestjs/sequelize';
 import {IpAddressModel} from '@/data/model/ip.address.model';
+import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
 
 
 @Injectable()
 export class IpRepository {
   public constructor(
     @InjectModel(IpAddressModel) private readonly ipAddressModel: typeof IpAddressModel,
+    @InjectModel(UserJoinedInfoModel) private readonly userJoinedInfoModel: typeof UserJoinedInfoModel,
   ) {
   }
 
+  public async saveIpToUser(userId: number, ipId: number) {
+    await this.userJoinedInfoModel.upsert({userId, ipId},);
+  }
+
   public async saveIP(model: Partial<IpAddressModel>) {
     return this.ipAddressModel.upsert(model);
   }
@@ -18,7 +24,8 @@ export class IpRepository {
     return this.ipAddressModel.findOne({
       where: {
         ip
-      }
+      },
+      raw: true
     });
   }
 }
diff --git a/newback/src/modules/rest/database/repository/room.repository.ts b/newback/src/modules/rest/database/repository/room.repository.ts
index b715d0818..7713bc61b 100644
--- a/newback/src/modules/rest/database/repository/room.repository.ts
+++ b/newback/src/modules/rest/database/repository/room.repository.ts
@@ -2,14 +2,23 @@ import {Injectable} from '@nestjs/common';
 import {InjectModel} from '@nestjs/sequelize';
 import {RoomModel} from '@/data/model/room.model';
 import {RoomUsersModel} from '@/data/model/room.users.model';
-import {Transaction} from 'sequelize';
+import {
+  Op,
+  Transaction
+} from 'sequelize';
+import {ChannelModel} from '@/data/model/channel.model';
 
+type RoomSingleRoomUser = Omit<RoomModel, 'roomUsers'>;
+export interface GetRoomsForUser extends RoomSingleRoomUser {
+  roomUsers: RoomUsersModel;
+}
 
 @Injectable()
 export class RoomRepository {
   public constructor(
     @InjectModel(RoomModel) private readonly roomModel: typeof RoomModel,
     @InjectModel(RoomUsersModel) private readonly roomUsersModel: typeof RoomUsersModel,
+    @InjectModel(ChannelModel) private readonly channelsModel: typeof ChannelModel,
   ) {
   }
 
@@ -20,4 +29,46 @@ export class RoomRepository {
       notifications: false,
     }, {transaction, raw: true})
   }
+
+  public async getAllChannels(ids: number[]): Promise<ChannelModel[]> {
+    return await this.channelsModel.findAll({
+      where: {
+        id: {
+          [Op.in]: ids,
+        }
+      }
+    });
+  }
+
+    public async getRoomUsers(roomIds: number[]): Promise<Pick<RoomUsersModel, 'roomId'|'userId'>[]> {
+     // we should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
+     return  this.roomUsersModel.findAll({
+       where: {
+         roomId: {
+           [Op.in]: roomIds,
+         }
+       },
+       raw: true,
+       attributes: ['userId', 'roomId']
+     });
+  }
+
+
+
+  public async getRoomsForUser(userId: number): Promise<GetRoomsForUser[]> {
+     // we should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
+     return await this.roomModel.findAll({
+      raw: true,
+      include: [{
+        association: 'roomUsers',
+        where: {
+           userId: userId
+        }
+      }],
+    }) as any as GetRoomsForUser[];
+    //     FROM `room` AS `RoomModel`
+    //          INNER JOIN `room_user` AS `roomUsers` ON `RoomModel`.`id` = `roomUsers`.`room_id` AND
+    //                                                   (`roomUsers`.`deleted_at` IS NULL AND `roomUsers`.`user_id` = 2)
+    // WHERE (`RoomModel`.`deleted_at` IS NULL);
+  }
 }
diff --git a/newback/src/modules/rest/database/repository/user.repository.ts b/newback/src/modules/rest/database/repository/user.repository.ts
index f28c8932c..7eb2e08eb 100644
--- a/newback/src/modules/rest/database/repository/user.repository.ts
+++ b/newback/src/modules/rest/database/repository/user.repository.ts
@@ -5,7 +5,10 @@ import {UserAuthModel} from '@/data/model/user.auth.model';
 import {Gender} from '@/data/types/frontend';
 import {UserProfileModel} from '@/data/model/user.profile.model';
 import {UserSettingsModel} from '@/data/model/user.settings.model';
-import {Transaction} from 'sequelize';
+import {
+  Op,
+  Transaction
+} from 'sequelize';
 
 
 @Injectable()
@@ -21,7 +24,7 @@ export class UserRepository {
   public async updateUserPassword(userId: number, password: string, transaction: Transaction) {
     await this.userAuthModel.update({password}, {
       where: {id: userId},
-      transaction
+      transaction,
     })
   }
 
@@ -38,7 +41,7 @@ export class UserRepository {
   }, transaction: Transaction): Promise<number> {
     let userModel = await this.userModel.create({
       username: data.username,
-      lastTimeOnline: new Date(),
+      lastTimeOnline: Date.now(),
       sex: data.sex,
       thumbnail: data.thumbnail
     }, {transaction, raw: true,})
@@ -65,6 +68,7 @@ export class UserRepository {
       where: {
         googleId
       },
+      raw: true,
       transaction
     })
   }
@@ -74,6 +78,7 @@ export class UserRepository {
       where: {
         facebookId
       },
+      raw: true,
       transaction
     })
   }
@@ -96,6 +101,7 @@ export class UserRepository {
   public async getUserByEmail(email: string, transaction?: Transaction): Promise<UserAuthModel | null> {
     return this.userAuthModel.findOne({
       where: {email},
+      raw: true,
       transaction,
       include: [
         'user', // LEFT OUTER JOIN "id" = "user"."id"
@@ -103,10 +109,32 @@ export class UserRepository {
     })
   }
 
-  public async getUserByUserName(username: string, includeFields: ('userAuth' | 'userProfile')[], transaction?: Transaction): Promise<UserModel | null> {
+  public async getUserByUserName(username: string, includeFields: ('userAuth' | 'userProfile')[] = [], transaction?: Transaction): Promise<UserModel | null> {
     return this.userModel.findOne({
       where: {username},
       transaction,
+      raw: true,
+      include: includeFields,
+    })
+  }
+
+  public async getById(id: number, includeFields: ('userAuth' | 'userProfile'| 'userSettings')[] = [], transaction?: Transaction): Promise<UserModel | null> {
+    return this.userModel.findOne({
+      where: {id},
+      transaction,
+      raw: true,
+      include: includeFields,
+    })
+  }
+
+  public async getUsersById(ids: number[], includeFields: ('userAuth' | 'userProfile' | 'userSettings')[] = []) {
+    return this.userModel.findAll({
+      where: {
+        id: {
+          [Op.in]: ids,
+        },
+      },
+      raw: true,
       include: includeFields,
     })
   }
diff --git a/newback/src/modules/rest/database/repository/verification.repository.ts b/newback/src/modules/rest/database/repository/verification.repository.ts
index 3e582f871..3b3703359 100644
--- a/newback/src/modules/rest/database/repository/verification.repository.ts
+++ b/newback/src/modules/rest/database/repository/verification.repository.ts
@@ -33,6 +33,7 @@ export class VerificationRepository {
     return await this.verificationModel.findOne({
       where: {token},
       include: ['user'],
+      raw: true,
       transaction
     });
   }
diff --git a/newback/src/modules/rest/email/email.module.ts b/newback/src/modules/rest/email/email.module.ts
index f7a7d8d2e..c70a51f84 100644
--- a/newback/src/modules/rest/email/email.module.ts
+++ b/newback/src/modules/rest/email/email.module.ts
@@ -1,5 +1,8 @@
 import {Module} from '@nestjs/common';
-import {MailerModule} from '@nestjs-modules/mailer';
+import {
+  MailerModule,
+  MailerService
+} from '@nestjs-modules/mailer';
 import {config} from 'node-ts-config';
 import {EmailService} from '@/modules/rest/email/email.service';
 import {HtmlService} from '@/modules/rest/html/html.service';
@@ -7,11 +10,15 @@ import {HtmlService} from '@/modules/rest/html/html.service';
 
 @Module({
   imports: [
-    MailerModule.forRoot({
+    ...(config.email ? [MailerModule.forRoot({
       transport: config.email as any
-    })
+    })] : [])
   ],
   providers: [
+    ...(!config.email ? [{
+      provide: MailerService,
+      useValue: null
+    }]: []),
     EmailService,
     HtmlService
   ],
diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
index 8eac32459..42237af00 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -10,6 +10,7 @@ import {ConfigModule} from '@/modules/rest/config/config.module';
 import {promisify} from 'util';
 import {readFile} from 'fs';
 import {resolve} from 'path';
+import {ConsoleLogger} from '@nestjs/common';
 
 describe('EmailSenderService', () => {
 
@@ -32,7 +33,8 @@ describe('EmailSenderService', () => {
           HtmlService,
           EmailService,
         ]
-      }).compile();
+      }).setLogger(new ConsoleLogger())
+        .compile();
       sender = moduleFixture.get(EmailService);
       mailer = moduleFixture.get(MailerService);
     })
diff --git a/newback/src/modules/rest/email/email.service.ts b/newback/src/modules/rest/email/email.service.ts
index e378724fd..fd1759ee7 100644
--- a/newback/src/modules/rest/email/email.service.ts
+++ b/newback/src/modules/rest/email/email.service.ts
@@ -11,8 +11,8 @@ export class EmailService {
   public constructor(
     private readonly htmlService: HtmlService,
     private readonly loggerService: Logger,
-    private readonly mailerService: MailerService,
-    private readonly configService: ConfigService
+    private readonly configService: ConfigService,
+    private readonly mailerService?: MailerService,
   ) {
   }
 
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/rest/ip/ip.cache.service.ts
index 4858d7794..662c0f5e0 100644
--- a/newback/src/modules/rest/ip/ip.cache.service.ts
+++ b/newback/src/modules/rest/ip/ip.cache.service.ts
@@ -6,6 +6,7 @@ import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 import {IpService} from '@/modules/rest/ip/ip.service';
 import {IpAddressModel} from '@/data/model/ip.address.model';
 import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 
 @Injectable()
 export class IpCacheService {
@@ -25,6 +26,13 @@ export class IpCacheService {
     }
   }
 
+  public async saveIp(userId: number, ip: string) {
+    let ipModel = await this.getIpInfo(ip);
+    if (ipModel) {
+      await this.ipRepository.saveIpToUser(userId, ipModel.id)
+    }
+  }
+
   public async getIpInfo(ip: string): Promise<Partial<IpAddressModel>> {
     let response = await this.ipRepository.getIp(ip);
     if (response && !response.status) {
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
index 48d935b36..6a14e7758 100644
--- a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
+++ b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
@@ -7,6 +7,7 @@ import {HttpModule} from '@/modules/rest/http/http.module';
 import * as pychatIpAddressFixture from '@/fixtures/ip.134.249.113.11.json';
 import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
+import {ConsoleLogger} from '@nestjs/common';
 
 describe('IpService', () => {
 
@@ -23,7 +24,8 @@ describe('IpService', () => {
         providers: [
           IpService,
         ]
-      }).compile();
+      }).setLogger(new ConsoleLogger())
+        .compile();
       ipservice = moduleFixture.get(IpService);
     })
 
diff --git a/newback/src/modules/rest/password/password.service.ts b/newback/src/modules/rest/password/password.service.ts
index 1ea0be2c0..68cd3c2b4 100644
--- a/newback/src/modules/rest/password/password.service.ts
+++ b/newback/src/modules/rest/password/password.service.ts
@@ -13,6 +13,20 @@ export class PasswordService {
     return hash(password, 10);
   }
 
+  public async createWsId(userId: number, oldId: string): Promise<string> {
+    let random;
+    if (oldId) {
+      let [userId, oldRandom] = oldId.split(':');
+      if (oldRandom?.length === 4) {
+        random = oldRandom;
+      }
+    }
+    if (!random) {
+      random = await this.generateRandomString(4);
+    }
+    return `${userId}:${random}`
+  }
+
   public async generateRandomString(length: number): Promise<string> {
     let result = '';
     const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
diff --git a/newback/src/modules/rest/redis/redis.service.ts b/newback/src/modules/rest/redis/redis.service.ts
index 56fa6aa74..e292b77b6 100644
--- a/newback/src/modules/rest/redis/redis.service.ts
+++ b/newback/src/modules/rest/redis/redis.service.ts
@@ -1,9 +1,12 @@
 import {Injectable} from '@nestjs/common';
-import {REDIS_SESSIONS_KEY} from '@/utils/consts';
+import {
+  REDIS_KEYS,
+} from '@/utils/consts';
 import {
   InjectRedis,
   Redis
 } from '@nestjs-modules/ioredis';
+import {UserOnlineData} from '@/data/types/internal';
 
 @Injectable()
 export class RedisService {
@@ -15,7 +18,41 @@ export class RedisService {
 
 
   public async saveSession(session: string, userId: number): Promise<void> {
-    await this.redis.hset(REDIS_SESSIONS_KEY, session, userId);
+    await this.redis.hset(REDIS_KEYS.REDIS_SESSIONS_KEY, session, userId);
+  }
+
+  public async removeSession(session: string) {
+    await this.redis.hdel(REDIS_KEYS.REDIS_SESSIONS_KEY, session);
+  }
+
+  public async getSession(session: string): Promise<number | null> {
+    let a = await this.redis.hget(REDIS_KEYS.REDIS_SESSIONS_KEY, session);
+    if (!a) {
+      return null;
+    }
+    return parseInt(a);
+  }
+
+  public async addOnline(id: string): Promise<void> {
+    this.redis.sadd(REDIS_KEYS.REDIS_ONLINE_KEY, id)
+  }
+
+  public async getOnline(): Promise<UserOnlineData> {
+    let data = await this.redis.smembers(REDIS_KEYS.REDIS_ONLINE_KEY);
+    if (!data) {
+      return {};
+    }
+
+    return data.reduce((set, currentValue) => {
+      let [userId, id] = currentValue.split(':');
+      if (!set[userId]) {
+        set[userId] = []
+      }
+      set[userId].push(id)
+      return set;
+    }, {} as UserOnlineData);
+
   }
 
+
 }
diff --git a/newback/src/modules/rest/session/session.service.ts b/newback/src/modules/rest/session/session.service.ts
index f57fd93b1..b92324a60 100644
--- a/newback/src/modules/rest/session/session.service.ts
+++ b/newback/src/modules/rest/session/session.service.ts
@@ -1,9 +1,13 @@
 import {
   Injectable,
-  Logger
+  InternalServerErrorException,
+  Logger,
+  UnauthorizedException
 } from '@nestjs/common';
 import {PasswordService} from '@/modules/rest/password/password.service';
 import {RedisService} from '@/modules/rest/redis/redis.service';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {UserModel} from '@/data/model/user.model';
 
 @Injectable()
 export class SessionService {
@@ -11,6 +15,7 @@ export class SessionService {
   constructor(
     private readonly passwordService: PasswordService,
     private readonly redisService: RedisService,
+    private readonly userRepository: UserRepository,
     private readonly logger: Logger,
   ) {
   }
@@ -21,4 +26,20 @@ export class SessionService {
     await this.redisService.saveSession(session, userId);
     return session;
   }
+
+  public async getUserById(sessionId: string): Promise<UserModel> {
+    if (!sessionId) {
+      throw new UnauthorizedException("sessionId is missing");
+    }
+    let userId = await this.redisService.getSession(sessionId);
+    if (!userId) {
+      throw new UnauthorizedException("Session id expired");
+    }
+    let user = await this.userRepository.getById(userId, ['userProfile', 'userAuth', 'userSettings'])
+    if (!user) {
+      await this.redisService.removeSession(sessionId);
+      throw new InternalServerErrorException("Database has been cleared this user is removed");
+    }
+    return user;
+  }
 }
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index 6b38340a5..8ea10babe 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -1,49 +1,44 @@
 import {
-  INestApplicationContext,
-  Logger
+  Logger,
+  WebSocketAdapter
 } from '@nestjs/common';
+import {BaseWsInstance} from '@nestjs/websockets';
 import {
-  AbstractWsAdapter,
-  BaseWsInstance
-} from '@nestjs/websockets';
-import {
-  CLOSE_EVENT,
   CONNECTION_EVENT,
+  DISCONNECT_EVENT,
   ERROR_EVENT,
-  MESSAGE_METADATA,
-  DISCONNECT_EVENT
+  MESSAGE_METADATA
 } from '@nestjs/websockets/constants';
 import {MessageMappingProperties} from '@nestjs/websockets/gateway-metadata-explorer';
-import {Observable} from 'rxjs';
-import { isFunction } from '@nestjs/common/utils/shared.utils';
+import {isFunction} from '@nestjs/common/utils/shared.utils';
 import {
+  Server,
+  ServerOptions,
   WebSocket,
   WebSocketServer
 } from "ws";
-import {NestApplication} from '@nestjs/core';
-
-
-enum READY_STATE {
-  CONNECTING_STATE = 0,
-  OPEN_STATE = 1,
-  CLOSING_STATE = 2,
-  CLOSED_STATE = 3,
-}
 
 
-export class WsAdapter  {
+export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
 
   private wsServer: WebSocketServer;
 
   constructor(
-    private httpServer: any,
+    private readonly httpServer: any,
     private readonly logger: Logger
   ) {
 
   }
 
   public bindClientConnect(server: BaseWsInstance, callback: Function) {
-    server.on(CONNECTION_EVENT, callback);
+    server.on(CONNECTION_EVENT, async (...args) => {
+     let handler =  args.find(a => a instanceof WebSocket)
+     if (handler.context) {
+       throw Error("WTF");
+     }
+     handler.context = {};
+     await callback(...args, handler.context)
+    });
   }
 
   public bindClientDisconnect(client: BaseWsInstance, callback: Function) {
@@ -57,14 +52,14 @@ export class WsAdapter  {
 
   public create(
     port: number,
-    {path}: {path: string},
+    options,
   ) {
-    if (port !== 0 || !this.httpServer || !path) {
+    if (port !== 0 || !this.httpServer || !options.path) {
       throw Error("Unsupported server configuration");
     }
     this.wsServer = new WebSocketServer({
       noServer: true,
-      path,
+      ...options,
     });
 
     this.httpServer.on('upgrade', (request, socket, head) => {
@@ -83,16 +78,16 @@ export class WsAdapter  {
   public bindMessageHandlers(
     client: WebSocket,
     handlers: MessageMappingProperties[],
-    transform: (data: any) => Observable<any>,
   ) {
     client.on(MESSAGE_METADATA, (data) => {
-      if (client.readyState !== READY_STATE.OPEN_STATE) {
+      if (client.readyState !== client.OPEN) {
         throw Error('asd')
       }
       const parsed = JSON.parse(data as any);
       if (!parsed.action) {
         throw Error("invalid message")
       }
+
       handlers.find(handler => handler.message === parsed.action).callback(parsed);
     });
 
diff --git a/newback/src/utils/consts.ts b/newback/src/utils/consts.ts
index 229996fc6..5d5cb8579 100644
--- a/newback/src/utils/consts.ts
+++ b/newback/src/utils/consts.ts
@@ -1,3 +1,7 @@
 export const ALL_ROOM_ID = 1;
-export const REDIS_SESSIONS_KEY = 'sessions';
 export const MAX_USERNAME_LENGTH = 16;
+
+export enum REDIS_KEYS {
+  REDIS_SESSIONS_KEY = 'sessions',
+  REDIS_ONLINE_KEY = 'online'
+}
diff --git a/newback/src/utils/decorators.ts b/newback/src/utils/decorators.ts
new file mode 100644
index 000000000..c73fe58cb
--- /dev/null
+++ b/newback/src/utils/decorators.ts
@@ -0,0 +1,21 @@
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
+import {WebSocket} from "ws";
+import {WebSocketContextData} from '@/data/types/internal';
+
+
+export const WebsocketContext = createParamDecorator(
+  (data: unknown, ctx: ExecutionContext) => {
+    let handler =  ctx.getArgs().find(a => a instanceof WebSocket)
+    if (!handler.context) {
+      handler.context = {userId: Date.now()} as WebSocketContextData;
+    }
+    return handler.context;
+  },
+);
+
+export const UserId = createParamDecorator(
+  (data: unknown, ctx: ExecutionContext) => {
+    let handler =  ctx.getArgs().find(a => a instanceof WebSocket)
+    return (handler.context as WebSocketContextData);
+  },
+);
diff --git a/newback/src/utils/helpers.ts b/newback/src/utils/helpers.ts
index 12b150d62..7be2a29af 100644
--- a/newback/src/utils/helpers.ts
+++ b/newback/src/utils/helpers.ts
@@ -9,6 +9,7 @@ export function generateUserName(email: string) {
 
 export function generateOrmConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, 'ssl'> {
   const sync = false;
+  // drop database pychat2; create database pychat2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; GRANT ALL ON pychat2.* TO 'pychat'@'localhost';
   return {
     synchronize: sync,
     logging: logging,
@@ -22,6 +23,10 @@ export function generateOrmConfig(logging: ((sql: string) => void)): Omit<Sequel
     sync: {
       force: sync,
     },
+    query: {
+      nest: !sync,
+      // raw: true,
+    },
     define: {
       collate: 'utf8mb4_general_ci',
       charset: 'utf8mb4',
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index e3bfec7c3..9910e43cb 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -3,6 +3,13 @@
      "paths": {
       "@/*": ["src/*"]
     },
+    "plugins": [
+      { "transform": "typescript-transform-paths" },
+      {
+        "transform": "tsruntime/dist/transform/transformer.js",
+        "type": "program"
+      }
+    ],
     "module": "commonjs",
     "declaration": true,
     "removeComments": true,
diff --git a/newback/yarn.lock b/newback/yarn.lock
index a67adc6e2..790571882 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -347,6 +347,13 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@eveble/helpers@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@eveble/helpers/-/helpers-1.0.3.tgz#4cedc4df777dfd2a7bac2387a7537bc22abbd3a1"
+  integrity sha512-gR/PKgh8yGIu6pHNrgaqb/Rgf9di6+rKQXXxofnRWVgP1pgQOpAb4TcqYJS/QV4JVSne5P0mc1oFo98jXbmprw==
+  dependencies:
+    reflect-metadata "^0.1.13"
+
 "@humanwhocodes/config-array@^0.9.2":
   version "0.9.5"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
@@ -2237,6 +2244,11 @@ dedent@^0.7.0:
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
+deep-diff@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-1.0.2.tgz#afd3d1f749115be965e89c63edc7abb1506b9c26"
+  integrity sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==
+
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -2575,6 +2587,11 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es6-error@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
+  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
+
 es7-shim@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/es7-shim/-/es7-shim-6.0.0.tgz#0c430b40b8505ad15570721a8d8dd4eb0c553155"
@@ -4651,7 +4668,7 @@ lodash.some@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
   integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
 
-lodash@4.17.21, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5380,6 +5397,11 @@ pluralize@^3.1.0:
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-3.1.0.tgz#84213d0a12356069daa84060c559242633161368"
   integrity sha1-hCE9ChI1YGnaqEBgxVkkJjMWE2g=
 
+polytype@^0.9.4:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/polytype/-/polytype-0.9.4.tgz#38082d6e345670ca1963a0ef58f72d564290fae1"
+  integrity sha512-pkS84YcAEPHkIWEYKd9/QDmYPIhlmQeOUYwEO7IQRGEvlIkNIKCs6r4zhFSdTCNAEiCnfCgINHQNDfShlS2snw==
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -5776,7 +5798,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.1.6, resolve@^1.15.1, resolve@^1.20.0:
+resolve@>=1.9.0, resolve@^1.1.6, resolve@^1.15.1, resolve@^1.20.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -6527,11 +6549,6 @@ ts-node@^10.7.0:
     v8-compile-cache-lib "^3.0.0"
     yn "3.1.1"
 
-tsconfig-paths-jest@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths-jest/-/tsconfig-paths-jest-0.0.1.tgz#a977a5648c434037b69884e644ce1b82bf025b68"
-  integrity sha1-qXelZIxDQDe2mITmRM4bgr8CW2g=
-
 tsconfig-paths-webpack-plugin@3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz#01aafff59130c04a8c4ebc96a3045c43c376449a"
@@ -6561,6 +6578,11 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tsruntime@^3.0.0-beta.1:
+  version "3.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/tsruntime/-/tsruntime-3.0.0-beta.1.tgz#3e3dd8239f328fb9b106933fcb00d67dc103afcc"
+  integrity sha512-volvVq4rMMPyS3LcuXagPpEepSqSgnAWqi8D/RDDDAbc4NSxY4HAcI5tOoWztGhW3LFA+xbmzlLGPYJeniJfag==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -6568,6 +6590,13 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
+ttypescript@^1.5.10, ttypescript@^1.5.13:
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/ttypescript/-/ttypescript-1.5.13.tgz#c3bcb760599fe49157d30c5d5895a0023cbb7f30"
+  integrity sha512-KT/RBfGGlVJFqEI8cVvI3nMsmYcFvPSZh8bU0qX+pAwbi7/ABmYkzn7l/K8skw0xmYjVCoyaV6WLsBQxdadybQ==
+  dependencies:
+    resolve ">=1.9.0"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -6617,6 +6646,28 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typend@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/typend/-/typend-1.1.1.tgz#1159c090239c9b1b82249660f07a0d5be99de096"
+  integrity sha512-oSme4CVDzhv8IsSHPgm1B61wM6mZuj+i8ITcOnTP4jeg1S1q3eL3cfN247eMZmxOtC4cvdWUAoecIk1Y879qBA==
+  dependencies:
+    "@eveble/helpers" "^1.0.3"
+    deep-diff "^1.0.2"
+    deepmerge "^4.2.2"
+    es6-error "^4.1.1"
+    lodash "^4.17.15"
+    polytype "^0.9.4"
+    reflect-metadata "^0.1.13"
+    tsruntime "^3.0.0-beta.1"
+    ttypescript "^1.5.10"
+
+typescript-transform-paths@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/typescript-transform-paths/-/typescript-transform-paths-3.3.1.tgz#74526bc1b6dc575ffe269cc81833db7bd81763e1"
+  integrity sha512-c+8Cqd2rsRtTU68rJI0NX/OtqgBDddNs1fIxm1nCNyhn0WpoyqtpUxc1w9Ke5c5kgE4/OT5xYbKf2cf694RYEg==
+  dependencies:
+    minimatch "^3.0.4"
+
 typescript@4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"

From 99f325b2ae6bd052d51046e8cf1bab857521fc57 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 14 Apr 2022 23:56:52 +0300
Subject: [PATCH 055/221] Fixed types

---
 common/dto.ts                                 |   3 +
 frontend/src/ts/classes/DatabaseWrapper.ts    |  59 +++----
 frontend/src/ts/classes/DefaultStore.ts       |  33 ++--
 frontend/src/ts/classes/LocalStorage.ts       |   4 +-
 .../src/ts/message_handlers/MessageHelper.ts  |   4 +-
 .../src/ts/message_handlers/RomHandler.ts     |  21 +--
 frontend/src/ts/message_handlers/WsHandler.ts |  21 +--
 .../ts/message_handlers/WsMessageHandler.ts   |  33 ++--
 frontend/src/ts/types/converters.ts           |  38 ++---
 frontend/src/ts/types/db.ts                   |  17 +-
 frontend/src/ts/types/dto.ts                  |  10 +-
 .../src/ts/types/messages/innerMessages.ts    |   4 +-
 frontend/src/ts/types/messages/p2pDto.ts      |   4 +-
 frontend/src/ts/types/messages/p2pMessages.ts |   2 +-
 frontend/src/ts/types/model.ts                |  37 +++--
 frontend/src/ts/types/types.ts                |   7 +-
 frontend/src/ts/utils/htmlApi.ts              |   6 +-
 frontend/src/ts/utils/pureFunctions.ts        |   6 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           |   4 +-
 .../webrtc/message/MessagePeerConnection.ts   |  10 +-
 .../webrtc/message/MessageTransferHandler.ts  |   3 +-
 frontend/src/vue/chat/call/IncomingCall.vue   |   2 +-
 frontend/src/vue/chat/chatbox/ChatBox.vue     |   3 +-
 frontend/src/vue/chat/chatbox/ChatNavBar.vue  |   2 +-
 .../vue/chat/chatbox/ChatShowUserTyping.vue   |   2 +-
 .../src/vue/chat/chatbox/UserImageIcon.vue    |  10 +-
 .../chat/message/ChatSendingFileTransfer.vue  |   2 +-
 .../vue/chat/message/ChatSendingMessage.vue   |  11 +-
 .../chat/message/ChatUserActionMessage.vue    |   2 +-
 frontend/src/vue/chat/right/RoomRightIcon.vue |   3 +-
 frontend/src/vue/chat/right/UserNavInfo.vue   |   2 +-
 frontend/src/vue/chat/right/UserRow.vue       |   2 +-
 .../src/vue/chat/textarea/ChatTagging.vue     |   4 +-
 .../src/vue/chat/textarea/ChatTextArea.vue    |   2 +-
 frontend/src/vue/pages/ChannelSettings.vue    |  10 +-
 frontend/src/vue/pages/RoomSettings.vue       |  22 +--
 frontend/src/vue/pages/RoomUsersListPage.vue  |   2 +-
 .../vue/pages/UserProfileChangePassword.vue   |   2 +-
 frontend/src/vue/pages/UserProfileImage.vue   |   2 +-
 frontend/src/vue/pages/UserProfileInfo.vue    |   2 +-
 .../src/vue/pages/UserProfileSettings.vue     |   6 -
 frontend/src/vue/pages/ViewProfilePage.vue    |   2 +-
 frontend/src/vue/parts/CreateRoom.vue         |   2 +-
 frontend/src/vue/parts/PickUser.vue           |   4 +-
 frontend/src/vue/ui/AppMenuBar.vue            |   4 +-
 newback/src/data/model/ip.address.model.ts    |   3 +-
 newback/src/data/model/room.model.ts          |   5 +-
 newback/src/data/model/room.users.model.ts    |   3 +-
 .../data/model/subscription.message.model.ts  |   3 +-
 newback/src/data/model/subscription.model.ts  |   3 +-
 newback/src/data/model/user.settings.model.ts |  15 +-
 newback/src/data/model/verification.model.ts  |   3 +-
 newback/src/data/types/internal.ts            |   3 +
 .../api/websocket/websocket.gateway.ts        |  31 ++--
 .../modules/api/websocket/ws.transformer.ts   | 145 +++++++++++-------
 .../modules/rest/password/password.service.ts |   3 +-
 .../src/modules/rest/ws.adapter/ws.adapter.ts |   8 +-
 newback/src/utils/decorators.ts               |  37 ++++-
 58 files changed, 401 insertions(+), 292 deletions(-)

diff --git a/common/dto.ts b/common/dto.ts
index ed5a2893c..f222982a6 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -340,6 +340,7 @@ export interface AddOnlineUserMessage extends DefaultWsInMessage<"addOnlineUser"
 }
 
 export interface CreateNewUsedMessage extends DefaultWsInMessage<"createNewUser", "room">, UserDto {
+  id: number;
   rooms: {
     roomId: number;
     users: number[];
@@ -625,3 +626,5 @@ export type BlobType =
   | "i"
   | "m"
   | "v";
+
+export const WS_SESSION_EXPIRED_CODE = 4001;
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index ace8e4eba..d1d5dcae2 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -6,14 +6,13 @@ import type {
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {
-  BlobType,
   ChannelModel,
   ChannelsDictModel,
   CurrentUserInfoModel,
   CurrentUserSettingsModel,
   FileModel,
   MessageModel,
-  MessageStatus,
+  MessageStatusModel,
   RoomDictModel,
   RoomModel,
   RoomSettingsModel,
@@ -37,6 +36,11 @@ import type {
 } from "@/ts/types/db";
 import type {SetStateFromStorage} from "@/ts/types/dto";
 import type {MainWindow} from "@/ts/classes/MainWindow";
+import {
+  BlobType,
+  MessageStatus
+} from '@/ts/types/backend';
+import {MessageStatusInner} from '@/ts/types/model';
 
 type TransactionCb = (t: SQLTransaction, ...rest: unknown[]) => void;
 type QueryObject = [string, any[]];
@@ -57,7 +61,7 @@ export default class DatabaseWrapper implements IStorage {
     if (!window.openDatabase) {
       throw Error("DatabaseWrapper not supported");
     }
-    this.db = window.openDatabase("v158", "", "Messages database", 10 * 1024 * 1024);
+    this.db = window.openDatabase("v159", "", "Messages database", 10 * 1024 * 1024);
     this.logger = loggerFactory.getLoggerColor("db", "#753e01");
   }
 
@@ -67,14 +71,14 @@ export default class DatabaseWrapper implements IStorage {
       let t: SQLTransaction = await new Promise<SQLTransaction>((resolve, reject) => {
         this.db.changeVersion(this.db.version, "1.0", resolve, reject);
       });
-      t = await this.runSql(t, "CREATE TABLE user (id integer primary key, user text, sex text NOT NULL CHECK (sex IN ('MALE', 'FEMALE','OTHER')), deleted boolean NOT NULL CHECK (deleted IN (0,1)), country_code text, country text, region text, city text, thumbnail text, last_time_online integer)");
-      t = await this.runSql(t, "CREATE TABLE channel (id integer primary key, name text, deleted boolean NOT NULL CHECK (deleted IN (0,1)), creator INTEGER REFERENCES user(id))");
-      t = await this.runSql(t, "CREATE TABLE room (id integer primary key, name text, p2p boolean NOT NULL CHECK (p2p IN (0,1)), notifications boolean NOT NULL CHECK (notifications IN (0,1)), volume integer, deleted boolean NOT NULL CHECK (deleted IN (0,1)), channel_id INTEGER REFERENCES channel(id), is_main_in_channel boolean NOT NULL CHECK (is_main_in_channel IN (0,1)), creator INTEGER REFERENCES user(id))");
+      t = await this.runSql(t, "CREATE TABLE user (id integer primary key, username text, sex text NOT NULL CHECK (sex IN ('MALE', 'FEMALE','OTHER')), deleted boolean NOT NULL CHECK (deleted IN (0,1)), country_code text, country text, region text, city text, thumbnail text, last_time_online integer)");
+      t = await this.runSql(t, "CREATE TABLE channel (id integer primary key, name text, deleted boolean NOT NULL CHECK (deleted IN (0,1)), creator_id INTEGER REFERENCES user(id))");
+      t = await this.runSql(t, "CREATE TABLE room (id integer primary key, name text, p2p boolean NOT NULL CHECK (p2p IN (0,1)), notifications boolean NOT NULL CHECK (notifications IN (0,1)), volume integer, deleted boolean NOT NULL CHECK (deleted IN (0,1)), channel_id INTEGER REFERENCES channel(id), is_main_in_channel boolean NOT NULL CHECK (is_main_in_channel IN (0,1)), creator_id INTEGER REFERENCES user(id))");
       t = await this.runSql(t, "CREATE TABLE message (id integer primary key, time integer, content text, symbol text, deleted boolean NOT NULL CHECK (deleted IN (0,1)), edited integer, room_id integer REFERENCES room(id), user_id integer REFERENCES user(id), status text, parent_message_id INTEGER REFERENCES message(id) ON UPDATE CASCADE, thread_messages_count INTEGER)");
       t = await this.runSql(t, "CREATE TABLE file (id integer primary key, sending boolean NOT NULL CHECK (sending IN (0,1)), preview_file_id integer, file_id integer, server_id integer UNIQUE, symbol text, url text, message_id INTEGER REFERENCES message(id) ON UPDATE CASCADE , type text, preview text)");
       t = await this.runSql(t, "CREATE TABLE tag (id integer primary key, user_id INTEGER REFERENCES user(id), message_id INTEGER REFERENCES message(id) ON UPDATE CASCADE, symbol text)");
       t = await this.runSql(t, "CREATE TABLE settings (user_id integer primary key, embedded_youtube boolean NOT NULL CHECK (embedded_youtube IN (0,1)), highlight_code boolean NOT NULL CHECK (highlight_code IN (0,1)), incoming_file_call_sound boolean NOT NULL CHECK (incoming_file_call_sound IN (0,1)), message_sound boolean NOT NULL CHECK (message_sound IN (0,1)), online_change_sound boolean NOT NULL CHECK (online_change_sound IN (0,1)), send_logs boolean NOT NULL CHECK (send_logs IN (0,1)), suggestions boolean NOT NULL CHECK (suggestions IN (0,1)), theme text, logs text, show_when_i_typing boolean NOT NULL CHECK (show_when_i_typing IN (0,1)))");
-      t = await this.runSql(t, "CREATE TABLE profile (user_id integer primary key, user text, name text, city text, surname text, email text, birthday text, contacts text, image text, sex integer NOT NULL CHECK (sex IN (0,1,2)))");
+      t = await this.runSql(t, "CREATE TABLE profile (user_id integer primary key, username text, name text, city text, surname text, email text, birthday text, contacts text, thumbnail text, sex integer NOT NULL CHECK (sex IN (0,1,2)))");
       t = await this.runSql(t, "CREATE TABLE room_users (room_id INTEGER REFERENCES room(id), user_id INTEGER REFERENCES user(id))");
       this.logger.log("DatabaseWrapper has been initialized")();
       return null;
@@ -117,7 +121,7 @@ export default class DatabaseWrapper implements IStorage {
       t,
       "insert or replace into message (id, time, content, symbol, deleted, edited, room_id, user_id, status, parent_message_id, thread_messages_count) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
       [message.id, message.time, message.content, message.symbol || null, message.deleted ? 1 : 0, message.edited, message.roomId, message.userId, message.status, message.parentMessage || null, message.threadMessagesCount],
-      (t, d) => {
+      (t) => {
         for (const k in message.files) {
           const f = message.files[k];
           this.executeSql(t, "insert or replace into file (server_id, file_id, preview_file_id, symbol, url, message_id, type, preview, sending) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", [f.serverId, f.fileId, f.previewFileId, k, f.url, message.id, f.type, f.preview, f.sending ? 1 : 0])();
@@ -241,8 +245,8 @@ export default class DatabaseWrapper implements IStorage {
 
   public getInsertUser(user: UserModel): QueryObject {
     return [
-      "insert or replace into user (id, user, sex, deleted, country_code, country, region, city, last_time_online, thumbnail) values (?, ?, ?, 0, ?, ?, ?, ?, ?, ?)",
-      [user.id, user.user, user.sex, user.location.countryCode, user.location.country, user.location.region, user.location.city, user.lastTimeOnline, user.image],
+      "insert or replace into user (id, username, sex, deleted, country_code, country, region, city, last_time_online, thumbnail) values (?, ?, ?, 0, ?, ?, ?, ?, ?, ?)",
+      [user.id, user.username, user.sex, user.location.countryCode, user.location.country, user.location.region, user.location.city, user.lastTimeOnline, user.thumbnail],
     ];
   }
 
@@ -259,7 +263,7 @@ export default class DatabaseWrapper implements IStorage {
     });
   }
 
-  public setMessagesStatus(messagesIds: number[], status: MessageStatus): void {
+  public setMessagesStatus(messagesIds: number[], status: MessageStatusModel): void {
     this.write((t) => {
       this.executeSql(t, `update message set status = ? where id in ${this.idsToString(messagesIds)}`, [status])();
     });
@@ -267,13 +271,13 @@ export default class DatabaseWrapper implements IStorage {
 
   public setUserProfile(user: CurrentUserInfoModel) {
     this.write((t) => {
-      this.executeSql(t, "insert or replace into profile (user_id, user, name, city, surname, email, birthday, contacts, sex, image) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [user.userId, user.user, user.name, user.city, user.surname, user.email, user.birthday, user.contacts, user.sex, user.image])();
+      this.executeSql(t, "insert or replace into profile (user_id, username, name, city, surname, email, birthday, contacts, sex, thumbnail) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [user.id, user.username, user.name, user.city, user.surname, user.email, user.birthday, user.contacts, user.sex, user.thumbnail])();
     });
   }
 
   public setUserSettings(settings: CurrentUserSettingsModel) {
     this.write((t) => {
-      this.executeSql(t, "insert or replace into settings (user_id, embedded_youtube, highlight_code, incoming_file_call_sound, message_sound, online_change_sound, send_logs, suggestions, theme, logs, show_when_i_typing) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [1, settings.embeddedYoutube ? 1 : 0, settings.highlightCode ? 1 : 0, settings.incomingFileCallSound ? 1 : 0, settings.messageSound ? 1 : 0, settings.onlineChangeSound ? 1 : 0, settings.sendLogs ? 1 : 0, settings.suggestions ? 1 : 0, settings.theme, settings.logs, settings.showWhenITyping ? 1 : 0])();
+      this.executeSql(t, "insert or replace into settings (user_id, embedded_youtube, highlight_code, incoming_file_call_sound, message_sound, online_change_sound, suggestions, theme, logs, show_when_i_typing) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [1, settings.embeddedYoutube ? 1 : 0, settings.highlightCode ? 1 : 0, settings.incomingFileCallSound ? 1 : 0, settings.messageSound ? 1 : 0, settings.onlineChangeSound ? 1 : 0, settings.suggestions ? 1 : 0, settings.theme, settings.logs, settings.showWhenITyping ? 1 : 0])();
     });
   }
 
@@ -316,7 +320,7 @@ export default class DatabaseWrapper implements IStorage {
 
   public updateRoom(r: RoomSettingsModel) {
     this.write((t) => {
-      this.executeSql(t, "update room set name = ?, volume = ?, notifications = ?, p2p = ?, creator = ?, is_main_in_channel = ?, channel_id = ? where id = ? ", [r.name, r.volume, r.notifications ? 1 : 0, r.p2p ? 1 : 0, r.creator, r.isMainInChannel ? 1 : 0, r.channelId, r.id])();
+      this.executeSql(t, "update room set name = ?, volume = ?, notifications = ?, p2p = ?, creator_id = ?, is_main_in_channel = ?, channel_id = ? where id = ? ", [r.name, r.volume, r.notifications ? 1 : 0, r.p2p ? 1 : 0, r.creatorId, r.isMainInChannel ? 1 : 0, r.channelId, r.id])();
     });
   }
 
@@ -427,13 +431,13 @@ export default class DatabaseWrapper implements IStorage {
     const roomsDict: RoomDictModel = {};
     dbRooms.forEach((r: RoomDB) => {
       const rm: RoomModel = getRoomsBaseDict({
-        roomId: r.id,
+        id: r.id,
         p2p: convertToBoolean(r.p2p),
         notifications: convertToBoolean(r.notifications),
         isMainInChannel: convertToBoolean(r.is_main_in_channel),
         name: r.name,
         channelId: r.channel_id,
-        roomCreatorId: r.creator,
+        creatorId: r.creator_id,
         users: [],
         volume: r.volume,
       });
@@ -465,7 +469,7 @@ export default class DatabaseWrapper implements IStorage {
         threadMessagesCount: m.thread_messages_count,
         deleted: convertToBoolean(m.deleted),
         tags,
-        transfer: m.status === "sending" ? {
+        transfer: m.status === MessageStatusInner.SENDING ? {
           error: null,
           xhr: null,
           upload: null,
@@ -514,8 +518,8 @@ export default class DatabaseWrapper implements IStorage {
         id: u.id,
         lastTimeOnline: u.last_time_online,
         sex: u.sex,
-        image: u.thumbnail,
-        user: u.user,
+        thumbnail: u.thumbnail,
+        username: u.username,
         location: {
           region: u.region,
           city: u.city,
@@ -532,9 +536,9 @@ export default class DatabaseWrapper implements IStorage {
     const channelsDict: ChannelsDictModel = {};
     dbChannels.forEach((c: ChannelDB) => {
       const chm: ChannelModel = getChannelDict({
-        channelId: c.id,
-        channelName: c.name,
-        channelCreatorId: c.creator,
+        id: c.id,
+        name: c.name,
+        creatorId: c.creator_id,
       });
       channelsDict[c.id] = chm;
     });
@@ -549,7 +553,6 @@ export default class DatabaseWrapper implements IStorage {
       messageSound: convertToBoolean(dbSettings.message_sound),
       showWhenITyping: convertToBoolean(dbSettings.show_when_i_typing),
       onlineChangeSound: convertToBoolean(dbSettings.online_change_sound),
-      sendLogs: convertToBoolean(dbSettings.send_logs),
       suggestions: convertToBoolean(dbSettings.suggestions),
       theme: dbSettings.theme,
       logs: dbSettings.logs,
@@ -560,14 +563,14 @@ export default class DatabaseWrapper implements IStorage {
     return {
       sex: dbProfile.sex,
       contacts: dbProfile.contacts,
-      image: dbProfile.image,
+      thumbnail: dbProfile.thumbnail,
       birthday: dbProfile.birthday,
       email: dbProfile.email,
       surname: dbProfile.surname,
       city: dbProfile.city,
       name: dbProfile.name,
-      userId: dbProfile.user_id,
-      user: dbProfile.user,
+      id: dbProfile.user_id,
+      username: dbProfile.username,
     };
   }
 
@@ -659,10 +662,10 @@ export default class DatabaseWrapper implements IStorage {
   }
 
   private getSetRoomQuery(t: SQLTransaction, room: RoomSettingsModel): QueryObject {
-    return ["insert or replace into room (id, name, notifications, volume, deleted, channel_id, p2p, creator, is_main_in_channel) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", [room.id, room.name, room.notifications ? 1 : 0, room.volume, 0, room.channelId, room.p2p ? 1 : 0, room.creator, room.isMainInChannel ? 1 : 0]];
+    return ["insert or replace into room (id, name, notifications, volume, deleted, channel_id, p2p, creator_id, is_main_in_channel) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", [room.id, room.name, room.notifications ? 1 : 0, room.volume, 0, room.channelId, room.p2p ? 1 : 0, room.creatorId, room.isMainInChannel ? 1 : 0]];
   }
 
   private setChannel(t: SQLTransaction, channel: ChannelModel) {
-    this.executeSql(t, "insert or replace into channel (id, name, deleted, creator) values (?, ?, ?, ?)", [channel.id, channel.name, 0, channel.creator])();
+    this.executeSql(t, "insert or replace into channel (id, name, deleted, creator_id) values (?, ?, ?, ?)", [channel.id, channel.name, 0, channel.creatorId])();
   }
 }
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index a0c977cd4..503c9588b 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -8,11 +8,10 @@ import type {
   CurrentUserInfoModel,
   IncomingCallModel,
   Location,
-  MessageStatus,
+  MessageStatusModel,
   PastingTextAreaElement,
   RoomDictModel,
   SendingFileTransfer,
-
   UserDictModel,
 } from "@/ts/types/model";
 import {
@@ -23,6 +22,7 @@ import {
   GrowlModel,
   GrowlType,
   MessageModel,
+  MessageStatusInner,
   ReceivingFile,
   RoomModel,
   RoomSettingsModel,
@@ -64,6 +64,7 @@ import {
   StringIdentifier,
 } from "@/ts/types/types";
 import {
+  MessageStatus,
   SetStateFromStorage,
   SetStateFromWS,
 } from "@/ts/types/dto";
@@ -167,7 +168,7 @@ export class DefaultStore extends VuexModule {
   }
 
   get userName(): (id: number) => string {
-    return (id: number): string => this.allUsersDict[id].user;
+    return (id: number): string => this.allUsersDict[id].username;
   }
 
   get privateRooms(): RoomModel[] {
@@ -282,7 +283,7 @@ export class DefaultStore extends VuexModule {
             rooms: [],
             mainRoom: null!,
             name: channel.name,
-            creator: channel.creator,
+            creatorId: channel.creatorId,
           };
         }
         if (current.isMainInChannel) {
@@ -314,7 +315,7 @@ export class DefaultStore extends VuexModule {
   }
 
   get myId(): number | null {
-    return this.userInfo?.userId ?? null;
+    return this.userInfo?.id ?? null;
   }
 
   get privateRoomsUsersIds(): PrivateRoomsIds {
@@ -599,7 +600,7 @@ export class DefaultStore extends VuexModule {
     }: {
       roomId: number;
       messagesIds: number[];
-      status: MessageStatus;
+      status: MessageStatusModel;
     },
   ) {
     const ids = Object.values(this.roomsDict[roomId].messages).filter((m) => messagesIds.includes(m.id)).
@@ -654,7 +655,7 @@ export class DefaultStore extends VuexModule {
      */
     if (m.parentMessage && om[m.parentMessage] && !om[m.id] &&
       // And this message is not from us (otherwise we already increased message count when sending it and storing in store)
-      !(m.userId === this.userInfo?.userId && m.id > 0)) {
+      !(m.userId === this.userInfo?.id && m.id > 0)) {
       om[m.parentMessage].threadMessagesCount++;
       this.storage.setThreadMessageCount(m.parentMessage, om[m.parentMessage].threadMessagesCount);
     }
@@ -702,8 +703,8 @@ export class DefaultStore extends VuexModule {
     const markSendingIds: number[] = [];
     m.messagesId.forEach((messageId) => {
       const message = this.roomsDict[m.roomId].messages[messageId];
-      if (message.status === "sending") {
-        message.status = "on_server";
+      if (message.status === MessageStatusInner.SENDING) {
+        message.status = MessageStatus.ON_SERVER;
         markSendingIds.push(messageId);
       }
     });
@@ -886,19 +887,19 @@ export class DefaultStore extends VuexModule {
   }
 
   @Mutation
-  public setUser(user: {id: number; sex: Gender; user: string; image: string}) {
-    this.allUsersDict[user.id].user = user.user;
+  public setUser(user: {id: number; sex: Gender; username: string; thumbnail: string}) {
+    this.allUsersDict[user.id].username = user.username;
     this.allUsersDict[user.id].sex = user.sex;
-    this.allUsersDict[user.id].image = user.image;
+    this.allUsersDict[user.id].thumbnail = user.thumbnail;
     this.storage.saveUser(this.allUsersDict[user.id]);
   }
 
   @Mutation
   public setUserInfo(userInfo: CurrentUserInfoWoImage) {
-    const image: string | null = this.userInfo?.image || null;
+    const thumbnail: string | null = this.userInfo?.thumbnail || null;
     const newUserInfo: CurrentUserInfoModel = {
       ...userInfo,
-      image,
+      thumbnail,
     };
     this.userInfo = newUserInfo;
     this.storage.setUserProfile(this.userInfo);
@@ -911,8 +912,8 @@ export class DefaultStore extends VuexModule {
   }
 
   @Mutation
-  public setUserImage(image: string) {
-    this.userInfo!.image = image;
+  public setUserImage(thumbnail: string) {
+    this.userInfo!.thumbnail = thumbnail;
     this.storage.setUserProfile(this.userInfo!);
   }
 
diff --git a/frontend/src/ts/classes/LocalStorage.ts b/frontend/src/ts/classes/LocalStorage.ts
index bf79f60c6..8ab30a1c5 100644
--- a/frontend/src/ts/classes/LocalStorage.ts
+++ b/frontend/src/ts/classes/LocalStorage.ts
@@ -9,11 +9,11 @@ import type {
   CurrentUserInfoModel,
   CurrentUserSettingsModel,
   MessageModel,
-  MessageStatus,
   RoomSettingsModel,
   UserModel,
 } from "@/ts/types/model";
 import type {Logger} from "lines-logger";
+import {MessageStatusModel} from '@/ts/types/model';
 
 interface LocalStorageMessage {
   f: number;
@@ -108,7 +108,7 @@ export default class LocalStorage implements IStorage {
   public setUsers(users: UserModel[]) {
   }
 
-  public setMessagesStatus(messagesIds: number[], status: MessageStatus) {
+  public setMessagesStatus(messagesIds: number[], status: MessageStatusModel) {
   }
 
   public saveUser(users: UserModel) {
diff --git a/frontend/src/ts/message_handlers/MessageHelper.ts b/frontend/src/ts/message_handlers/MessageHelper.ts
index 9ec9aafef..4ad3f245f 100644
--- a/frontend/src/ts/message_handlers/MessageHelper.ts
+++ b/frontend/src/ts/message_handlers/MessageHelper.ts
@@ -51,9 +51,9 @@ export class MessageHelper {
     const room = this.store.roomsDict[message.roomId];
 
     if (room.notifications) {
-      const title = this.store.allUsersDict[message.userId].user;
+      const title = this.store.allUsersDict[message.userId].username;
 
-      let icon: string = resolveMediaUrl(this.store.allUsersDict[message.userId].image) || faviconUrl;
+      let icon: string = resolveMediaUrl(this.store.allUsersDict[message.userId].thumbnail) || faviconUrl;
       if (message.files) {
         const fff: FileModel = Object.values(message.files)[0];
         if (fff?.url) {
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index a1fa8f6d7..a4645a765 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -142,6 +142,7 @@ export class RoomHandler extends MessageHandler {
   }
 
   public addChannel(message: AddChannelMessage) {
+    // @ts-expect-error
     this.mutateRoomAddition(message, "room_created");
   }
 
@@ -181,7 +182,7 @@ export class RoomHandler extends MessageHandler {
         roomLog: {
           action: "joined this room",
           time: Date.now(),
-          userId: message.userId,
+          userId: message.id,
         },
       });
       this.notifyDevicesChanged(null, roomId, "someone_joined");
@@ -206,8 +207,8 @@ export class RoomHandler extends MessageHandler {
   }
 
   public saveChannelSettings(message: SaveChannelSettingsMessage) {
-    if (!this.store.channelsDict[message.channelId]) {
-      this.logger.error("Unable to find channel to edit {} to kick user, available are {}", message.channelId, Object.keys(this.store.channelsDict))();
+    if (!this.store.channelsDict[message.id]) {
+      this.logger.error("Unable to find channel to edit {} to kick user, available are {}", message.id, Object.keys(this.store.channelsDict))();
     } else {
       const c: ChannelModel = getChannelDict(message);
       this.store.addChannel(c);
@@ -237,15 +238,15 @@ export class RoomHandler extends MessageHandler {
   }
 
   public saveRoomSettings(message: SaveRoomSettingsMessage) {
-    const oldRoom = this.store.roomsDict[message.roomId];
+    const oldRoom = this.store.roomsDict[message.id];
     if (!oldRoom) {
-      this.logger.error("Unable to find channel to edit {} to kick user, available are {}", message.roomId, Object.keys(this.store.roomsDict))();
+      this.logger.error("Unable to find channel to edit {} to kick user, available are {}", message.id, Object.keys(this.store.roomsDict))();
     } else {
       const r: RoomSettingsModel = getRoom(message);
       const oldRoomP2p: boolean = oldRoom.p2p;
       this.store.setRoomSettings(r);
       if (oldRoomP2p !== message.p2p) {
-        this.notifyDevicesChanged(null, message.roomId, message.p2p ? "room_created" : "i_deleted");
+        this.notifyDevicesChanged(null, message.id, message.p2p ? "room_created" : "i_deleted");
       }
     }
   }
@@ -272,14 +273,14 @@ export class RoomHandler extends MessageHandler {
     this.logger.debug("set users {}", users)();
     const um: UserDictModel = {};
     users.forEach((u) => {
-      um[u.userId] = convertUser(u, null);
+      um[u.id] = convertUser(u, null);
     });
 
     this.logger.debug("Setting rooms")();
     const storeRooms: RoomDictModel = {};
     const {roomsDict} = this.store;
     rooms.forEach((newRoom: RoomDto) => {
-      const oldRoom = roomsDict[newRoom.roomId];
+      const oldRoom = roomsDict[newRoom.id];
       const rm: RoomModel = getRoomsBaseDict(newRoom, oldRoom);
       storeRooms[rm.id] = rm;
     });
@@ -287,7 +288,7 @@ export class RoomHandler extends MessageHandler {
     this.logger.debug("Setting channels")();
     const {channelsDict} = this.store;
     const storeChannel: ChannelsDictModel = channels.reduce((dict: ChannelsDictModel, newChannel: ChannelDto) => {
-      const oldChannel = channelsDict[newChannel.channelId];
+      const oldChannel = channelsDict[newChannel.id];
       const cm: ChannelModel = getChannelDict(newChannel, oldChannel);
       dict[cm.id] = cm;
       return dict;
@@ -370,6 +371,6 @@ export class RoomHandler extends MessageHandler {
       },
     });
     // Eiher I created this room, either I was invited to this room
-    this.notifyDevicesChanged(null, message.roomId, type); // TODO messageTransferhandler should be created or should id?
+    this.notifyDevicesChanged(null, message.id, type); // TODO messageTransferhandler should be created or should id?
   }
 }
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 97e8757ed..e1b843afd 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -15,7 +15,6 @@ import type {
   CurrentUserInfoWoImage,
   CurrentUserSettingsModel,
   Location,
-  MessageStatus,
 } from "@/ts/types/model";
 import type {
   MessageSupplier,
@@ -65,6 +64,10 @@ import type {
   HandlerTypes,
 } from "@/ts/types/backend";
 import type Subscription from "@/ts/classes/Subscription";
+import {
+  MessageStatus,
+  WS_SESSION_EXPIRED_CODE
+} from '@/ts/types/backend';
 
 enum WsState {
   NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
@@ -541,7 +544,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
 
   public setUserProfile(m: SetUserProfileMessage) {
     const a: CurrentUserInfoWoImage = currentUserInfoDtoToModel(m.content);
-    a.userId = this.store.userInfo!.userId; // This could came only when we logged in
+    a.id = this.store.userInfo!.id; // This could came only when we logged in
     this.store.setUserInfo(a);
   }
 
@@ -555,9 +558,9 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
 
   public async setWsId(message: SetWsIdMessage) {
     this.wsConnectionId = message.opponentWsId;
-    this.setUserInfo(message.userInfo);
-    this.setUserSettings(message.userSettings);
-    this.setUserImage(message.userInfo.userImage);
+    this.setUserInfo(message.profile);
+    this.setUserSettings(message.settings);
+    this.setUserImage(message.profile.thumbnail);
     this.timeDiffWithServer = Date.now() - message.time;
     const pubSetRooms: PubSetRooms = {
       action: "init",
@@ -587,9 +590,9 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
 
   public userProfileChanged(message: UserProfileChangedMessage) {
     this.store.setUser({
-      id: message.userId,
-      user: message.user,
-      image: message.userImage,
+      id: message.id,
+      username: message.username,
+      thumbnail: message.thumbnail,
       sex: message.sex,
     });
   }
@@ -706,7 +709,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
       this.noServerPingTimeout = null;
     }
     const reason = e.reason || e;
-    if (e.code === 403) {
+    if (e.code === WS_SESSION_EXPIRED_CODE) {
       const message = `Server has forbidden request because '${reason}'. Logging out...`;
       this.logger.error("onWsClose {}", message)();
       this.store.growlError(message);
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 5fe47506a..f7dd08190 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -13,9 +13,9 @@ import type {
 import type {
   FileModel,
   MessageModel,
-  MessageStatus,
   RoomModel,
 } from "@/ts/types/model";
+import {MessageStatusInner} from '@/ts/types/model';
 import type {Logger} from "lines-logger";
 
 import type {
@@ -23,18 +23,17 @@ import type {
   MessageModelDto,
   SaveFileResponse,
 } from "@/ts/types/dto";
+import {MessageStatus} from '@/ts/types/dto';
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {
+  DeleteMessage,
+  EditMessage,
   HandlerName,
   HandlerType,
   HandlerTypes,
-} from "@/ts/types/backend";
-import type {
-  DeleteMessage,
-  EditMessage,
   MessagesResponseMessage,
   PrintMessage,
   SetMessageStatusMessage,
@@ -98,7 +97,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     await this.ws.setMessageStatus(
       messagesIds,
       roomId,
-      "read",
+      MessageStatus.READ,
     );
   }
 
@@ -114,7 +113,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
         if (room.p2p) {
           continue;
         }
-        const messages = Object.values(room.messages).filter((m) => m.status === "sending");
+        const messages = Object.values(room.messages).filter((m) => m.status === MessageStatusInner.SENDING);
         // Sync messages w/o parent thread first
         messages.sort((a, b) => {
           if (a.parentMessage && !b.parentMessage) {
@@ -323,7 +322,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
         symbol: message.symbol || null,
         threadMessagesCount: message.threadMessagesCount,
         isHighlighted: false,
-        status: message.status === "sending" ? "on_server" : message.status,
+        status: message.status === MessageStatusInner.SENDING ? MessageStatus.ON_SERVER: message.status,
         edited: inMessage.edited,
         roomId: message.roomId,
         userId: message.userId,
@@ -357,7 +356,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       this.ws.setMessageStatus(
         [inMessage.id],
         inMessage.roomId,
-        isRead ? "read" : "received",
+        isRead ? MessageStatus.READ : MessageStatus.RECEIVED,
       );
     }
     if (checkIfIdIsMissing(message, this.store)) {
@@ -467,8 +466,8 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       let roomMessage = Object.values(r.messages).filter((m) => m.id > 0);
       messagesIds.push(...roomMessage.map((m) => m.id));
       roomMessage = roomMessage.filter((u) => u.userId === this.store.myId);
-      receivedMessageIds.push(...roomMessage.filter((m) => m.status === "received").map((m) => m.id));
-      onServerMessageIds.push(...roomMessage.filter((m) => m.status === "on_server").map((m) => m.id));
+      receivedMessageIds.push(...roomMessage.filter((m) => m.status === MessageStatus.RECEIVED).map((m) => m.id));
+      onServerMessageIds.push(...roomMessage.filter((m) => m.status === MessageStatus.ON_SERVER).map((m) => m.id));
       return r.id;
     });
 
@@ -489,8 +488,8 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     );
 
     // Updating information if message that I sent were received/read
-    this.setAllMessagesStatus(result.readMessageIds, "read");
-    this.setAllMessagesStatus(result.receivedMessageIds, "received");
+    this.setAllMessagesStatus(result.readMessageIds, MessageStatus.READ);
+    this.setAllMessagesStatus(result.receivedMessageIds, MessageStatus.RECEIVED);
 
     const messagesByStatus = this.groupMessagesIdsByStatus(result.content, () => true);
     Object.entries(messagesByStatus).forEach(([k, messagesInGroup]) => {
@@ -529,11 +528,11 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
          * If we received a message from the server from our second device
          * We still don't need to mark those messages as received
          */
-        filter((m) => m.userId !== this.store.myId && (m.status === "received" || m.status === "on_server")).map((m) => m.id);
-      messageStatus = "read";
+        filter((m) => m.userId !== this.store.myId && (m.status === MessageStatus.RECEIVED || m.status === MessageStatus.ON_SERVER)).map((m) => m.id);
+      messageStatus = MessageStatus.READ;
     } else {
-      ids = inMessages.filter((m) => m.status === "on_server").map((m) => m.id);
-      messageStatus = "received";
+      ids = inMessages.filter((m) => m.status === MessageStatus.ON_SERVER).map((m) => m.id);
+      messageStatus = MessageStatus.RECEIVED;
     }
     if (ids.length > 0) {
       this.ws.setMessageStatus(
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index 0e758f9ea..530ce216b 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -6,7 +6,6 @@ import type {
   FileModel,
   Location,
   MessageModel,
-  MessageStatus,
   RoomModel,
   RoomSettingsModel,
   UserModel,
@@ -28,6 +27,7 @@ import type {
   SexDB,
 } from "@/ts/types/db";
 import type {MessageP2pDto} from "@/ts/types/messages/p2pDto";
+import {MessageStatus} from '@/ts/types/backend';
 
 export function currentUserInfoDtoToModel(userInfo: UserProfileDtoWoImage): CurrentUserInfoWoImage {
   return {...userInfo};
@@ -59,16 +59,16 @@ export function convertLocation(dto: LocationDto | null): Location {
 
 export function getChannelDict(
   {
-    channelName,
-    channelCreatorId,
-    channelId,
+    name,
+    creatorId,
+    id,
   }: ChannelDto,
   oldChannel: ChannelModel | null = null,
 ): ChannelModel {
   return {
-    name: channelName,
-    id: channelId,
-    creator: channelCreatorId,
+    name,
+    id,
+    creatorId,
     expanded: oldChannel?.expanded ?? false,
   };
 }
@@ -77,23 +77,23 @@ export function getRoom(r: RoomNoUsersDto): RoomSettingsModel {
   return {
     channelId: r.channelId,
     p2p: r.p2p,
-    id: r.roomId,
+    id: r.id,
     name: r.name,
     isMainInChannel: r.isMainInChannel,
     notifications: r.notifications,
     volume: r.volume,
-    creator: r.roomCreatorId,
+    creatorId: r.creatorId,
   };
 }
 
 export function getRoomsBaseDict(
   {
-    roomId,
+    id,
     volume,
     channelId,
     isMainInChannel,
     notifications,
-    roomCreatorId,
+    creatorId,
     p2p,
     name,
     users,
@@ -101,7 +101,7 @@ export function getRoomsBaseDict(
   databaseRestoredRoom: RoomModel | null = null,
 ): RoomModel {
   return {
-    id: roomId,
+    id,
     receivingFiles: databaseRestoredRoom ? databaseRestoredRoom.receivingFiles : {},
     sendingFiles: databaseRestoredRoom ? databaseRestoredRoom.sendingFiles : {},
     channelId,
@@ -128,7 +128,7 @@ export function getRoomsBaseDict(
     },
     notifications,
     name,
-    creator: roomCreatorId,
+    creatorId,
     messages: databaseRestoredRoom ? databaseRestoredRoom.messages : {},
     roomLog: databaseRestoredRoom ? databaseRestoredRoom.roomLog : [],
     changeName: databaseRestoredRoom ? databaseRestoredRoom.changeName : [],
@@ -206,9 +206,9 @@ export function convertMessageModelDtoToModel(message: MessageModelDto, oldMessa
 }
 
 export function p2pMessageToModel(m: MessageP2pDto, roomId: number): MessageModel {
-  let status: MessageStatus = "received";
-  if (m.status === "read") {
-    status = "read";
+  let status: MessageStatus = MessageStatus.RECEIVED;
+  if (m.status === MessageStatus.READ) {
+    status = MessageStatus.READ;
   }
   return {
     content: m.content,
@@ -233,9 +233,9 @@ export function p2pMessageToModel(m: MessageP2pDto, roomId: number): MessageMode
 
 export function convertUser(u: UserDto, location: LocationDto | null): UserModel {
   return {
-    user: u.user,
-    id: u.userId,
-    image: u.userImage,
+    username: u.username,
+    id: u.id,
+    thumbnail: u.thumbnail,
     lastTimeOnline: u.lastTimeOnline,
     sex: convertSex(u.sex),
     location: convertLocation(location),
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index ce343616b..4a2524a10 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,10 +1,11 @@
 import type {LogLevel} from "lines-logger";
-import type {MessageStatus} from "@/ts/types/model";
+import type {MessageStatus} from "@/ts/types/backend";
 import {Gender} from '@/ts/types/backend';
+import {MessageStatusInner} from '@/ts/types/model';
 
 export interface UserDB {
   id: number;
-  user: string;
+  username: string;
   sex: SexDB;
   last_time_online: number;
   deleted: BooleanDB;
@@ -29,13 +30,13 @@ export interface RoomDB {
   channel_id: number;
   is_main_in_channel: BooleanDB;
   deleted: BooleanDB;
-  creator: number;
+  creator_id: number;
 }
 
 export interface ChannelDB {
   id: number;
   name: string;
-  creator: number;
+  creator_id: number;
 }
 
 export interface TagDB {
@@ -56,7 +57,7 @@ export interface MessageDB {
   edited: number;
   room_id: number;
   user_id: number;
-  status: MessageStatus;
+  status: MessageStatusInner;
 }
 
 export interface FileDB {
@@ -88,13 +89,13 @@ export interface SettingsDB {
 
 export interface ProfileDB {
   user_id: number;
-  user: string;
+  username: string;
   name: string;
   city: string;
-  image: string;
+  thumbnail: string;
   surname: string;
   email: string;
-  birthday: string;
+  birthday: Date;
   contacts: string;
   sex: SexDB;
 }
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 2eec78e3a..f67ad6989 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -1,9 +1,8 @@
 import type {
-  BlobType,
   ChannelsDictModel,
   CurrentUserInfoModel,
   CurrentUserSettingsModel,
-  MessageStatus,
+  MessageStatusModel,
   RoomDictModel,
   UserModel,
 } from "@/ts/types/model";
@@ -11,7 +10,10 @@ import type {
 export * from '@/ts/types/backend';
 
 import type {LogLevel} from "lines-logger";
-import {Gender} from '@/ts/types/backend';
+import {
+  Gender,
+  UserProfileDto
+} from '@/ts/types/backend';
 
 
 
@@ -55,6 +57,6 @@ export interface OauthStatus {
 }
 
 
-export interface WebRtcMessageModelDto extends Omit<MessageModelDto, "roomId" | "time" | "userId"> {
+export interface WebRtcMessageModelDto extends Omit<MessageStatusModel, "roomId" | "time" | "userId"> {
   timeDiff: number;
 }
diff --git a/frontend/src/ts/types/messages/innerMessages.ts b/frontend/src/ts/types/messages/innerMessages.ts
index 0a4917d67..c863ecb6d 100644
--- a/frontend/src/ts/types/messages/innerMessages.ts
+++ b/frontend/src/ts/types/messages/innerMessages.ts
@@ -14,7 +14,7 @@ import type {
   DefaultInMessage,
   HandlerName,
 } from "@/ts/types/backend";
-import type {MessageStatus} from "@/ts/types/model";
+import type {MessageStatusModel} from "@/ts/types/model";
 
 
 export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H> {
@@ -73,5 +73,5 @@ export interface SyncP2PMessage extends DefaultInnerSystemMessage<"syncP2pMessag
 
 export interface SendSetMessagesStatusMessage extends DefaultInnerSystemMessage<"sendSetMessagesStatus", "peerConnection:*"> {
   messageIds: number[];
-  status: MessageStatus;
+  status: MessageStatusModel;
 }
diff --git a/frontend/src/ts/types/messages/p2pDto.ts b/frontend/src/ts/types/messages/p2pDto.ts
index eacc588f1..861933c41 100644
--- a/frontend/src/ts/types/messages/p2pDto.ts
+++ b/frontend/src/ts/types/messages/p2pDto.ts
@@ -1,4 +1,4 @@
-import type {MessageStatus} from "@/ts/types/model";
+import type {MessageStatusModel} from "@/ts/types/model";
 
 export interface MessageP2pDto {
   id: number;
@@ -6,7 +6,7 @@ export interface MessageP2pDto {
   files: Record<string, FileP2pDto>;
   timeAgo: number;
   symbol: string | null;
-  status: MessageStatus;
+  status: MessageStatusModel;
   parentMessage: number | null;
   deleted: boolean;
   edited: number;
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index 5d98d468a..efcd36a53 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -12,7 +12,7 @@ import type {
   MessageP2pDto,
   MessagesInfo,
 } from "@/ts/types/messages/p2pDto";
-import type {MessageStatus} from "@/ts/types/model";
+import type {MessageStatus} from "@/ts/types/backend";
 
 
 export type P2PHandlerType<A extends string> = (a: DefaultP2pMessage<A>) => Promise<void> | void;
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 2fd1078ee..7c1bc59da 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,5 +1,9 @@
 import type {LogLevel} from "lines-logger";
-import {Gender} from '@/ts/types/backend';
+import {
+  BlobType,
+  Gender,
+  MessageStatus
+} from '@/ts/types/backend';
 
 export enum GrowlType {
   SUCCESS = "col-success", INFO = "col-info", ERROR = "col-error",
@@ -30,7 +34,6 @@ export interface CurrentUserSettingsModel {
   incomingFileCallSound: boolean;
   messageSound: boolean;
   onlineChangeSound: boolean;
-  sendLogs: boolean;
   showWhenITyping: boolean;
   suggestions: boolean;
   theme: string;
@@ -52,27 +55,27 @@ export interface PastingTextAreaElement {
 }
 
 export interface CurrentUserInfoModel extends CurrentUserInfoWoImage {
-  image: string | null;
+  thumbnail: string | null;
 }
 
 export interface CurrentUserInfoWoImage {
-  userId: number;
-  user: string;
+  id: number;
+  username: string;
   name: string;
   city: string;
   surname: string;
   email: string;
-  birthday: string;
+  birthday: Date;
   contacts: string;
   sex: Gender;
 }
 
 
 export interface UserModel {
-  user: string;
+  username: string;
   id: number;
   sex: Gender;
-  image: string;
+  thumbnail: string;
   lastTimeOnline: number;
   location: Location;
 }
@@ -114,12 +117,6 @@ export interface MessageTransferInfo {
   xhr: XMLHttpRequest | null;
 }
 
-export type MessageStatus =
-  "on_server"
-  | "read"
-  | "received"
-  | "sending";
-
 export interface MessageModel {
   id: number;
   time: number;
@@ -133,13 +130,19 @@ export interface MessageModel {
   symbol: string | null;
   threadMessagesCount: number;
   deleted: boolean;
-  status: MessageStatus;
+  status: MessageStatusModel;
   edited: number;
   roomId: number;
   userId: number;
   transfer: MessageTransferInfo | null;
 }
 
+export enum MessageStatusInner {
+  SENDING = 'SENDING'
+}
+export type MessageStatusModel = MessageStatus | MessageStatusInner;
+
+
 export interface RoomSettingsModel {
   id: number;
   name: string;
@@ -148,7 +151,7 @@ export interface RoomSettingsModel {
   isMainInChannel: boolean;
   notifications: boolean;
   volume: number;
-  creator: number;
+  creatorId: number;
 }
 
 export type UserDictModel = Record<string, UserModel>;
@@ -243,7 +246,7 @@ export interface ChannelModel {
   expanded: boolean;
   id: number;
   name: string;
-  creator: number;
+  creatorId: number;
 }
 
 export interface ChannelUIModel extends ChannelModel {
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index fa985de6b..84923ed1d 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -6,7 +6,6 @@ import type {
   FileModel,
   FileTransferStatus,
   MessageModel,
-  MessageStatus,
   RoomLog,
   RoomModel,
   RoomSettingsModel,
@@ -18,6 +17,10 @@ import type {
   SaveFileResponse,
   SetStateFromStorage,
 } from "@/ts/types/dto";
+import {
+  MessageStatusInner,
+  MessageStatusModel
+} from '@/ts/types/model';
 
 
 export interface UploadFile {
@@ -211,7 +214,7 @@ export interface IStorage {
 
   setUsers(users: UserModel[]): void;
 
-  setMessagesStatus(messagesIds: number[], status: MessageStatus): void;
+  setMessagesStatus(messagesIds: number[], status: MessageStatusModel): void;
 
   saveUser(users: UserModel): void;
 
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index b7f77ac46..d48fb578a 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -6,7 +6,6 @@ import {
 } from "@/ts/utils/consts";
 import type {MessageDataEncode} from "@/ts/types/types";
 import type {
-  BlobType,
   CurrentUserSettingsModel,
   FileModel,
   MessageModel,
@@ -26,6 +25,7 @@ import {
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GIFObject} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
+import {BlobType} from '@/ts/types/backend';
 
 const tmpCanvasContext: CanvasRenderingContext2D = document.createElement("canvas").getContext("2d")!; // TODO why is it not safe?
 const yotubeTimeRegex = /(?:(\d*)h)?(?:(\d*)m)?(?:(\d*)s)?(\d)?/;
@@ -223,7 +223,7 @@ function encodeTags(html: string, tags: Record<string, number> | null, store: De
     html = html.replace(imageUnicodeRegex, (s) => {
       const v = tags[s];
       if (v) {
-        return `<span user-id='${v}' symbol='${s}' class="tag-user">@${store.allUsersDict[v].user}</span>`;
+        return `<span user-id='${v}' symbol='${s}' class="tag-user">@${store.allUsersDict[v].username}</span>`;
       }
 
       return s; // If it's absent in files, it could be also in tags so return it. (don't replace )
@@ -274,7 +274,7 @@ export function createTag(user: UserModel) {
   const style = document.createElement("style");
   style.type = "text/css";
   const id = `usertag${getUniqueTagId()}`;
-  style.innerHTML = ` #${id}:after { content: '@${user.user}'}`;
+  style.innerHTML = ` #${id}:after { content: '@${user.username}'}`;
   document.getElementsByTagName("head")[0].appendChild(style);
   a.id = id;
 
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index cd996878e..d4ea78f2f 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -5,6 +5,8 @@ import type {
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {MessageSender} from "@/ts/types/types";
 import {ALLOW_EDIT_MESSAGE_IF_UPDATE_HAPPENED_MS_AGO} from "@/ts/utils/consts";
+import {MessageStatus} from '@/ts/types/backend';
+import {MessageStatusInner} from '@/ts/types/model';
 
 export function bytesToSize(bytes: number): string {
   const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
@@ -123,12 +125,12 @@ export function editMessageWs(
     isEditingActive: oldMessage ? oldMessage.isEditingActive : false,
     isThreadOpened: oldMessage ? oldMessage.isThreadOpened : false,
     parentMessage,
-    status: shouldBeSynced ? "sending" : "on_server",
+    status: shouldBeSynced ? MessageStatusInner.SENDING : MessageStatus.ON_SERVER,
     content: messageContent,
     symbol,
     edited,
     files,
-    userId: store.userInfo?.userId!,
+    userId: store.userInfo?.id!,
   };
   store.addMessage(mm);
   if (shouldBeSynced) { // Message hasn't been sync to server and was deleted localy
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index f425cf9ff..c0049ea79 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -263,10 +263,10 @@ export default class WebRtcApi extends MessageHandler {
         total: message.content.size,
       },
     };
-    this.notifier.showNotification(this.store.allUsersDict[message.userId].user, {
+    this.notifier.showNotification(this.store.allUsersDict[message.userId].username, {
       body: `Sends file ${message.content.name}`,
       requireInteraction: true,
-      icon: resolveMediaUrl(this.store.allUsersDict[message.userId].image) || faviconUrl,
+      icon: resolveMediaUrl(this.store.allUsersDict[message.userId].thumbnail) || faviconUrl,
       replaced: 1,
     });
     this.store.addReceivingFile(payload);
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 0721448d0..915d742f5 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -8,6 +8,7 @@ import type {
   HandlerType,
   HandlerTypes,
 } from "@/ts/types/backend";
+import {MessageStatus} from '@/ts/types/backend';
 import type {
   ConfirmReceivedP2pMessage,
   ConfirmSetMessageStatusRequest,
@@ -25,6 +26,7 @@ import type {
   MessageModel,
   RoomModel,
 } from "@/ts/types/model";
+import {MessageStatusInner} from '@/ts/types/model';
 import type {
   MessageP2pDto,
   MessagesInfo,
@@ -104,12 +106,12 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     const responseToRequest: SetMessageStatusRequest = {
       action: "setMessageStatus",
       messagesIds: payload.messageIds,
-      status: "read",
+      status: MessageStatus.READ,
     };
     await this.messageProc.sendToServerAndAwait(responseToRequest);
     this.store.setMessagesStatus({
       roomId: this.roomId,
-      status: "read",
+      status: MessageStatus.READ,
       messagesIds: payload.messageIds,
     });
   }
@@ -156,7 +158,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     if (payload.message.userId !== this.store.myId) {
       const isRead = this.store.isCurrentWindowActive && this.store.activeRoomId === this.roomId;
       if (isRead) {
-        response.status = "read";
+        response.status = MessageStatus.READ;
       }
     }
     this.messageProc.sendToServer(response);
@@ -352,7 +354,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
 
   private markAsReadSentMessages(responseMessages: MessageP2pDto[]) {
     if (!this.isConnectedToMyAnotherDevices) {
-      const isNotRead: number[] = responseMessages.map((m) => m.id).filter((id) => this.room.messages[id].status === "sending");
+      const isNotRead: number[] = responseMessages.map((m) => m.id).filter((id) => this.room.messages[id].status === MessageStatusInner.SENDING);
       if (isNotRead.length > 0) {
         this.store.markMessageAsSent({
           messagesId: isNotRead,
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 684b290c4..38670690f 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -15,6 +15,7 @@ import type {
   SyncP2PMessage,
 } from "@/ts/types/messages/innerMessages";
 import type {HandlerTypes} from "@/ts/types/backend";
+import {MessageStatus} from '@/ts/types/backend';
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 
 /**
@@ -185,7 +186,7 @@ export default class MessageTransferHandler extends BaseTransferHandler implemen
         action: "sendSetMessagesStatus",
         handler: Subscription.allPeerConnectionsForTransfer(this.connectionId!),
         messageIds,
-        status: "read",
+        status: MessageStatus.READ,
         allowZeroSubscribers: true,
       };
       this.sub.notify(payload);
diff --git a/frontend/src/vue/chat/call/IncomingCall.vue b/frontend/src/vue/chat/call/IncomingCall.vue
index c806461ee..f6bfea4c3 100644
--- a/frontend/src/vue/chat/call/IncomingCall.vue
+++ b/frontend/src/vue/chat/call/IncomingCall.vue
@@ -64,7 +64,7 @@ export default class IncomingCall extends Vue {
   public readonly roomsDict!: RoomDictModel;
 
   public get caller() {
-    return this.allUsersDict[this.call.userId].user;
+    return this.allUsersDict[this.call.userId].username;
   }
 
   public get room(): string {
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 6210f1771..71e7e6d22 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -125,6 +125,7 @@ import type {
   HandlerType,
   HandlerTypes,
 } from "@/ts/types/backend";
+import {MessageStatus} from '@/ts/types/backend';
 
 
 @Component({
@@ -238,7 +239,7 @@ export default class ChatBox extends Vue {
 
   public markMessagesInCurrentRoomAsRead() {
     this.$logger.debug("Checking if we can set some messages to status read")();
-    const messagesIds = Object.values(this.room!.messages).filter((m) => m.userId !== this.myId && (m.status === "received" || m.status === "on_server")).
+    const messagesIds = Object.values(this.room!.messages).filter((m) => m.userId !== this.myId && (m.status === MessageStatus.RECEIVED || m.status === MessageStatus.ON_SERVER)).
       map((m) => m.id);
     if (messagesIds.length > 0) {
       this.messageSender.markMessagesInCurrentRoomAsRead(this.room.id, messagesIds);
diff --git a/frontend/src/vue/chat/chatbox/ChatNavBar.vue b/frontend/src/vue/chat/chatbox/ChatNavBar.vue
index 3638222b9..c477ae189 100644
--- a/frontend/src/vue/chat/chatbox/ChatNavBar.vue
+++ b/frontend/src/vue/chat/chatbox/ChatNavBar.vue
@@ -81,7 +81,7 @@ export default class ChatNavBar extends Vue {
       return this.channelsDictUI[this.activeRoom.channelId!].name;
     }
     if (this.user) {
-      return this.user.user;
+      return this.user.username;
     }
     throw Error("Invalid structure");
   }
diff --git a/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue b/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
index 509feba9a..55eac1997 100644
--- a/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
+++ b/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
@@ -26,7 +26,7 @@ export default class ChatShowUserTyping extends Vue {
   }
 
   public get stringifiedTypes() {
-    return this.users.map((u) => u.user).join(", ");
+    return this.users.map((u) => u.username).join(", ");
   }
 }
 </script>
diff --git a/frontend/src/vue/chat/chatbox/UserImageIcon.vue b/frontend/src/vue/chat/chatbox/UserImageIcon.vue
index fbe50fe28..3187658dd 100644
--- a/frontend/src/vue/chat/chatbox/UserImageIcon.vue
+++ b/frontend/src/vue/chat/chatbox/UserImageIcon.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="user-image-holder">
     <div class="online-marker"/>
-    <img v-if="userImg" :src="userImg" :title="user.user"/>
+    <img v-if="userImg" :src="userImg" :title="user.username"/>
     <div
       v-else
       :style="{'background-color': color}"
-      :title="user.user"
+      :title="user.username"
       class="image-missing"
     >
       {{ twoLetter }}
@@ -28,15 +28,15 @@ export default class UserImageIcon extends Vue {
   public readonly user!: UserModel;
 
   public get twoLetter() {
-    return this.user.user.substring(0, 2);
+    return this.user.username.substring(0, 2);
   }
 
   public get color() {
-    return loggerFactory.getRandomColor(this.user.user);
+    return loggerFactory.getRandomColor(this.user.username);
   }
 
   public get userImg() {
-    return resolveMediaUrl(this.user.image);
+    return resolveMediaUrl(this.user.thumbnail);
   }
 }
 </script>
diff --git a/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue b/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
index b77b28c77..df070a41e 100644
--- a/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
+++ b/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
@@ -74,7 +74,7 @@ export default class ChatSendingFileTransfer extends Vue {
   }
 
   public get user() {
-    return this.allUsersDict[this.transfer.userId].user;
+    return this.allUsersDict[this.transfer.userId].username;
   }
 
   public get status() {
diff --git a/frontend/src/vue/chat/message/ChatSendingMessage.vue b/frontend/src/vue/chat/message/ChatSendingMessage.vue
index 206191061..9c82e018f 100644
--- a/frontend/src/vue/chat/message/ChatSendingMessage.vue
+++ b/frontend/src/vue/chat/message/ChatSendingMessage.vue
@@ -26,16 +26,16 @@
         class="message-tooltip"
       />
       <i
-        v-if="isSelf && message.status === 'read'"
+        v-if="isSelf && message.status === 'READ'"
         class="icon-ok message-status-read"
         title="This message has been read by at least one user"
       />
       <i
-        v-if="isSelf && message.status === 'received'"
+        v-if="isSelf && message.status === 'RECEIVED'"
         class="icon-ok message-status-received"
         title="At least one user in this room has received this message"
       />
-      <div v-if="message.status === 'sending'" class="spinner"/>
+      <div v-if="message.status === 'SENDING'" class="spinner"/>
     </div>
   </div>
 </template>
@@ -55,6 +55,7 @@ import type {EditingMessage} from "@/ts/types/model";
 import {
   CurrentUserInfoModel,
   MessageModel,
+  MessageStatusInner,
   RoomDictModel,
 } from "@/ts/types/model";
 import ChatMessageToolTip from "@/vue/chat/message/ChatMessageToolTip.vue";
@@ -97,14 +98,14 @@ export default class ChatSendingMessage extends Vue {
       "message-self": this.isSelf,
       "message-others": !this.isSelf,
       "message-wrapper": true,
-      "message-is-being-sent": this.message.status === "sending",
+      "message-is-being-sent": this.message.status === MessageStatusInner.SENDING,
       "removed-message": this.message.deleted,
       "unread-message": this.message.isHighlighted,
     };
   }
 
   public get isSelf() {
-    return this.message.userId === this.userInfo.userId;
+    return this.message.userId === this.userInfo.id;
   }
 
   cancelTransfer() {
diff --git a/frontend/src/vue/chat/message/ChatUserActionMessage.vue b/frontend/src/vue/chat/message/ChatUserActionMessage.vue
index f186cfb43..348998cc0 100644
--- a/frontend/src/vue/chat/message/ChatUserActionMessage.vue
+++ b/frontend/src/vue/chat/message/ChatUserActionMessage.vue
@@ -43,7 +43,7 @@ export default class ChatUserActionMessage extends Vue {
   }
 
   public get user() {
-    return this.isMe ? "You" : this.allUsersDict[this.userId].user;
+    return this.isMe ? "You" : this.allUsersDict[this.userId].username;
   }
 
   public get isMe() {
diff --git a/frontend/src/vue/chat/right/RoomRightIcon.vue b/frontend/src/vue/chat/right/RoomRightIcon.vue
index 204633658..be38c7250 100644
--- a/frontend/src/vue/chat/right/RoomRightIcon.vue
+++ b/frontend/src/vue/chat/right/RoomRightIcon.vue
@@ -33,6 +33,7 @@ import {
 } from "vue-property-decorator";
 import type {MessageModel} from "@/ts/types/model";
 import {RoomModel} from "@/ts/types/model";
+import {MessageStatus} from '@/ts/types/backend';
 
 @Component({name: "RoomRightIcon"})
 export default class RoomRightIcon extends Vue {
@@ -45,7 +46,7 @@ export default class RoomRightIcon extends Vue {
        * On_server is not really required, since all received messages are gonna be 'received'
        * But it's an additional failsafe check, in case of a bug in another place
        */
-      (m.status === "received" || m.status === "on_server") &&
+      (m.status === MessageStatus.RECEIVED || m.status === MessageStatus.ON_SERVER) &&
       m.userId !== this.$store.myId).length;
   }
 }
diff --git a/frontend/src/vue/chat/right/UserNavInfo.vue b/frontend/src/vue/chat/right/UserNavInfo.vue
index 12ec09a25..e52f23a78 100644
--- a/frontend/src/vue/chat/right/UserNavInfo.vue
+++ b/frontend/src/vue/chat/right/UserNavInfo.vue
@@ -2,7 +2,7 @@
   <div class="user-row">
     <user-image-icon :user="user"/>
     <div class="user-info">
-      <span class="user-name">{{ user.user }}</span>
+      <span class="user-name">{{ user.username }}</span>
       <span v-if="isOnline" class="user-online">online</span>
       <span v-else class="user-offline">offline</span>
     </div>
diff --git a/frontend/src/vue/chat/right/UserRow.vue b/frontend/src/vue/chat/right/UserRow.vue
index 24a4ee125..59c20c483 100644
--- a/frontend/src/vue/chat/right/UserRow.vue
+++ b/frontend/src/vue/chat/right/UserRow.vue
@@ -4,7 +4,7 @@
   >
     <div class="user-name-sex">
       <user-image-icon :user="user"/>
-      <span>{{ user.user }}</span>
+      <span>{{ user.username }}</span>
     </div>
     <slot/>
   </div>
diff --git a/frontend/src/vue/chat/textarea/ChatTagging.vue b/frontend/src/vue/chat/textarea/ChatTagging.vue
index c595105a9..31bc080ce 100644
--- a/frontend/src/vue/chat/textarea/ChatTagging.vue
+++ b/frontend/src/vue/chat/textarea/ChatTagging.vue
@@ -8,7 +8,7 @@
       :class="{'tag-selected': user.id === currentSelected}"
       @mousedown.prevent="emitName(user)"
     >
-      {{ user.user }}
+      {{ user.username }}
     </div>
   </div>
 </template>
@@ -45,7 +45,7 @@ export default class ChatTagging extends Vue {
   }
 
   public get userList(): UserModel[] {
-    return this.userIds.map((id) => this.allUsersDict[id]).filter((u) => u.user.toLowerCase().includes(this.onlyUserName.toLowerCase()));
+    return this.userIds.map((id) => this.allUsersDict[id]).filter((u) => u.username.toLowerCase().includes(this.onlyUserName.toLowerCase()));
   }
 
   @Watch("name")
diff --git a/frontend/src/vue/chat/textarea/ChatTextArea.vue b/frontend/src/vue/chat/textarea/ChatTextArea.vue
index 0b2a4e1dd..61ce57c48 100644
--- a/frontend/src/vue/chat/textarea/ChatTextArea.vue
+++ b/frontend/src/vue/chat/textarea/ChatTextArea.vue
@@ -256,7 +256,7 @@ export default class ChatTextArea extends Vue {
     const user = this.allUsersDict[message.userId];
     oldValue = match ? oldValue.substr(match[0].length + 1) : oldValue;
     // TODO refactor quote
-    this.userMessage.innerHTML = `${encodeHTML(`(${timeToString(message.time)}) ${user.user}: `) + await encodeP(message, this.$store, this.$smileyApi) + encodeHTML(" >>>") + String.fromCharCode(13)} ${oldValue}`;
+    this.userMessage.innerHTML = `${encodeHTML(`(${timeToString(message.time)}) ${user.username}: `) + await encodeP(message, this.$store, this.$smileyApi) + encodeHTML(" >>>") + String.fromCharCode(13)} ${oldValue}`;
     placeCaretAtEnd(this.userMessage);
   }
 
diff --git a/frontend/src/vue/pages/ChannelSettings.vue b/frontend/src/vue/pages/ChannelSettings.vue
index 36f445f74..d73ee3c5f 100644
--- a/frontend/src/vue/pages/ChannelSettings.vue
+++ b/frontend/src/vue/pages/ChannelSettings.vue
@@ -56,7 +56,7 @@
               />
             </td>
             <td v-else-if="currentAdmin">
-              {{ currentAdmin.user }}
+              {{ currentAdmin.username }}
             </td>
             <!-- TODO remove fallback in future-->
             <td v-else>
@@ -165,7 +165,7 @@ export default class ChannelSettings extends Vue {
     if (this.admin.length > 0) {
       return this.admin[0];
     }
-    return this.channel.creator;
+    return this.channel.creatorId;
   }
 
   public get noRooms(): boolean {
@@ -173,7 +173,7 @@ export default class ChannelSettings extends Vue {
   }
 
   public get isAdmin(): boolean {
-    return this.channel.creator === this.userInfo.userId;
+    return this.channel.creatorId === this.userInfo.id;
   }
 
   public get userIds(): number[] {
@@ -181,7 +181,7 @@ export default class ChannelSettings extends Vue {
   }
 
   public get currentAdmin(): UserModel {
-    return this.allUsersDict[this.channel.creator];
+    return this.allUsersDict[this.channel.creatorId];
   }
 
   public get channelId(): number {
@@ -230,7 +230,7 @@ export default class ChannelSettings extends Vue {
   created() {
     this.$logger.log("Updated for channel settings {} ", this.channel)();
     this.channelName = this.channel.name;
-    this.admin = [this.channel.creator];
+    this.admin = [this.channel.creatorId];
     this.sound = this.channel.mainRoom.volume;
     this.notifications = this.channel.mainRoom.notifications;
   }
diff --git a/frontend/src/vue/pages/RoomSettings.vue b/frontend/src/vue/pages/RoomSettings.vue
index d7f181405..a1d3b0dcc 100644
--- a/frontend/src/vue/pages/RoomSettings.vue
+++ b/frontend/src/vue/pages/RoomSettings.vue
@@ -42,7 +42,7 @@
             />
           </td>
           <td v-else-if="oldAdmin">
-            {{ oldAdmin.user }}
+            {{ oldAdmin.username }}
           </td>
           <td v-else>
             This room doesn't have an admin
@@ -195,11 +195,11 @@ export default class RoomSettings extends Vue {
       return null;
     }
     const uId = this.privateRoomsUsersIds.roomUsers[this.room.id];
-    return this.allUsersDict[uId].user;
+    return this.allUsersDict[uId].username;
   }
 
   public get isAdmin(): boolean {
-    return this.room.creator === this.myId;
+    return this.room.creatorId === this.myId;
   }
 
   public get showInviteUsers() {
@@ -207,7 +207,7 @@ export default class RoomSettings extends Vue {
   }
 
   public get canChangeAdmin() {
-    return this.isPublic && (!this.room.creator || this.myId === this.room.creator);
+    return this.isPublic && (!this.room.creatorId || this.myId === this.room.creatorId);
   }
 
   public get userIds(): number[] {
@@ -215,8 +215,8 @@ export default class RoomSettings extends Vue {
   }
 
   public get oldAdmin(): UserModel | null {
-    if (this.room.creator) {
-      return this.allUsersDict[this.room.creator];
+    if (this.room.creatorId) {
+      return this.allUsersDict[this.room.creatorId];
     }
     return null;
   }
@@ -229,7 +229,7 @@ export default class RoomSettings extends Vue {
     if (this.admin.length > 0) {
       return this.admin[0];
     }
-    return this.room.creator;
+    return this.room.creatorId;
   }
 
   public created() {
@@ -261,12 +261,12 @@ export default class RoomSettings extends Vue {
   public async apply() {
     this.$logger.log("Applying room {} settings", this.roomId)();
     await this.$ws.sendRoomSettings({
-      roomCreatorId: this.singleAdmin,
+      creatorId: this.singleAdmin,
       volume: this.sound,
       notifications: this.notifications,
       name: this.roomName,
       isMainInChannel: this.room.isMainInChannel,
-      roomId: this.roomId,
+      id: this.roomId,
       p2p: this.p2p,
       channelId: this.channelId,
     });
@@ -283,8 +283,8 @@ export default class RoomSettings extends Vue {
       this.notifications = this.room.notifications;
       this.p2p = this.room.p2p;
       this.channelId = this.room.channelId;
-      if (this.room.creator) {
-        this.admin = [this.room.creator];
+      if (this.room.creatorId) {
+        this.admin = [this.room.creatorId];
       } else {
         this.admin = [];
       }
diff --git a/frontend/src/vue/pages/RoomUsersListPage.vue b/frontend/src/vue/pages/RoomUsersListPage.vue
index 9ca61c64c..e20718c90 100644
--- a/frontend/src/vue/pages/RoomUsersListPage.vue
+++ b/frontend/src/vue/pages/RoomUsersListPage.vue
@@ -97,7 +97,7 @@ export default class RoomUsersListPage extends Vue {
   async add() {
     if (this.userdToAdd.length > 0) {
       const e = await this.$ws.inviteUser(this.roomId, this.userdToAdd);
-      this.$router.replace(`/chat/${e.roomId}`);
+      this.$router.replace(`/chat/${e.id}`);
     } else {
       this.$store.growlError("Please select at least one user");
     }
diff --git a/frontend/src/vue/pages/UserProfileChangePassword.vue b/frontend/src/vue/pages/UserProfileChangePassword.vue
index 3113427e4..e8cefb772 100644
--- a/frontend/src/vue/pages/UserProfileChangePassword.vue
+++ b/frontend/src/vue/pages/UserProfileChangePassword.vue
@@ -97,7 +97,7 @@ export default class UserProfileChangePassword extends Vue {
   public readonly userInfo!: CurrentUserInfoModel;
 
   public get username(): string {
-    return this.userInfo.user;
+    return this.userInfo.username;
   }
 
   @ApplyGrowlErr({
diff --git a/frontend/src/vue/pages/UserProfileImage.vue b/frontend/src/vue/pages/UserProfileImage.vue
index e84562af7..db021096b 100644
--- a/frontend/src/vue/pages/UserProfileImage.vue
+++ b/frontend/src/vue/pages/UserProfileImage.vue
@@ -50,7 +50,7 @@ export default class UserProfileImage extends Vue {
   }
 
   public created() {
-    this.srcImg = resolveMediaUrl(this.userInfo.image) || "";
+    this.srcImg = resolveMediaUrl(this.userInfo.thumbnail) || "";
   }
 
   @ApplyGrowlErr({
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index 1adacdc2c..b34d14c3c 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -10,7 +10,7 @@
           <th>Username:</th>
           <td>
             <input
-              v-model="model.user"
+              v-model="model.username"
               class="input"
               maxlength="30"
               type="text"
diff --git a/frontend/src/vue/pages/UserProfileSettings.vue b/frontend/src/vue/pages/UserProfileSettings.vue
index 8b6e1100d..395f799f2 100644
--- a/frontend/src/vue/pages/UserProfileSettings.vue
+++ b/frontend/src/vue/pages/UserProfileSettings.vue
@@ -55,12 +55,6 @@
             </select>
           </td>
         </tr>
-        <tr>
-          <th>Automatical error report:</th>
-          <td>
-            <app-checkbox v-model="model.sendLogs"/>
-          </td>
-        </tr>
         <tr>
           <th>Theme:</th>
           <td>
diff --git a/frontend/src/vue/pages/ViewProfilePage.vue b/frontend/src/vue/pages/ViewProfilePage.vue
index 73c92e521..729151fb4 100644
--- a/frontend/src/vue/pages/ViewProfilePage.vue
+++ b/frontend/src/vue/pages/ViewProfilePage.vue
@@ -85,7 +85,7 @@ export default class ViewProfilePage extends Vue {
   }
 
   public get username(): string {
-    return this.allUsersDict[this.id].user;
+    return this.allUsersDict[this.id].username;
   }
 
   public resolveMediaUrl(src: string) {
diff --git a/frontend/src/vue/parts/CreateRoom.vue b/frontend/src/vue/parts/CreateRoom.vue
index 05560c61f..3a2de0c9a 100644
--- a/frontend/src/vue/parts/CreateRoom.vue
+++ b/frontend/src/vue/parts/CreateRoom.vue
@@ -148,7 +148,7 @@ export default class CreateRoom extends Vue {
       this.currentUsers,
       this.parentChannelId ? this.parentChannelId : null,
     );
-    this.$router.replace(`/chat/${e.roomId}`);
+    this.$router.replace(`/chat/${e.id}`);
   }
 }
 </script>
diff --git a/frontend/src/vue/parts/PickUser.vue b/frontend/src/vue/parts/PickUser.vue
index 2e698e467..09e9ef403 100644
--- a/frontend/src/vue/parts/PickUser.vue
+++ b/frontend/src/vue/parts/PickUser.vue
@@ -6,7 +6,7 @@
         v-for="currentUser in valueUsers"
         :key="currentUser.id"
         class="spann"
-      >{{ currentUser.user }}
+      >{{ currentUser.username }}
         <i
           class="icon-cancel"
           @click="removeUser(currentUser.id)"
@@ -77,7 +77,7 @@ export default class PickUser extends Vue {
     this.$logger.debug("Reeval filter CreatePrivateRoom")();
     const s = this.search.toLowerCase();
 
-    return this.displayedUsers.filter((u) => u.user.toLowerCase().includes(s));
+    return this.displayedUsers.filter((u) => u.username.toLowerCase().includes(s));
   }
 
   public removeUser(id: number) {
diff --git a/frontend/src/vue/ui/AppMenuBar.vue b/frontend/src/vue/ui/AppMenuBar.vue
index 5b4f254da..1a82b4420 100644
--- a/frontend/src/vue/ui/AppMenuBar.vue
+++ b/frontend/src/vue/ui/AppMenuBar.vue
@@ -4,7 +4,7 @@
       <div class="app-header">
         <span class="username">
           <img v-if="imgSrc" :src="imgSrc"/>
-          <div class="user-name">{{ userInfo.user }}</div>
+          <div class="user-name">{{ userInfo.username }}</div>
         </span>
       </div>
       <div class="app-section">
@@ -69,7 +69,7 @@ export default class AppMenuBar extends Vue {
   public readonly userInfo!: CurrentUserInfoModel;
 
   public get imgSrc() {
-    return resolveMediaUrl(this.userInfo.image);
+    return resolveMediaUrl(this.userInfo.thumbnail);
   }
 
   public get consts() {
diff --git a/newback/src/data/model/ip.address.model.ts b/newback/src/data/model/ip.address.model.ts
index ebf5b450a..608485d84 100644
--- a/newback/src/data/model/ip.address.model.ts
+++ b/newback/src/data/model/ip.address.model.ts
@@ -5,6 +5,7 @@ import {
   Table,
 } from 'sequelize-typescript';
 import {Injectable} from '@nestjs/common';
+import {MysqlBool} from '@/data/types/internal';
 
 @Injectable()
 @Table({tableName: 'ip_address'})
@@ -29,7 +30,7 @@ export class IpAddressModel extends Model<IpAddressModel> {
     defaultValue: true,
     allowNull: false,
   })
-  public status: boolean;
+  public status: MysqlBool;
 
   @Column({
     type: DataType.STRING,
diff --git a/newback/src/data/model/room.model.ts b/newback/src/data/model/room.model.ts
index efc772161..fc3f10be6 100644
--- a/newback/src/data/model/room.model.ts
+++ b/newback/src/data/model/room.model.ts
@@ -11,6 +11,7 @@ import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/model/user.model';
 import {ChannelModel} from '@/data/model/channel.model';
 import {RoomUsersModel} from '@/data/model/room.users.model';
+import {MysqlBool} from '@/data/types/internal';
 
 
 // 	constraint admin_should_not_be_define_for_private_rooms
@@ -42,14 +43,14 @@ export class RoomModel extends Model<RoomModel> {
     allowNull: false,
     defaultValue: false,
   })
-  public isMainInChannel: boolean;
+  public isMainInChannel: MysqlBool;
 
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
     defaultValue: false,
   })
-  public p2p: boolean;
+  public p2p: MysqlBool;
 
   @ForeignKey(() => ChannelModel)
   @Column({
diff --git a/newback/src/data/model/room.users.model.ts b/newback/src/data/model/room.users.model.ts
index 4e466015a..210848a65 100644
--- a/newback/src/data/model/room.users.model.ts
+++ b/newback/src/data/model/room.users.model.ts
@@ -10,6 +10,7 @@ import {
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/model/user.model';
 import {RoomModel} from '@/data/model/room.model';
+import {MysqlBool} from '@/data/types/internal';
 
 const uniqueRoomUser = 'unique_room_user_room_id_user_id';
 
@@ -59,6 +60,6 @@ export class RoomUsersModel extends Model<RoomUsersModel> {
     defaultValue: true,
     allowNull: false,
   })
-  public notifications: boolean;
+  public notifications: MysqlBool;
 
 }
diff --git a/newback/src/data/model/subscription.message.model.ts b/newback/src/data/model/subscription.message.model.ts
index b37cfba86..5f5524362 100644
--- a/newback/src/data/model/subscription.message.model.ts
+++ b/newback/src/data/model/subscription.message.model.ts
@@ -10,6 +10,7 @@ import {
 import {Injectable} from '@nestjs/common';
 import {MessageModel} from '@/data/model/message.model';
 import {SubscriptionModel} from '@/data/model/subscription.model';
+import {MysqlBool} from '@/data/types/internal';
 
 const uniqueSubscriptionMessage = 'unique_subscription_message_subscription_id_message_id';
 
@@ -51,7 +52,7 @@ export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
     defaultValue: false,
     allowNull: false,
   })
-  public received: boolean;
+  public received: MysqlBool;
 
 
 }
diff --git a/newback/src/data/model/subscription.model.ts b/newback/src/data/model/subscription.model.ts
index 0a4dd0740..4d5ed2ef2 100644
--- a/newback/src/data/model/subscription.model.ts
+++ b/newback/src/data/model/subscription.model.ts
@@ -10,6 +10,7 @@ import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/model/user.model';
 import {UploadedFileChoices} from '@/data/types/frontend';
 import {IpAddressModel} from '@/data/model/ip.address.model';
+import {MysqlBool} from '@/data/types/internal';
 
 @Injectable()
 @Table({tableName: 'subscription'})
@@ -51,7 +52,7 @@ export class SubscriptionModel extends Model<SubscriptionModel> {
     defaultValue: false,
     allowNull: false,
   })
-  public isMobile: boolean;
+  public isMobile: MysqlBool;
 
   @ForeignKey(() => IpAddressModel)
   @Column({
diff --git a/newback/src/data/model/user.settings.model.ts b/newback/src/data/model/user.settings.model.ts
index 994a13e16..faa8876ac 100644
--- a/newback/src/data/model/user.settings.model.ts
+++ b/newback/src/data/model/user.settings.model.ts
@@ -13,6 +13,7 @@ import {
   LogLevel,
   logLevels
 } from 'lines-logger'
+import {MysqlBool} from '@/data/types/internal';
 
 @Injectable()
 @Table({tableName: 'user_settings'})
@@ -33,49 +34,49 @@ export class UserSettingsModel extends Model<UserSettingsModel> {
     allowNull: false,
     defaultValue: true,
   })
-  public suggestions: boolean;
+  public suggestions: MysqlBool;
 
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
     defaultValue: true,
   })
-  public showWhenITyping: boolean;
+  public showWhenITyping: MysqlBool;
 
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
     defaultValue: true,
   })
-  public embeddedYoutube: boolean;
+  public embeddedYoutube: MysqlBool;
 
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
     defaultValue: true,
   })
-  public highlightCode: boolean;
+  public highlightCode: MysqlBool;
 
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
     defaultValue: false,
   })
-  public messageSound: boolean;
+  public messageSound: MysqlBool;
 
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
     defaultValue: false,
   })
-  public incomingFileCallSound: boolean;
+  public incomingFileCallSound: MysqlBool;
 
   @Column({
     type: DataType.BOOLEAN,
     allowNull: false,
     defaultValue: false,
   })
-  public onlineChangeSound: boolean;
+  public onlineChangeSound: MysqlBool;
 
   @Column({
     type: DataType.ENUM(...Object.keys(logLevels)),
diff --git a/newback/src/data/model/verification.model.ts b/newback/src/data/model/verification.model.ts
index 993a2721a..7fe673895 100644
--- a/newback/src/data/model/verification.model.ts
+++ b/newback/src/data/model/verification.model.ts
@@ -9,6 +9,7 @@ import {
 import {Injectable} from '@nestjs/common';
 import {UserModel} from '@/data/model/user.model';
 import {VerificationType} from '@/data/types/frontend';
+import {MysqlBool} from '@/data/types/internal';
 
 @Injectable()
 @Table({tableName: 'verification'})
@@ -48,7 +49,7 @@ export class VerificationModel extends Model<VerificationModel> {
     allowNull: false,
     defaultValue: false,
   })
-  public verified: boolean;
+  public verified: MysqlBool;
 
   @Column({
     type: DataType.STRING(190),
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 4b7b4fa49..1e71ba92f 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -2,3 +2,6 @@ export interface WebSocketContextData {
   userId: number;
 }
 export type UserOnlineData = Record<string, string[]>
+
+// https://stackoverflow.com/questions/48881009/convert-tinyint-field-as-boolean-in-result-using-sequelize-raw-query-node-js
+export type MysqlBool = 0 | 1 | true | false  ;
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index ba125fce2..cc0b87319 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -5,7 +5,10 @@ import {
   WebSocketGateway,
 } from '@nestjs/websockets';
 import {IncomingMessage} from 'http';
-import {UserId} from '@/utils/decorators';
+import {
+  CatchWsErrors,
+  UserId
+} from '@/utils/decorators';
 import {WebSocket} from 'ws';
 import {WebSocketContextData} from '@/data/types/internal';
 import {RedisService} from '@/modules/rest/redis/redis.service';
@@ -14,15 +17,10 @@ import {SessionService} from '@/modules/rest/session/session.service';
 import {UserModel} from '@/data/model/user.model';
 import {PasswordService} from '@/modules/rest/password/password.service';
 import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {
-  ChannelDto,
-  RoomDto,
-  SetWsIdMessage,
-  UserDto
-} from '@/data/types/frontend';
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
 import {transformSetWsId} from '@/modules/api/websocket/ws.transformer';
 
+
 @WebSocketGateway({
   path: '/ws'
 })
@@ -38,10 +36,12 @@ export class WebsocketGateway implements OnGatewayConnection {
   ) {
   }
 
+
+  @CatchWsErrors
   async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) {
     let url = new URLSearchParams(message.url);
     let user: UserModel = await this.sessionService.getUserById(url.get('sessionId'));
-    let id = await this.passwordService.createWsId(user.id,  url.get('id'));
+    let id = await this.passwordService.createWsId(user.id, url.get('id'));
     let ip = (socket as any)._socket.remoteAddress;
     await this.ipCacheService.saveIp(user.id, ip);
     await this.redisService.addOnline(id)
@@ -51,8 +51,8 @@ export class WebsocketGateway implements OnGatewayConnection {
     let channelIds = myRooms.map(r => r.channelId).filter(c => c)
     let channels = await this.roomRepository.getAllChannels(channelIds);
     let allUsersInTheseRooms = await this.roomRepository.getRoomUsers(myRooms.map(r => r.id));
-    let userIds: number[] =  [...new Set(allUsersInTheseRooms.map(r => r.userId))];
-    let users: UserModel[] =  await this.userRepository.getUsersById(userIds);
+    let userIds: number[] = [...new Set(allUsersInTheseRooms.map(r => r.userId))];
+    let users: UserModel[] = await this.userRepository.getUsersById(userIds);
     let response = transformSetWsId(
       {
         id,
@@ -66,10 +66,15 @@ export class WebsocketGateway implements OnGatewayConnection {
       }
     )
     socket.send(JSON.stringify(response));
+
   }
 
   @SubscribeMessage('hello') //ws.ws.send(JSON.stringify({action: 'hello'}))
-  handleEvent(@MessageBody() data: string, @UserId() user): any {
+  handleEvent(@MessageBody()
+                data: string, @UserId()
+                user
+  ):
+    any {
     console.log(user);
     // const event = 'events';
     // this.server.clients.forEach((client) => {
@@ -79,7 +84,9 @@ export class WebsocketGateway implements OnGatewayConnection {
   }
 
   @SubscribeMessage('hey') //ws.ws.send(JSON.stringify({action: 'hello'}))
-  handleHey(@MessageBody() data: string) {
+  handleHey(@MessageBody()
+              data: string
+  ) {
     console.log('asd2');
     // const event = 'events';
     // this.server.clients.forEach((client) => {
diff --git a/newback/src/modules/api/websocket/ws.transformer.ts b/newback/src/modules/api/websocket/ws.transformer.ts
index 0d4dc1dfe..183b90442 100644
--- a/newback/src/modules/api/websocket/ws.transformer.ts
+++ b/newback/src/modules/api/websocket/ws.transformer.ts
@@ -2,7 +2,9 @@ import {
   ChannelDto,
   RoomDto,
   SetWsIdMessage,
-  UserDto
+  UserDto,
+  UserProfileDto,
+  UserSettingsDto
 } from '@/data/types/frontend';
 import {UserModel} from '@/data/model/user.model';
 import {UserOnlineData} from '@/data/types/internal';
@@ -10,8 +12,7 @@ import {ChannelModel} from '@/data/model/channel.model';
 import {RoomUsersModel} from '@/data/model/room.users.model';
 import {GetRoomsForUser} from '@/modules/rest/database/repository/room.repository';
 
-
-export interface TransformSetWsIdData {
+export interface TransformSetWsIdDataParams {
   myRooms: GetRoomsForUser[];
   allUsersInTheseRooms: Pick<RoomUsersModel, 'roomId' | 'userId'>[];
   channels: ChannelModel[];
@@ -22,71 +23,105 @@ export interface TransformSetWsIdData {
   user: UserModel;
 }
 
-export function transformSetWsId({myRooms, allUsersInTheseRooms, channels, users, online, id, user, time}: TransformSetWsIdData): SetWsIdMessage {
+// function transformUserSettings(db: UserSettingsModel): UserSettingsDto {
+//   return Object.keys(convert<UserSettingsDto>()).reduce((previousValue, currentValue) => {
+//     previousValue[currentValue] = db[currentValue];
+//     return previousValue;
+//   }, {} as UserSettingsDto)
+// }
 
-  let roomUsersIdInfoDict = allUsersInTheseRooms.reduce((previousValue, currentValue) => {
+function transformProfile(user: UserModel): UserProfileDto {
+  return {
+    username: user.username,
+    name: user.userProfile.name,
+    sex: user.sex,
+    id: user.id,
+    city: user.userProfile.city,
+    email: user.userAuth.email,
+    birthday: user.userProfile.birthday,
+    contacts: user.userProfile.contacts,
+    surname: user.userProfile.surname,
+    thumbnail: user.thumbnail
+  };
+}
+
+function transformSettings(user: UserModel): UserSettingsDto {
+  return {
+    embeddedYoutube: !!user.userSettings.embeddedYoutube,
+    highlightCode: !!user.userSettings.highlightCode,
+    incomingFileCallSound: !!user.userSettings.incomingFileCallSound,
+    messageSound: !!user.userSettings.messageSound,
+    onlineChangeSound: !!user.userSettings.onlineChangeSound,
+    showWhenITyping: !!user.userSettings.showWhenITyping,
+    suggestions: !!user.userSettings.suggestions,
+    theme: user.userSettings.theme,
+    logs: user.userSettings.logs
+  };
+}
+
+function transformUserDto(u: UserModel): UserDto {
+  return {
+    username: u.username,
+    id: u.id,
+    thumbnail: u.thumbnail,
+    sex: u.sex,
+    lastTimeOnline: u.lastTimeOnline
+  };
+}
+
+function transformChannelsDto(c: ChannelModel): ChannelDto {
+  return {
+    name: c.name,
+    id: c.id,
+    creatorId: c.creatorId
+  };
+}
+
+function getTransformRoomFn(allUsersInTheseRooms: Pick<RoomUsersModel, 'roomId' | 'userId'>[]): (r: GetRoomsForUser) => RoomDto {
+  let roomUsersIdInfoDict: Record<string, number[]> = allUsersInTheseRooms.reduce((previousValue, currentValue) => {
     if (!previousValue[currentValue.roomId]) {
       previousValue[currentValue.roomId] = []
     }
     previousValue[currentValue.roomId].push(currentValue.userId);
     return previousValue;
   }, {} as Record<string, number[]>);
-  let rooms: RoomDto[] = myRooms.map(room => ({
-    name: room.name,
-    id: room.id,
-    channelId: room.channelId,
-    p2p: room.p2p,
-    notifications: room.roomUsers.notifications,
-    users: roomUsersIdInfoDict[room.id],
-    isMainInChannel: room.isMainInChannel,
-    creatorId: room.creatorId,
-    volume: room.roomUsers.volume,
-  }))
-  let channelsResult: ChannelDto[] = channels.map(c => ({
-    name: c.name,
-    id: c.id,
-    creatorId: c.creatorId
-  }))
-  let resultUsers: UserDto[] = users.map(u => ({
-    username: u.username,
-    id: u.id,
-    thumbnail: u.thumbnail,
-    sex: u.sex,
-    lastTimeOnline: u.lastTimeOnline
-  }))
+  return (room: GetRoomsForUser) => {
+    return {
+      name: room.name,
+      id: room.id,
+      channelId: room.channelId,
+      p2p: !!room.p2p,
+      notifications: !!room.roomUsers.notifications,
+      users: roomUsersIdInfoDict[room.id],
+      isMainInChannel: !!room.isMainInChannel,
+      creatorId: room.creatorId,
+      volume: room.roomUsers.volume,
+    };
+  }
+}
 
+
+export function transformSetWsId(
+  {
+    myRooms,
+    allUsersInTheseRooms,
+    channels,
+    users,
+    online,
+    id,
+    user,
+    time
+  }: TransformSetWsIdDataParams): SetWsIdMessage {
   return {
     action: "setWsId",
-    channels: channelsResult,
-    rooms,
+    channels: channels.map(transformChannelsDto),
+    rooms: myRooms.map(getTransformRoomFn(allUsersInTheseRooms)),
     handler: "ws",
     time,
-    users: resultUsers,
+    users: users.map(transformUserDto),
     online: online,
     opponentWsId: id,
-    profile: {
-      username: user.username,
-      name: user.userProfile.name,
-      sex: user.sex,
-      id: user.id,
-      city: user.userProfile.city,
-      email: user.userAuth.email,
-      birthday: user.userProfile.birthday,
-      contacts: user.userProfile.contacts,
-      surname: user.userProfile.surname,
-      thumbnail: user.thumbnail
-    },
-    settings: {
-      embeddedYoutube: user.userSettings.embeddedYoutube,
-      highlightCode: user.userSettings.highlightCode,
-      incomingFileCallSound: user.userSettings.incomingFileCallSound,
-      messageSound: user.userSettings.messageSound,
-      onlineChangeSound: user.userSettings.onlineChangeSound,
-      showWhenITyping: user.userSettings.showWhenITyping,
-      suggestions: user.userSettings.suggestions,
-      theme: user.userSettings.theme,
-      logs: user.userSettings.logs
-    },
+    profile: transformProfile(user),
+    settings: transformSettings(user),
   }
-
 }
diff --git a/newback/src/modules/rest/password/password.service.ts b/newback/src/modules/rest/password/password.service.ts
index 68cd3c2b4..6c88df635 100644
--- a/newback/src/modules/rest/password/password.service.ts
+++ b/newback/src/modules/rest/password/password.service.ts
@@ -24,7 +24,8 @@ export class PasswordService {
     if (!random) {
       random = await this.generateRandomString(4);
     }
-    return `${userId}:${random}`
+    let userIdString = ('0000' + String(userId)) // make userId be always 4 characters
+    return `${userIdString.substring(userIdString.length - 4, userIdString.length)}:${random}`
   }
 
   public async generateRandomString(length: number): Promise<string> {
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index 8ea10babe..a96b9e47c 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -32,12 +32,12 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
 
   public bindClientConnect(server: BaseWsInstance, callback: Function) {
     server.on(CONNECTION_EVENT, async (...args) => {
-     let handler =  args.find(a => a instanceof WebSocket)
-     if (handler.context) {
+     let ws: WebSocket =  args.find(a => a instanceof WebSocket)
+     if ((ws as any).context) {
        throw Error("WTF");
      }
-     handler.context = {};
-     await callback(...args, handler.context)
+      (ws as any).context = {};
+      await callback(...args, (ws as any).context)
     });
   }
 
diff --git a/newback/src/utils/decorators.ts b/newback/src/utils/decorators.ts
index c73fe58cb..377bf697f 100644
--- a/newback/src/utils/decorators.ts
+++ b/newback/src/utils/decorators.ts
@@ -1,6 +1,12 @@
-import { createParamDecorator, ExecutionContext } from '@nestjs/common';
+import {
+  createParamDecorator,
+  ExecutionContext,
+  UnauthorizedException
+} from '@nestjs/common';
 import {WebSocket} from "ws";
 import {WebSocketContextData} from '@/data/types/internal';
+import {OnGatewayConnection} from '@nestjs/websockets';
+import {WS_SESSION_EXPIRED_CODE} from '@/data/types/frontend';
 
 
 export const WebsocketContext = createParamDecorator(
@@ -19,3 +25,32 @@ export const UserId = createParamDecorator(
     return (handler.context as WebSocketContextData);
   },
 );
+
+
+export function CatchWsErrors(target: OnGatewayConnection, memberName: 'handleConnection', propertyDescriptor: PropertyDescriptor) {
+  return {
+    get() {
+      const wrapperFn = async function (socket, ...args) {
+        try {
+          let result = await propertyDescriptor.value.apply(this, [socket, ...args]);
+          return result;
+        } catch (e) { // need to catch , otherwise node process crashes
+          if (e instanceof UnauthorizedException) {
+            socket.close(WS_SESSION_EXPIRED_CODE, e.message || 'Invalid session')
+          } else if (e?.status >= 400 && e?.status < 500) {  // Invalid frame payload data
+            socket.close(1007, `Error during creating a connection ${e.message}`);
+          } else { // Internal Error
+            socket.close(1011, `Error during opening a socket ${e.message}`);
+          }
+        }
+      }
+
+      Object.defineProperty(this, memberName, {
+        value: wrapperFn,
+        configurable: true,
+        writable: true
+      });
+      return wrapperFn;
+    }
+  }
+}

From 3883b2848fb86d5d98a4abaf532732fc0f96a694 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 15 Apr 2022 00:06:08 +0300
Subject: [PATCH 056/221] Fixed be tests

---
 newback/src/modules/api/auth/auth.module.spec.ts   |  1 +
 .../src/modules/api/verify/verify.module.spec.ts   |  2 ++
 .../src/modules/rest/email/email.service.spec.ts   | 14 +++++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 670dd4355..7deda4e95 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -411,6 +411,7 @@ describe('AuthModule', () => {
       expect(body).toMatchObject({session: expect.any(String)});
     });
     it('sends an email', async() => {
+      configService.getConfig = jest.fn().mockReturnValue({...config, email: {}})
       sequelize.transaction = (resolve) => resolve();
       verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index 8c2729c78..171902d1a 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -130,6 +130,7 @@ describe('VerifyModule', () => {
 
   describe('send-restore-password', () => {
     it('sends password when by username', async() => {
+      configService.getConfig = jest.fn().mockReturnValue({...config, email: {}})
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByUserName = jest.fn().mockResolvedValue({
         userAuth: {
@@ -154,6 +155,7 @@ describe('VerifyModule', () => {
       expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
     });
     it('sends password when by email', async() => {
+      configService.getConfig = jest.fn().mockReturnValue({...config, email: {}})
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByEmail = jest.fn().mockResolvedValue({
         email: 'asd',
diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
index 42237af00..54488f701 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -6,26 +6,32 @@ import {
 } from '@nestjs/testing';
 import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {MailerService} from '@nestjs-modules/mailer';
-import {ConfigModule} from '@/modules/rest/config/config.module';
+
 import {promisify} from 'util';
 import {readFile} from 'fs';
 import {resolve} from 'path';
 import {ConsoleLogger} from '@nestjs/common';
+import {ConfigService} from '@/modules/rest/config/config.service';
+import {config} from 'node-ts-config';
 
 describe('EmailSenderService', () => {
 
   let sender: EmailService;
   let moduleFixture: TestingModule;
   let mailer: MailerService;
+  let configService: ConfigService = {} as ConfigService;
   beforeAll(
     async() => {
 
       moduleFixture = await Test.createTestingModule({
         imports: [
           LoggerModule,
-          ConfigModule
         ],
         providers: [
+           {
+          provide: ConfigService,
+          useValue: configService,
+        },
           {
             provide: MailerService,
             useValue: {sendMail: () => jest.fn().mockResolvedValue(undefined)}
@@ -43,6 +49,7 @@ describe('EmailSenderService', () => {
   })
 
   beforeAll(() => {
+    configService.getConfig = jest.fn().mockReturnValue(config)
     jest.clearAllMocks();
   })
 
@@ -53,7 +60,8 @@ describe('EmailSenderService', () => {
       // jest.setup.js fixes it
       expect(new Date().getTimezoneOffset()).toBe(0);
     });
-    it('should render', async() => {
+    it('should render an email', async() => {
+       configService.getConfig = jest.fn().mockReturnValue({...config, email: {}})
       let spy = jest.spyOn(mailer, 'sendMail');
       jest.useFakeTimers('modern');
       jest.setSystemTime(new Date(2020, 3, 1));

From 13eecabbd77d206b60f0319e084626b61970d3f6 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 15 Apr 2022 02:59:48 +0300
Subject: [PATCH 057/221] Some things works

---
 common/dto.ts                                 | 34 ++++----
 frontend/src/ts/classes/DatabaseWrapper.ts    |  8 +-
 .../src/ts/message_handlers/RomHandler.ts     |  8 +-
 frontend/src/vue/App.vue                      |  9 ++-
 newback/src/data/types/internal.ts            |  4 +
 .../api/websocket/websocket.gateway.ts        | 77 ++++++++++++++-----
 newback/src/modules/app/app.module.ts         |  2 +
 .../src/modules/rest/pubsub/pubsub.service.ts | 77 +++++++++++++++++++
 .../src/modules/rest/redis/redis.service.ts   | 27 ++++++-
 .../src/modules/rest/ws.adapter/ws.adapter.ts | 34 +++++---
 newback/src/utils/decorators.ts               | 27 ++++---
 11 files changed, 237 insertions(+), 70 deletions(-)
 create mode 100644 newback/src/modules/rest/pubsub/pubsub.service.ts

diff --git a/common/dto.ts b/common/dto.ts
index f222982a6..2ca047167 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -148,6 +148,24 @@ export enum UploadedFileChoices {
   ISSUE = 'ISSUE'
 }
 
+/** CODE THAT I PUT HERE MANUALLY */
+
+export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {
+  cbId?: number;
+}
+
+export interface DefaultMessage<A extends string> {
+  action: A;
+}
+
+
+export interface SyncHistoryOutMessage extends DefaultWsOutMessage<"syncHistory"> {
+  roomIds: number[];
+  messagesIds: number[];
+  onServerMessageIds: number[];
+  receivedMessageIds: number[];
+  lastSynced: number;
+}
 
 
 
@@ -155,7 +173,7 @@ export enum UploadedFileChoices {
 
 
 export interface ChangeUserOnlineBase {
-  content: Record<number, string[]>;
+  online: Record<number, string[]>;
   userId: number;
   lastTimeOnline: number;
   time: number;
@@ -242,9 +260,7 @@ export interface CallBackMessage {
   cbId?: number;
 }
 
-export interface DefaultMessage<A extends string> {
-  action: A;
-}
+
 
 export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
   handler: H;
@@ -507,17 +523,7 @@ export interface DestroyFileConnectionMessage extends DefaultWsInMessage<"destro
 
 // import type {DefaultMessage} from "@/ts/types/backend";
 
-export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {
-  cbId?: number;
-}
 
-export interface SyncHistoryOutMessage extends DefaultWsOutMessage<"syncHistory"> {
-  roomIds: number[];
-  messagesIds: number[];
-  onServerMessageIds: number[];
-  receivedMessageIds: number[];
-  lastSynced: number;
-}
 
 
 
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index d1d5dcae2..188a40c5b 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -61,7 +61,7 @@ export default class DatabaseWrapper implements IStorage {
     if (!window.openDatabase) {
       throw Error("DatabaseWrapper not supported");
     }
-    this.db = window.openDatabase("v159", "", "Messages database", 10 * 1024 * 1024);
+    this.db = window.openDatabase("v163", "", "Messages database", 10 * 1024 * 1024);
     this.logger = loggerFactory.getLoggerColor("db", "#753e01");
   }
 
@@ -77,8 +77,8 @@ export default class DatabaseWrapper implements IStorage {
       t = await this.runSql(t, "CREATE TABLE message (id integer primary key, time integer, content text, symbol text, deleted boolean NOT NULL CHECK (deleted IN (0,1)), edited integer, room_id integer REFERENCES room(id), user_id integer REFERENCES user(id), status text, parent_message_id INTEGER REFERENCES message(id) ON UPDATE CASCADE, thread_messages_count INTEGER)");
       t = await this.runSql(t, "CREATE TABLE file (id integer primary key, sending boolean NOT NULL CHECK (sending IN (0,1)), preview_file_id integer, file_id integer, server_id integer UNIQUE, symbol text, url text, message_id INTEGER REFERENCES message(id) ON UPDATE CASCADE , type text, preview text)");
       t = await this.runSql(t, "CREATE TABLE tag (id integer primary key, user_id INTEGER REFERENCES user(id), message_id INTEGER REFERENCES message(id) ON UPDATE CASCADE, symbol text)");
-      t = await this.runSql(t, "CREATE TABLE settings (user_id integer primary key, embedded_youtube boolean NOT NULL CHECK (embedded_youtube IN (0,1)), highlight_code boolean NOT NULL CHECK (highlight_code IN (0,1)), incoming_file_call_sound boolean NOT NULL CHECK (incoming_file_call_sound IN (0,1)), message_sound boolean NOT NULL CHECK (message_sound IN (0,1)), online_change_sound boolean NOT NULL CHECK (online_change_sound IN (0,1)), send_logs boolean NOT NULL CHECK (send_logs IN (0,1)), suggestions boolean NOT NULL CHECK (suggestions IN (0,1)), theme text, logs text, show_when_i_typing boolean NOT NULL CHECK (show_when_i_typing IN (0,1)))");
-      t = await this.runSql(t, "CREATE TABLE profile (user_id integer primary key, username text, name text, city text, surname text, email text, birthday text, contacts text, thumbnail text, sex integer NOT NULL CHECK (sex IN (0,1,2)))");
+      t = await this.runSql(t, "CREATE TABLE settings (user_id integer primary key, embedded_youtube boolean NOT NULL CHECK (embedded_youtube IN (0,1)), highlight_code boolean NOT NULL CHECK (highlight_code IN (0,1)), incoming_file_call_sound boolean NOT NULL CHECK (incoming_file_call_sound IN (0,1)), message_sound boolean NOT NULL CHECK (message_sound IN (0,1)), online_change_sound boolean NOT NULL CHECK (online_change_sound IN (0,1)), suggestions boolean NOT NULL CHECK (suggestions IN (0,1)), theme text, logs text, show_when_i_typing boolean NOT NULL CHECK (show_when_i_typing IN (0,1)))");
+      t = await this.runSql(t, "CREATE TABLE profile (user_id integer primary key, username text, name text, city text, surname text, email text, birthday text, contacts text, thumbnail text, sex text NOT NULL CHECK (sex IN ('MALE','FEMALE','OTHER')))");
       t = await this.runSql(t, "CREATE TABLE room_users (room_id INTEGER REFERENCES room(id), user_id INTEGER REFERENCES user(id))");
       this.logger.log("DatabaseWrapper has been initialized")();
       return null;
@@ -277,7 +277,7 @@ export default class DatabaseWrapper implements IStorage {
 
   public setUserSettings(settings: CurrentUserSettingsModel) {
     this.write((t) => {
-      this.executeSql(t, "insert or replace into settings (user_id, embedded_youtube, highlight_code, incoming_file_call_sound, message_sound, online_change_sound, suggestions, theme, logs, show_when_i_typing) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [1, settings.embeddedYoutube ? 1 : 0, settings.highlightCode ? 1 : 0, settings.incomingFileCallSound ? 1 : 0, settings.messageSound ? 1 : 0, settings.onlineChangeSound ? 1 : 0, settings.suggestions ? 1 : 0, settings.theme, settings.logs, settings.showWhenITyping ? 1 : 0])();
+      this.executeSql(t, "insert or replace into settings (user_id, embedded_youtube, highlight_code, incoming_file_call_sound, message_sound, online_change_sound, suggestions, theme, logs, show_when_i_typing) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [1, settings.embeddedYoutube ? 1 : 0, settings.highlightCode ? 1 : 0, settings.incomingFileCallSound ? 1 : 0, settings.messageSound ? 1 : 0, settings.onlineChangeSound ? 1 : 0, settings.suggestions ? 1 : 0, settings.theme, settings.logs, settings.showWhenITyping ? 1 : 0])();
     });
   }
 
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index a4645a765..1412737f5 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -135,10 +135,10 @@ export class RoomHandler extends MessageHandler {
   }
 
   public removeOnlineUser(message: RemoveOnlineUserMessage) {
-    if (message.content[message.userId].length === 0) {
+    if (message.online[message.userId].length === 0) {
       this.addChangeOnlineEntry(message.userId, message.time, "gone offline");
     }
-    this.store.setOnline(message.content);
+    this.store.setOnline(message.online);
   }
 
   public addChannel(message: AddChannelMessage) {
@@ -190,11 +190,11 @@ export class RoomHandler extends MessageHandler {
   }
 
   public addOnlineUser(message: AddOnlineUserMessage) {
-    if (message.content[message.userId].length === 1) {
+    if (message.online[message.userId].length === 1) {
       // Exactly 1 device is now offline, so that new that appeared is the first one
       this.addChangeOnlineEntry(message.userId, message.time, "appeared online");
     }
-    this.store.setOnline({...message.content}); // Prevent modifying original object
+    this.store.setOnline({...message.online}); // Prevent modifying original object
     const payload: ChangeUserOnlineInfoMessage = {
       handler: "webrtc",
       allowZeroSubscribers: true,
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index 1548895e1..d9dcf8633 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -14,6 +14,7 @@ import {
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import Growls from "@/vue/parts/Growls.vue";
+import {Theme} from '@/ts/types/backend';
 
 @Component({
   name: "App",
@@ -24,12 +25,16 @@ export default class App extends Vue {
   public readonly userSettings!: CurrentUserSettingsModel;
 
   public get mainClass(): string {
-    return this.userSettings && this.userSettings.theme || "color-reg";
+    return this.userSettings && this.userSettings.theme || Theme.COLOR_REG;
   }
 
   @Watch("mainClass")
   public onMainClassChange(value: string) {
-    document.body.parentElement!.className = value;
+    document.body.parentElement!.className  = {
+      [Theme.COLOR_LOR]: 'color-lor',
+      [Theme.COLOR_REG]: 'color-reg',
+      [Theme.COLOR_WHITE]: 'color-white',
+    }[value] as string
   }
 }
 </script>
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 1e71ba92f..6ea96b539 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,5 +1,9 @@
+import {WebSocket} from 'ws';
+
 export interface WebSocketContextData {
   userId: number;
+  id: number;
+  socket: WebSocket;
 }
 export type UserOnlineData = Record<string, string[]>
 
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index cc0b87319..a88d70a08 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -1,15 +1,20 @@
 import {
+  ConnectedSocket,
   MessageBody,
   OnGatewayConnection,
   SubscribeMessage,
   WebSocketGateway,
+  WebSocketServer,
 } from '@nestjs/websockets';
 import {IncomingMessage} from 'http';
 import {
   CatchWsErrors,
   UserId
 } from '@/utils/decorators';
-import {WebSocket} from 'ws';
+import {
+  Server,
+  WebSocket
+} from 'ws';
 import {WebSocketContextData} from '@/data/types/internal';
 import {RedisService} from '@/modules/rest/redis/redis.service';
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
@@ -19,6 +24,15 @@ import {PasswordService} from '@/modules/rest/password/password.service';
 import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
 import {transformSetWsId} from '@/modules/api/websocket/ws.transformer';
+import {Logger} from '@nestjs/common';
+import {
+  AddOnlineUserMessage,
+  SyncHistoryOutMessage
+} from '@/data/types/frontend';
+import {
+  PubsubService,
+  Subscribe
+} from '@/modules/rest/pubsub/pubsub.service';
 
 
 @WebSocketGateway({
@@ -26,19 +40,25 @@ import {transformSetWsId} from '@/modules/api/websocket/ws.transformer';
 })
 export class WebsocketGateway implements OnGatewayConnection {
 
+  @WebSocketServer()
+  public readonly server!: Server;
+
   constructor(
+    public readonly logger: Logger,
     private readonly sessionService: SessionService,
     private readonly passwordService: PasswordService,
     private readonly ipCacheService: IpCacheService,
     private readonly redisService: RedisService,
     private readonly roomRepository: RoomRepository,
     private readonly userRepository: UserRepository,
+    private readonly pubsubService: PubsubService,
   ) {
   }
 
 
   @CatchWsErrors
   async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) {
+    context.socket = socket;
     let url = new URLSearchParams(message.url);
     let user: UserModel = await this.sessionService.getUserById(url.get('sessionId'));
     let id = await this.passwordService.createWsId(user.id, url.get('id'));
@@ -65,32 +85,47 @@ export class WebsocketGateway implements OnGatewayConnection {
         time: Date.now()
       }
     )
+    context.userId = user.id;
+    context.id = user.id;
+
+    let channelsToListen = [...myRooms.map(r => String(r.id)), id, `u${user.id}`, '*'];
+    this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`);
     socket.send(JSON.stringify(response));
+    this.pubsubService.subscribe(context, ...channelsToListen)
+    this.pubsubService.emit(
+      'addOnlineUser',
+      {
+        online: response.online,
+        userId: user.id,
+        lastTimeOnline: user.lastTimeOnline,
+        time: Date.now(),
+        opponentWsId: '0002:lMKO'
+      },
+      '*'
+    )
+  }
 
+  @Subscribe('addOnlineUser')
+  public onLogin(ctx: WebSocketContextData, data: any) {
+    let message: AddOnlineUserMessage = {
+      action: 'addOnlineUser',
+      handler: 'room',
+      online: data.online,
+      lastTimeOnline: data.lastTimeOnline,
+      userId: data.userId,
+      time: data.time,
+      opponentWsId: data.opponentWsId,
+    }
+    ctx.socket.send(JSON.stringify(message))
   }
 
-  @SubscribeMessage('hello') //ws.ws.send(JSON.stringify({action: 'hello'}))
-  handleEvent(@MessageBody()
-                data: string, @UserId()
-                user
-  ):
-    any {
+  @SubscribeMessage('syncHistory') //ws.ws.send(JSON.stringify({action: 'hello'}))
+  syncHistory(@MessageBody() data: SyncHistoryOutMessage, @ConnectedSocket() a, @UserId() user): any {
     console.log(user);
-    // const event = 'events';
-    // this.server.clients.forEach((client) => {
-    //   client.send(JSON.stringify({event, data}));
-    // });
-    return "asda";
   }
 
-  @SubscribeMessage('hey') //ws.ws.send(JSON.stringify({action: 'hello'}))
-  handleHey(@MessageBody()
-              data: string
-  ) {
-    console.log('asd2');
-    // const event = 'events';
-    // this.server.clients.forEach((client) => {
-    //   client.send(JSON.stringify({event, data}));
-    // });
+  @SubscribeMessage('getCountryCode') //ws.ws.send(JSON.stringify({action: 'hello'}))
+  getCountryCode(@MessageBody() data: SyncHistoryOutMessage, @ConnectedSocket() a, @UserId() user): any {
+    console.log(user);
   }
 }
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 342a29361..dfc0d906d 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -13,6 +13,7 @@ import {SessionService} from '@/modules/rest/session/session.service';
 import {PasswordService} from '@/modules/rest/password/password.service';
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {DatabaseModule} from '@/modules/rest/database/database.module';
+import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
 
 @Module({
   imports: [
@@ -26,6 +27,7 @@ import {DatabaseModule} from '@/modules/rest/database/database.module';
       imports: [DatabaseModule],
       providers: [
         RedisService,
+        PubsubService,
         SessionService,
         PasswordService,
       ]
diff --git a/newback/src/modules/rest/pubsub/pubsub.service.ts b/newback/src/modules/rest/pubsub/pubsub.service.ts
new file mode 100644
index 000000000..b927eeff6
--- /dev/null
+++ b/newback/src/modules/rest/pubsub/pubsub.service.ts
@@ -0,0 +1,77 @@
+import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
+import {
+  Injectable,
+  Logger
+} from '@nestjs/common';
+import {WebSocketContextData} from '@/data/types/internal';
+
+
+interface HandlerType {
+  target: WebsocketGateway;
+  memberName: keyof WebsocketGateway;
+  handler: string;
+}
+
+let handlers: HandlerType[] = [];
+
+
+// function stateDecoratorFactory<TPT extends VuexModule>(vuexModule: TPT):
+// <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
+// (vueComponent: TCT, fileName: TPN) => void {
+//   return <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
+//   (vueComponent: TCT, fileName: TPN):
+//
+export function Subscribe(handler: string) {
+  return (target: WebsocketGateway, memberName: keyof WebsocketGateway, propertyDescriptor: PropertyDescriptor) => {
+    handlers.push({
+      handler,
+      memberName,
+      target,
+    })
+  }
+}
+
+let receivers: Record<string, {ctx: WebSocketContextData}[]> = {};
+
+@Injectable()
+export class PubsubService {
+
+  constructor(
+    private readonly logger: Logger,
+  ) {
+  }
+
+  public emit(handler: string, data: any, ...channel: string[]) {
+    channel.forEach(channel => {
+      if (receivers[channel]) {
+        receivers[channel].forEach(receiver => {
+          let proxy = handlers.find(h => h.handler === handler);
+          (proxy.target[proxy.memberName] as any)(receiver.ctx, data);
+        })
+      }
+    })
+  }
+
+  public subscribe(context: WebSocketContextData, ...channel: string[]) {
+    channel.forEach(channel => {
+      if (!receivers[channel]) {
+        receivers[channel] = []
+      }
+      receivers[channel].push({
+        ctx: context
+      })
+    })
+
+  }
+
+  public unsubscribe(context: WebSocketContextData, ...channel: string[]) {
+    channel.forEach(channel => {
+      if (receivers[channel]) {
+        let index = receivers[channel].findIndex(c => c.ctx = context);
+        if (index >= 0) {
+          receivers[channel].splice(index, 1);
+        }
+      }
+    })
+  }
+}
diff --git a/newback/src/modules/rest/redis/redis.service.ts b/newback/src/modules/rest/redis/redis.service.ts
index e292b77b6..24aeeb975 100644
--- a/newback/src/modules/rest/redis/redis.service.ts
+++ b/newback/src/modules/rest/redis/redis.service.ts
@@ -1,4 +1,7 @@
-import {Injectable} from '@nestjs/common';
+import {
+  Injectable,
+  Logger
+} from '@nestjs/common';
 import {
   REDIS_KEYS,
 } from '@/utils/consts';
@@ -13,20 +16,24 @@ export class RedisService {
 
   constructor(
     @InjectRedis() private readonly redis: Redis,
+    private readonly logger: Logger,
   ) {
   }
 
 
   public async saveSession(session: string, userId: number): Promise<void> {
+    this.logger.debug(`hset ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]=${userId}` ,'redis')
     await this.redis.hset(REDIS_KEYS.REDIS_SESSIONS_KEY, session, userId);
   }
 
   public async removeSession(session: string) {
+    this.logger.debug(`hdel ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]` ,'redis')
     await this.redis.hdel(REDIS_KEYS.REDIS_SESSIONS_KEY, session);
   }
 
   public async getSession(session: string): Promise<number | null> {
     let a = await this.redis.hget(REDIS_KEYS.REDIS_SESSIONS_KEY, session);
+    this.logger.debug(`hget ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]=${a}` ,'redis')
     if (!a) {
       return null;
     }
@@ -34,25 +41,37 @@ export class RedisService {
   }
 
   public async addOnline(id: string): Promise<void> {
+    this.logger.debug(`sadd ${REDIS_KEYS.REDIS_ONLINE_KEY}=${id}` ,'redis')
     this.redis.sadd(REDIS_KEYS.REDIS_ONLINE_KEY, id)
   }
 
   public async getOnline(): Promise<UserOnlineData> {
     let data = await this.redis.smembers(REDIS_KEYS.REDIS_ONLINE_KEY);
+    this.logger.debug(`smembers ${REDIS_KEYS.REDIS_ONLINE_KEY}=${data}` ,'redis')
     if (!data) {
       return {};
     }
 
     return data.reduce((set, currentValue) => {
       let [userId, id] = currentValue.split(':');
-      if (!set[userId]) {
-        set[userId] = []
+      let normalizedUserId = parseInt(userId);
+      if (!set[normalizedUserId]) {
+        set[normalizedUserId] = []
       }
-      set[userId].push(id)
+      set[normalizedUserId].push(id)
       return set;
     }, {} as UserOnlineData);
 
   }
 
+  public async getNewRedisInstance() {
+
+  }
+// import  {promisify} from 'util';
+  // public async subscribe(channels: string[]) {
+  //   // @ts-expect-error
+  //   await promisify(this.redis.subscribe)(...channels);
+  // }
+
 
 }
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index a96b9e47c..2f6838f21 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -1,4 +1,5 @@
 import {
+  BadRequestException,
   Logger,
   WebSocketAdapter
 } from '@nestjs/common';
@@ -17,6 +18,7 @@ import {
   WebSocket,
   WebSocketServer
 } from "ws";
+import {processErrors} from '@/utils/decorators';
 
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
@@ -31,11 +33,11 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
   }
 
   public bindClientConnect(server: BaseWsInstance, callback: Function) {
-    server.on(CONNECTION_EVENT, async (...args) => {
-     let ws: WebSocket =  args.find(a => a instanceof WebSocket)
-     if ((ws as any).context) {
-       throw Error("WTF");
-     }
+    server.on(CONNECTION_EVENT, async(...args) => {
+      let ws: WebSocket = args.find(a => a instanceof WebSocket)
+      if ((ws as any).context) {
+        throw Error("WTF");
+      }
       (ws as any).context = {};
       await callback(...args, (ws as any).context)
     });
@@ -80,15 +82,23 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
     handlers: MessageMappingProperties[],
   ) {
     client.on(MESSAGE_METADATA, (data) => {
-      if (client.readyState !== client.OPEN) {
-        throw Error('asd')
-      }
-      const parsed = JSON.parse(data as any);
-      if (!parsed.action) {
-        throw Error("invalid message")
+      try {
+        if (client.readyState !== client.OPEN) {
+          throw new BadRequestException('Cannot process new messages, while opening a connection')
+        }
+        const parsed = JSON.parse(data as any);
+        if (!parsed.action) {
+          throw new BadRequestException('Invalid message structure, "action" property is not defined')
+        }
+        let handler = handlers.find(handler => handler.message === parsed.action)
+        if (!handler) {
+          throw new BadRequestException(`Unknown handler ${parsed.action}`);
+        }
+        handler.callback(parsed);
+      } catch (e) {
+        processErrors(e, client, this.logger);
       }
 
-      handlers.find(handler => handler.message === parsed.action).callback(parsed);
     });
 
   }
diff --git a/newback/src/utils/decorators.ts b/newback/src/utils/decorators.ts
index 377bf697f..1de86dc5a 100644
--- a/newback/src/utils/decorators.ts
+++ b/newback/src/utils/decorators.ts
@@ -1,6 +1,7 @@
 import {
   createParamDecorator,
   ExecutionContext,
+  Logger,
   UnauthorizedException
 } from '@nestjs/common';
 import {WebSocket} from "ws";
@@ -22,12 +23,26 @@ export const WebsocketContext = createParamDecorator(
 export const UserId = createParamDecorator(
   (data: unknown, ctx: ExecutionContext) => {
     let handler =  ctx.getArgs().find(a => a instanceof WebSocket)
-    return (handler.context as WebSocketContextData);
+    return (handler.context as WebSocketContextData).userId;
   },
 );
 
 
-export function CatchWsErrors(target: OnGatewayConnection, memberName: 'handleConnection', propertyDescriptor: PropertyDescriptor) {
+export function processErrors(e, socket, logger: Logger) {
+  logger.error(`Ws error ${e.message}`, e.stack,  'ws')
+  if (e instanceof UnauthorizedException) {
+    socket.close(WS_SESSION_EXPIRED_CODE, e.message || 'Invalid session')
+  } else if (e?.status >= 400 && e?.status < 500) {  // Invalid frame payload data
+    socket.close(1007, `Error during creating a connection ${e.message}`);
+  } else { // Internal Error
+    socket.close(1011, `Error during opening a socket ${e.message}`);
+  }
+}
+interface TargetCatchErrors extends OnGatewayConnection{
+  logger: Logger;
+}
+
+export function CatchWsErrors(target: TargetCatchErrors, memberName: 'handleConnection', propertyDescriptor: PropertyDescriptor) {
   return {
     get() {
       const wrapperFn = async function (socket, ...args) {
@@ -35,13 +50,7 @@ export function CatchWsErrors(target: OnGatewayConnection, memberName: 'handleCo
           let result = await propertyDescriptor.value.apply(this, [socket, ...args]);
           return result;
         } catch (e) { // need to catch , otherwise node process crashes
-          if (e instanceof UnauthorizedException) {
-            socket.close(WS_SESSION_EXPIRED_CODE, e.message || 'Invalid session')
-          } else if (e?.status >= 400 && e?.status < 500) {  // Invalid frame payload data
-            socket.close(1007, `Error during creating a connection ${e.message}`);
-          } else { // Internal Error
-            socket.close(1011, `Error during opening a socket ${e.message}`);
-          }
+          processErrors(e, socket, this.logger);
         }
       }
 

From 509d60cfb0c499181b131c0d8d12674a5e35fdab Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 15 Apr 2022 03:07:12 +0300
Subject: [PATCH 058/221] Added log context

---
 newback/src/modules/api/auth/auth.service.ts           | 10 +++++-----
 newback/src/modules/api/auth/facebook.auth.service.ts  |  4 ++--
 newback/src/modules/api/verify/verify.service.ts       |  2 +-
 newback/src/modules/api/websocket/websocket.gateway.ts |  2 +-
 .../modules/app/interceptors/logging.interceptor.ts    |  4 ++--
 newback/src/modules/rest/http/http.service.ts          |  8 ++++----
 newback/src/modules/rest/ip/ip.cache.service.ts        |  2 +-
 newback/src/modules/rest/session/session.service.ts    |  2 +-
 newback/src/modules/rest/ws.adapter/ws.adapter.ts      |  4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 96e74b5a1..ebefabbb1 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -68,7 +68,7 @@ export class AuthService {
           // the chance that there will be a user with same id is insignificant
           username = await this.passwordService.generateRandomString(MAX_USERNAME_LENGTH);
         }
-        this.logger.log(`Generates username='${username}' for fbId ${fbResponse.id}`);
+        this.logger.log(`Generates username='${username}' for fbId ${fbResponse.id}`, 'auth.service');
         const password = await this.passwordService.createPassword(await this.passwordService.generateRandomString(16));
 
         let userId = await this.userRepository.createUser({
@@ -107,7 +107,7 @@ export class AuthService {
           // the chance that there will be a user with same id is insignificant
           username = await this.passwordService.generateRandomString(MAX_USERNAME_LENGTH);
         }
-        this.logger.log(`Generates username='${username}' for email ${googleResponse.email}`);
+        this.logger.log(`Generates username='${username}' for email ${googleResponse.email}`, 'auth.service');
         const password = await this.passwordService.createPassword(await this.passwordService.generateRandomString(16));
 
         let userId = await this.userRepository.createUser({
@@ -153,16 +153,16 @@ export class AuthService {
 
   public async sendVerificationEmail(email: string, userId: number, username: string, ip: string) {
     try {
-      this.logger.debug(`Preparing for sending verification email to userId ${userId}`)
+      this.logger.debug(`Preparing for sending verification email to userId ${userId}`, 'auth.service')
       await this.sequelize.transaction(async(t) => {
         let token = await this.passwordService.generateRandomString(32);
-        this.logger.log(`Generated token for userId ${userId}: ${token}`)
+        this.logger.log(`Generated token for userId ${userId}: ${token}`, 'auth.service')
         await this.verificationRepository.createVerification(email, userId, token, VerificationType.REGISTER, t)
         let ipInfo = await this.ipCacheService.getIpString(ip)
         await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ipInfo)
       });
     } catch (e) {
-      this.logger.error(`Can't send email to userid ${userId} ${email} because ${e.message}`, e.stack, 'Mail')
+      this.logger.error(`Can't send email to userid ${userId} ${email} because ${e.message}`, e.stack, 'auth.service')
     }
 
   }
diff --git a/newback/src/modules/api/auth/facebook.auth.service.ts b/newback/src/modules/api/auth/facebook.auth.service.ts
index 7199821bf..feb489e2e 100644
--- a/newback/src/modules/api/auth/facebook.auth.service.ts
+++ b/newback/src/modules/api/auth/facebook.auth.service.ts
@@ -43,7 +43,7 @@ export class FacebookAuthService {
       }
     }
     let userId = response.data.user_id;
-    this.logger.log(`got userId='${userId}' for facebookToken='${idToken}'`);
+    this.logger.log(`got userId='${userId}' for facebookToken='${idToken}'`, 'facebook.auth.service');
     if (!userId) {
       throw new InternalServerErrorException("invalid facebook response, userId is missing")
     }
@@ -56,7 +56,7 @@ export class FacebookAuthService {
     if (!facebookUser.id) {
       throw new InternalServerErrorException("invalid facebook response, id is missing")
     }
-    this.logger.log(`got userid='${facebookUser.id}' for facebookToken='${idToken}'`);
+    this.logger.log(`got userid='${facebookUser.id}' for facebookToken='${idToken}'`, 'facebook.auth.service');
     return facebookUser;
   }
 }
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index ce95cd9d0..ca97775d1 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -80,7 +80,7 @@ export class VerifyService {
       let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
       this.doTokenVerification(verificationModel, VerificationType.PASSWORD);
       let password = await this.passwordService.createPassword(body.password);
-      this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`);
+      this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`, 'verify.service');
       await this.userRepository.updateUserPassword(verificationModel.userId, password, t)
       await this.verificationRepository.markVerificationVerified(verificationModel.id, t);
       let session = await this.sessionService.createAndSaveSession(verificationModel.userId);
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index a88d70a08..4f4ecf064 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -89,7 +89,7 @@ export class WebsocketGateway implements OnGatewayConnection {
     context.id = user.id;
 
     let channelsToListen = [...myRooms.map(r => String(r.id)), id, `u${user.id}`, '*'];
-    this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`);
+    this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`, 'ws');
     socket.send(JSON.stringify(response));
     this.pubsubService.subscribe(context, ...channelsToListen)
     this.pubsubService.emit(
diff --git a/newback/src/modules/app/interceptors/logging.interceptor.ts b/newback/src/modules/app/interceptors/logging.interceptor.ts
index 3e2b1a863..c6219357a 100644
--- a/newback/src/modules/app/interceptors/logging.interceptor.ts
+++ b/newback/src/modules/app/interceptors/logging.interceptor.ts
@@ -25,12 +25,12 @@ export class LoggingInterceptor implements NestInterceptor {
     let request = context.switchToHttp().getRequest();
     let thisId = this.id++;
     if (request.body) {
-      this.logger.debug(`Request[${thisId}]: body=${JSON.stringify(request.body)}, headers=${JSON.stringify(request.headers)}`, 'Http');
+      this.logger.debug(`Request[${thisId}]: body=${JSON.stringify(request.body)}, headers=${JSON.stringify(request.headers)}`, 'http');
     }
     return next.handle().pipe(tap((responseBody) => {
       this.logger.debug(`Response[${thisId}]: body=${JSON.stringify(responseBody)}`, 'Http')
     })).pipe(catchError(err => {
-      this.logger.error(`Response[${thisId}]]: err='${err.message}', body=${JSON.stringify(err.response)}`, err.stack, 'Http');
+      this.logger.error(`Response[${thisId}]]: err='${err.message}', body=${JSON.stringify(err.response)}`, err.stack, 'http');
       return throwError(err)
     }));
   }
diff --git a/newback/src/modules/rest/http/http.service.ts b/newback/src/modules/rest/http/http.service.ts
index 8d2706dd8..081e9a6e4 100644
--- a/newback/src/modules/rest/http/http.service.ts
+++ b/newback/src/modules/rest/http/http.service.ts
@@ -39,26 +39,26 @@ export class HttpService {
 
   private async post<T = Record<string, any>>(url, body: any, headers: Record<string, string>): Promise<T> {
     let requestId = ++this.requestId;
-    this.logger.debug(`POST[${requestId}]: url='${url}'; data=${body}; headers=${JSON.stringify(headers)} `)
+    this.logger.debug(`POST[${requestId}]: url='${url}'; data=${body}; headers=${JSON.stringify(headers)}`, 'api')
     const response = await this.nodeFetch(url, {
       method: 'post',
       body,
       headers
     });
     const responseBody = await response.json();
-    this.logger.debug(`POST[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`)
+    this.logger.debug(`POST[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`, 'api')
     return responseBody;
   }
 
   private async get<T = Record<string, any>>(url, headers: Record<string, string>): Promise<T> {
     let requestId = ++this.requestId;
-    this.logger.debug(`GET[${requestId}]: url='${url}'; headers=${JSON.stringify(headers)} `)
+    this.logger.debug(`GET[${requestId}]: url='${url}'; headers=${JSON.stringify(headers)}`, 'api')
     const response = await this.nodeFetch(url, {
       method: 'get',
       headers
     });
     const responseBody = await response.json();
-    this.logger.debug(`GET[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`)
+    this.logger.debug(`GET[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`, 'api')
     return responseBody;
   }
 
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/rest/ip/ip.cache.service.ts
index 662c0f5e0..a0a237c96 100644
--- a/newback/src/modules/rest/ip/ip.cache.service.ts
+++ b/newback/src/modules/rest/ip/ip.cache.service.ts
@@ -55,7 +55,7 @@ export class IpCacheService {
       await this.ipRepository.saveIP(model)
       return model;
     } catch (e: any) {
-      this.logger.error(`Unable to get Ip Address Info ${ip}`, e.stack, e.error)
+      this.logger.error(`Unable to get Ip Address Info ${ip} ${e.error}`, e.stack, 'ip.cache.service')
       if (!(e as InvalidIpException).networkError) {
         await this.ipRepository.saveIP({ip, status: false})
         return null;
diff --git a/newback/src/modules/rest/session/session.service.ts b/newback/src/modules/rest/session/session.service.ts
index b92324a60..f510f642d 100644
--- a/newback/src/modules/rest/session/session.service.ts
+++ b/newback/src/modules/rest/session/session.service.ts
@@ -22,7 +22,7 @@ export class SessionService {
 
   public async createAndSaveSession(userId: number) {
     let session = await this.passwordService.generateRandomString(32);
-    this.logger.log(`Generated session for userId ${userId}: ${session}`)
+    this.logger.log(`Generated session for userId ${userId}: ${session}`, 'session.service')
     await this.redisService.saveSession(session, userId);
     return session;
   }
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index 2f6838f21..e6b12fbde 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -71,9 +71,9 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
     });
 
     this.httpServer.on(CONNECTION_EVENT, (ws: any) =>
-      ws.on(ERROR_EVENT, (err: any) => this.logger.error(err)),
+      ws.on(ERROR_EVENT, (err: any) => this.logger.error(err, err?.stack, 'ws')),
     );
-    this.httpServer.on(ERROR_EVENT, (err: any) => this.logger.error(err));
+    this.httpServer.on(ERROR_EVENT, (err: any) => this.logger.error(err, err?.stack, 'ws'));
     return this.wsServer;
   }
 

From 865b575881b173c7620182839afa98392de5bec6 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 15 Apr 2022 11:47:12 +0300
Subject: [PATCH 059/221] Added log context

---
 common/dto.ts                                 |  49 +++++----
 newback/src/data/types/api.ts                 |   2 -
 newback/src/data/types/internal.ts            |   4 +-
 newback/src/modules/api/auth/auth.service.ts  |   4 +-
 .../api/websocket/interfaces/pubsub.ts        |  15 +++
 .../{ => transformers}/ws.transformer.ts      |  13 +++
 .../api/websocket/websocket.gateway.ts        | 101 +++---------------
 .../api/websocket/websocket.service.ts        |  77 +++++++++++++
 newback/src/modules/app/app.module.ts         |   2 +
 .../src/modules/rest/pubsub/pubsub.service.ts |  10 +-
 .../src/modules/rest/ws.adapter/ws.adapter.ts |  20 +++-
 11 files changed, 176 insertions(+), 121 deletions(-)
 create mode 100644 newback/src/modules/api/websocket/interfaces/pubsub.ts
 rename newback/src/modules/api/websocket/{ => transformers}/ws.transformer.ts (91%)
 create mode 100644 newback/src/modules/api/websocket/websocket.service.ts

diff --git a/common/dto.ts b/common/dto.ts
index 2ca047167..4f56c1631 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -166,19 +166,7 @@ export interface SyncHistoryOutMessage extends DefaultWsOutMessage<"syncHistory"
   receivedMessageIds: number[];
   lastSynced: number;
 }
-
-
-
-/** BasemessagesInterfaces.ts */
-
-
-export interface ChangeUserOnlineBase {
-  online: Record<number, string[]>;
-  userId: number;
-  lastTimeOnline: number;
-  time: number;
-}
-
+/** CODE I PUT HERE MANUALLY WS IN */
 /*
  * Any means that every every registered subscriber will be called with this handler if it exists
  * this means, that handler that registered this event will be called
@@ -197,9 +185,28 @@ export type HandlerName =
   | "webrtcTransfer:*"
   | "ws-message"
   | "ws";
-export type CallHandlerName =
-  HandlerName
-  | "dummyCall";
+
+export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
+  handler: H;
+}
+
+export interface DefaultWsInMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H>, CallBackMessage {
+  cbBySender?: string;
+  cbId?: number;
+}
+
+
+/** BasemessagesInterfaces.ts */
+
+
+export interface ChangeUserOnlineBase {
+  online: Record<number, string[]>;
+  userId: number;
+  lastTimeOnline: number;
+  time: number;
+}
+
+
 
 export type HandlerType<A extends string, H extends HandlerName> = (a: DefaultInMessage<A, H | "*">) => Promise<void> | void;
 
@@ -261,11 +268,6 @@ export interface CallBackMessage {
 }
 
 
-
-export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
-  handler: H;
-}
-
 export interface ResolveCallbackId {
   resolveCbId?: number; // If this callback id is present, resolve it
 }
@@ -319,10 +321,7 @@ export type CallStatus =
 // } from "@/ts/types/backend";
 // import type {MessageStatus} from "@/ts/types/model";
 
-export interface DefaultWsInMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H>, CallBackMessage {
-  cbBySender?: string;
-  cbId?: number;
-}
+
 
 export interface MessagesResponseMessage {
   content: MessageModelDto[];
diff --git a/newback/src/data/types/api.ts b/newback/src/data/types/api.ts
index 296c9254d..0b27c9cdf 100644
--- a/newback/src/data/types/api.ts
+++ b/newback/src/data/types/api.ts
@@ -9,8 +9,6 @@ export interface IpFailedInfoResponse {
   status: 'fail';
 }
 
-export const IP_FAIL = 'fail';
-
 export interface IpSuccessInfoResponse {
   status: 'success';
   country: string;
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 6ea96b539..08e0d4eef 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,9 +1,9 @@
-import {WebSocket} from 'ws';
+import {DefaultWsInMessage} from '@/data/types/frontend';
 
 export interface WebSocketContextData {
   userId: number;
   id: number;
-  socket: WebSocket;
+  sendToClient(data: DefaultWsInMessage<any, any>);
 }
 export type UserOnlineData = Record<string, string[]>
 
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index ebefabbb1..5e5052e84 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -60,7 +60,7 @@ export class AuthService {
       let userAuth = await this.userRepository.getUserMyAuthFacebook(fbResponse.id, t)
       if (userAuth) {
         let session = await this.sessionService.createAndSaveSession(userAuth.id);
-        let response: GoogleSignInResponse = {session, isNewAccount: false};
+        let response: FacebookSignInResponse = {session, isNewAccount: false};
         return response;
       } else {
         let username = generateUserName(`${fbResponse.first_name}_${fbResponse.last_name}`);
@@ -82,7 +82,7 @@ export class AuthService {
         await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
 
         let session = await this.sessionService.createAndSaveSession(userId);
-        let response: GoogleSignInResponse = {session, isNewAccount: true, username};
+        let response: FacebookSignInResponse = {session, isNewAccount: true, username};
         return response;
       }
     });
diff --git a/newback/src/modules/api/websocket/interfaces/pubsub.ts b/newback/src/modules/api/websocket/interfaces/pubsub.ts
new file mode 100644
index 000000000..11f203a72
--- /dev/null
+++ b/newback/src/modules/api/websocket/interfaces/pubsub.ts
@@ -0,0 +1,15 @@
+import {
+  DefaultInMessage,
+  DefaultWsInMessage,
+  HandlerName
+} from '@/data/types/frontend';
+import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
+
+export interface PubSubMessage<A extends string, H extends HandlerName> {
+  content: DefaultWsInMessage<A, H>;
+}
+
+// export interface SendToClientPubSubMessage<A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
+// }
+export interface SendToClientPubSubMessage<DATA extends DefaultWsInMessage<A,H>, A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
+}
diff --git a/newback/src/modules/api/websocket/ws.transformer.ts b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
similarity index 91%
rename from newback/src/modules/api/websocket/ws.transformer.ts
rename to newback/src/modules/api/websocket/transformers/ws.transformer.ts
index 183b90442..e1b350c24 100644
--- a/newback/src/modules/api/websocket/ws.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
@@ -1,4 +1,5 @@
 import {
+  AddOnlineUserMessage,
   ChannelDto,
   RoomDto,
   SetWsIdMessage,
@@ -125,3 +126,15 @@ export function transformSetWsId(
     settings: transformSettings(user),
   }
 }
+
+export function transformAddUserOnline(online:  Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
+  return {
+    action: "addOnlineUser",
+    handler: "room",
+    online,
+    userId: user.id,
+    lastTimeOnline: user.lastTimeOnline,
+    time: Date.now(),
+    opponentWsId
+  };
+}
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 4f4ecf064..a07aecdc8 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -16,24 +16,11 @@ import {
   WebSocket
 } from 'ws';
 import {WebSocketContextData} from '@/data/types/internal';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {SessionService} from '@/modules/rest/session/session.service';
-import {UserModel} from '@/data/model/user.model';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
-import {transformSetWsId} from '@/modules/api/websocket/ws.transformer';
 import {Logger} from '@nestjs/common';
-import {
-  AddOnlineUserMessage,
-  SyncHistoryOutMessage
-} from '@/data/types/frontend';
-import {
-  PubsubService,
-  Subscribe
-} from '@/modules/rest/pubsub/pubsub.service';
-
+import {SyncHistoryOutMessage} from '@/data/types/frontend';
+import {SubscribePuBSub} from '@/modules/rest/pubsub/pubsub.service';
+import {SendToClientPubSubMessage} from '@/modules/api/websocket/interfaces/pubsub';
+import {WebsocketService} from '@/modules/api/websocket/websocket.service';
 
 @WebSocketGateway({
   path: '/ws'
@@ -45,87 +32,31 @@ export class WebsocketGateway implements OnGatewayConnection {
 
   constructor(
     public readonly logger: Logger,
-    private readonly sessionService: SessionService,
-    private readonly passwordService: PasswordService,
-    private readonly ipCacheService: IpCacheService,
-    private readonly redisService: RedisService,
-    private readonly roomRepository: RoomRepository,
-    private readonly userRepository: UserRepository,
-    private readonly pubsubService: PubsubService,
+    public readonly websocketService: WebsocketService,
   ) {
   }
 
 
   @CatchWsErrors
   async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) {
-    context.socket = socket;
-    let url = new URLSearchParams(message.url);
-    let user: UserModel = await this.sessionService.getUserById(url.get('sessionId'));
-    let id = await this.passwordService.createWsId(user.id, url.get('id'));
-    let ip = (socket as any)._socket.remoteAddress;
-    await this.ipCacheService.saveIp(user.id, ip);
-    await this.redisService.addOnline(id)
-    let online = await this.redisService.getOnline();
-
-    let myRooms = await this.roomRepository.getRoomsForUser(user.id);
-    let channelIds = myRooms.map(r => r.channelId).filter(c => c)
-    let channels = await this.roomRepository.getAllChannels(channelIds);
-    let allUsersInTheseRooms = await this.roomRepository.getRoomUsers(myRooms.map(r => r.id));
-    let userIds: number[] = [...new Set(allUsersInTheseRooms.map(r => r.userId))];
-    let users: UserModel[] = await this.userRepository.getUsersById(userIds);
-    let response = transformSetWsId(
-      {
-        id,
-        allUsersInTheseRooms,
-        online,
-        myRooms,
-        users,
-        user,
-        channels,
-        time: Date.now()
-      }
-    )
-    context.userId = user.id;
-    context.id = user.id;
-
-    let channelsToListen = [...myRooms.map(r => String(r.id)), id, `u${user.id}`, '*'];
-    this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`, 'ws');
-    socket.send(JSON.stringify(response));
-    this.pubsubService.subscribe(context, ...channelsToListen)
-    this.pubsubService.emit(
-      'addOnlineUser',
-      {
-        online: response.online,
-        userId: user.id,
-        lastTimeOnline: user.lastTimeOnline,
-        time: Date.now(),
-        opponentWsId: '0002:lMKO'
-      },
-      '*'
-    )
+    await this.websocketService.handleConnection(message.url, context, (socket as any)._socket.remoteAddress)
   }
 
-  @Subscribe('addOnlineUser')
-  public onLogin(ctx: WebSocketContextData, data: any) {
-    let message: AddOnlineUserMessage = {
-      action: 'addOnlineUser',
-      handler: 'room',
-      online: data.online,
-      lastTimeOnline: data.lastTimeOnline,
-      userId: data.userId,
-      time: data.time,
-      opponentWsId: data.opponentWsId,
-    }
-    ctx.socket.send(JSON.stringify(message))
+  @SubscribePuBSub('sendToClient')
+  public sendToClient(ctx: WebSocketContextData, data: SendToClientPubSubMessage<any, any, any>) {
+    ctx.sendToClient(data.content);
   }
 
-  @SubscribeMessage('syncHistory') //ws.ws.send(JSON.stringify({action: 'hello'}))
+  @SubscribeMessage('syncHistory')
   syncHistory(@MessageBody() data: SyncHistoryOutMessage, @ConnectedSocket() a, @UserId() user): any {
-    console.log(user);
   }
 
-  @SubscribeMessage('getCountryCode') //ws.ws.send(JSON.stringify({action: 'hello'}))
+  @SubscribeMessage('printMessage')
+  printMessage(@MessageBody() data: SyncHistoryOutMessage, @ConnectedSocket() a, @UserId() user): any {
+  }
+
+  @SubscribeMessage('getCountryCode')
   getCountryCode(@MessageBody() data: SyncHistoryOutMessage, @ConnectedSocket() a, @UserId() user): any {
-    console.log(user);
   }
+
 }
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
new file mode 100644
index 000000000..d1360093c
--- /dev/null
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -0,0 +1,77 @@
+import {
+  Injectable,
+  Logger
+} from '@nestjs/common';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {AddOnlineUserMessage} from '@/data/types/frontend';
+import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {SessionService} from '@/modules/rest/session/session.service';
+import {UserModel} from '@/data/model/user.model';
+import {
+  transformAddUserOnline,
+  transformSetWsId
+} from '@/modules/api/websocket/transformers/ws.transformer';
+import {WebSocketContextData} from '@/data/types/internal';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
+
+@Injectable()
+export class WebsocketService {
+
+  constructor(
+    public readonly logger: Logger,
+    private readonly sessionService: SessionService,
+    private readonly passwordService: PasswordService,
+    private readonly ipCacheService: IpCacheService,
+    private readonly redisService: RedisService,
+    private readonly roomRepository: RoomRepository,
+    private readonly userRepository: UserRepository,
+    private readonly pubsubService: PubsubService,
+  ) {
+  }
+
+  public async handleConnection(urlString: string, context: WebSocketContextData, ip: any) {
+    let url = new URLSearchParams(urlString);
+    let user: UserModel = await this.sessionService.getUserById(url.get('sessionId'));
+    let id = await this.passwordService.createWsId(user.id, url.get('id'));
+    await this.ipCacheService.saveIp(user.id, ip);
+    await this.redisService.addOnline(id)
+    let online = await this.redisService.getOnline();
+
+    let myRooms = await this.roomRepository.getRoomsForUser(user.id);
+    let channelIds = myRooms.map(r => r.channelId).filter(c => c)
+    let channels = await this.roomRepository.getAllChannels(channelIds);
+    let allUsersInTheseRooms = await this.roomRepository.getRoomUsers(myRooms.map(r => r.id));
+    let userIds: number[] = [...new Set(allUsersInTheseRooms.map(r => r.userId))];
+    let users: UserModel[] = await this.userRepository.getUsersById(userIds);
+    let response = transformSetWsId(
+      {
+        id,
+        allUsersInTheseRooms,
+        online,
+        myRooms,
+        users,
+        user,
+        channels,
+        time: Date.now()
+      }
+    )
+    context.userId = user.id;
+    context.id = user.id;
+
+    let channelsToListen = [...myRooms.map(r => String(r.id)), id, `u${user.id}`, '*'];
+    this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`, 'ws');
+    context.sendToClient(response)
+    this.pubsubService.subscribe(context, ...channelsToListen);
+    let data: AddOnlineUserMessage = transformAddUserOnline(response.online, user, id);
+    this.pubsubService.emit(
+      'sendToClient',
+      {
+        content: data,
+      },
+      '*'
+    )
+  }
+}
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index dfc0d906d..6241474f8 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -14,6 +14,7 @@ import {PasswordService} from '@/modules/rest/password/password.service';
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {DatabaseModule} from '@/modules/rest/database/database.module';
 import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
+import {WebsocketService} from '@/modules/api/websocket/websocket.service';
 
 @Module({
   imports: [
@@ -26,6 +27,7 @@ import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
       module: WebsocketGateway,
       imports: [DatabaseModule],
       providers: [
+        WebsocketService,
         RedisService,
         PubsubService,
         SessionService,
diff --git a/newback/src/modules/rest/pubsub/pubsub.service.ts b/newback/src/modules/rest/pubsub/pubsub.service.ts
index b927eeff6..06d290dc2 100644
--- a/newback/src/modules/rest/pubsub/pubsub.service.ts
+++ b/newback/src/modules/rest/pubsub/pubsub.service.ts
@@ -4,6 +4,8 @@ import {
   Logger
 } from '@nestjs/common';
 import {WebSocketContextData} from '@/data/types/internal';
+import {PubSubMessage} from '@/modules/api/websocket/interfaces/pubsub';
+import {DefaultWsInMessage, HandlerName} from '@/data/types/frontend';
 
 
 interface HandlerType {
@@ -21,8 +23,8 @@ let handlers: HandlerType[] = [];
 //   return <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
 //   (vueComponent: TCT, fileName: TPN):
 //
-export function Subscribe(handler: string) {
-  return (target: WebsocketGateway, memberName: keyof WebsocketGateway, propertyDescriptor: PropertyDescriptor) => {
+export function SubscribePuBSub<T extends keyof WebsocketGateway>(handler: T) {
+  return (target: WebsocketGateway, memberName: T, propertyDescriptor: PropertyDescriptor) => {
     handlers.push({
       handler,
       memberName,
@@ -41,7 +43,9 @@ export class PubsubService {
   ) {
   }
 
-  public emit(handler: string, data: any, ...channel: string[]) {
+  // A extends string,H extends HandlerName
+
+  public emit<PS extends PubSubMessage<A,H>, A extends string,H extends HandlerName>(handler: keyof WebsocketGateway, data: PS, ...channel: string[]) {
     channel.forEach(channel => {
       if (receivers[channel]) {
         receivers[channel].forEach(receiver => {
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index e6b12fbde..992ccb352 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -19,6 +19,8 @@ import {
   WebSocketServer
 } from "ws";
 import {processErrors} from '@/utils/decorators';
+import {WebSocketContextData} from '@/data/types/internal';
+import {DefaultWsInMessage} from '@/data/types/frontend';
 
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
@@ -38,7 +40,19 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
       if ((ws as any).context) {
         throw Error("WTF");
       }
-      (ws as any).context = {};
+      (ws as any).context = {
+        sendToClient: (data: DefaultWsInMessage<any, any>) => {
+          let message;
+          try {
+            message = JSON.stringify(data)
+          } catch (e) {
+            processErrors(e, ws, this.logger)
+            return
+          }
+          this.logger.debug(`WS:OUT ${message}`, 'ws')
+          ws.send(message)
+        }
+      };
       await callback(...args, (ws as any).context)
     });
   }
@@ -83,10 +97,12 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
   ) {
     client.on(MESSAGE_METADATA, (data) => {
       try {
+        let s = String(data);
+        this.logger.debug(`WS:IN ${s}`, 'ws')
         if (client.readyState !== client.OPEN) {
           throw new BadRequestException('Cannot process new messages, while opening a connection')
         }
-        const parsed = JSON.parse(data as any);
+        const parsed = JSON.parse(s);
         if (!parsed.action) {
           throw new BadRequestException('Invalid message structure, "action" property is not defined')
         }

From c24b69e189ff623b82857b6936f4dfbdcee388c0 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 15 Apr 2022 14:59:39 +0300
Subject: [PATCH 060/221] Growl Error

---
 common/dto.ts                                 |  8 ++-
 frontend/src/ts/message_handlers/WsHandler.ts | 10 +--
 newback/config/Config.d.ts                    |  2 +-
 newback/config/default.json                   |  2 +-
 .../exceptions}/invalid.ip.exception.ts       |  0
 .../data/exceptions/validation.exception.ts   |  8 +++
 newback/src/data/types/internal.ts            |  2 +-
 .../modules/api/websocket/interfaces/utils.ts |  5 ++
 .../websocket/transformers/ws.transformer.ts  | 20 +++++-
 .../api/websocket/websocket.gateway.ts        | 57 ++++++++++++++---
 .../modules/api/websocket/websocket.module.ts | 45 ++++++++++++++
 .../api/websocket/websocket.service.ts        | 27 +++++++-
 .../modules/api/websocket/ws.data.service.ts  | 61 +++++++++++++++++++
 newback/src/modules/app/app.module.ts         | 44 +++++++++----
 .../rest/database/repository/ip.repository.ts | 13 ++++
 .../database/repository/room.repository.ts    | 46 +++++++++-----
 .../database/repository/user.repository.ts    |  9 +++
 .../src/modules/rest/ip/ip.cache.service.ts   |  3 +-
 .../modules/rest/ip/ip.service.e2e.spec.ts    |  2 +-
 newback/src/modules/rest/ip/ip.service.ts     |  2 +-
 .../src/modules/rest/redis/redis.service.ts   |  5 ++
 .../src/modules/rest/ws.adapter/ws.adapter.ts | 45 +++++++++++---
 newback/src/utils/decorators.ts               | 10 +--
 23 files changed, 359 insertions(+), 67 deletions(-)
 rename newback/src/{modules/rest/ip => data/exceptions}/invalid.ip.exception.ts (100%)
 create mode 100644 newback/src/data/exceptions/validation.exception.ts
 create mode 100644 newback/src/modules/api/websocket/interfaces/utils.ts
 create mode 100644 newback/src/modules/api/websocket/websocket.module.ts
 create mode 100644 newback/src/modules/api/websocket/ws.data.service.ts

diff --git a/common/dto.ts b/common/dto.ts
index 4f56c1631..a55be5c68 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -369,7 +369,11 @@ export interface DeleteRoomMessage extends DefaultWsInMessage<"deleteRoom", "roo
   roomId: number;
 }
 
-export interface GetCountryCodeMessage extends DefaultInMessage<"getCountryCode", "void"> {
+export interface GetCountryCodeRequestMessage extends DefaultWsOutMessage<"getCountryCode"> {
+}
+
+
+export interface GetCountryCodeResponseMessage extends DefaultInMessage<"getCountryCode", "void"> {
   content: Record<string, LocationDto>;
 }
 
@@ -477,7 +481,7 @@ export interface UserProfileChangedMessage extends DefaultWsInMessage<"userProfi
 
 }
 
-export interface GrowlMessage {
+export interface GrowlMessage extends DefaultWsInMessage<'growlError', 'void'> {
   content: string;
   action: "growlError";
 }
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index e1b843afd..08d6aa657 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -39,7 +39,7 @@ import type {
   AddInviteMessage,
   AddRoomMessage,
   DefaultWsOutMessage,
-  GetCountryCodeMessage,
+  GetCountryCodeResponseMessage,
   MessagesResponseMessage,
   PingMessage,
   PongMessage,
@@ -68,6 +68,7 @@ import {
   MessageStatus,
   WS_SESSION_EXPIRED_CODE
 } from '@/ts/types/backend';
+import {GetCountryCodeRequestMessage} from '@/ts/types/dto';
 
 enum WsState {
   NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
@@ -151,10 +152,11 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     return this.wsConnectionId;
   }
 
-  public async getCountryCode(): Promise<GetCountryCodeMessage> {
-    return this.messageProc.sendToServerAndAwait({
+  public async getCountryCode(): Promise<GetCountryCodeResponseMessage> {
+    let body: GetCountryCodeRequestMessage = {
       action: "getCountryCode",
-    });
+    }
+    return this.messageProc.sendToServerAndAwait(body);
   }
 
   public async offerFile(roomId: number, browser: string, name: string, size: number, threadId: number | null): Promise<WebRtcSetConnectionIdMessage> {
diff --git a/newback/config/Config.d.ts b/newback/config/Config.d.ts
index 0b63fae9b..527bc0f99 100644
--- a/newback/config/Config.d.ts
+++ b/newback/config/Config.d.ts
@@ -65,7 +65,7 @@ declare module "node-ts-config" {
     wsIdCharLength: number
     allRedisRoom: string
     allRoomId: number
-    showCountryCode: boolean
+    flags: boolean
     firebaseUrl: string
     pingCloseJsDelay: number
     pingInterval: number
diff --git a/newback/config/default.json b/newback/config/default.json
index 298b5a210..2d2fdf332 100644
--- a/newback/config/default.json
+++ b/newback/config/default.json
@@ -12,7 +12,7 @@
     "wsIdCharLength": 4,
     "allRedisRoom": "all",
     "allRoomId": 1,
-    "showCountryCode": false,
+    "flags": true,
     "firebaseUrl": "https://fcm.googleapis.com/fcm/send",
     "pingCloseJsDelay": 10000,
     "pingInterval": 300000,
diff --git a/newback/src/modules/rest/ip/invalid.ip.exception.ts b/newback/src/data/exceptions/invalid.ip.exception.ts
similarity index 100%
rename from newback/src/modules/rest/ip/invalid.ip.exception.ts
rename to newback/src/data/exceptions/invalid.ip.exception.ts
diff --git a/newback/src/data/exceptions/validation.exception.ts b/newback/src/data/exceptions/validation.exception.ts
new file mode 100644
index 000000000..0c64f774b
--- /dev/null
+++ b/newback/src/data/exceptions/validation.exception.ts
@@ -0,0 +1,8 @@
+import {HttpException} from '@nestjs/common';
+
+export class ValidationException extends HttpException {
+
+  constructor(error) {
+    super(error, 4002);
+  }
+}
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 08e0d4eef..d4dd2f9a5 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -2,7 +2,7 @@ import {DefaultWsInMessage} from '@/data/types/frontend';
 
 export interface WebSocketContextData {
   userId: number;
-  id: number;
+  id: string;
   sendToClient(data: DefaultWsInMessage<any, any>);
 }
 export type UserOnlineData = Record<string, string[]>
diff --git a/newback/src/modules/api/websocket/interfaces/utils.ts b/newback/src/modules/api/websocket/interfaces/utils.ts
new file mode 100644
index 000000000..c9ae4596d
--- /dev/null
+++ b/newback/src/modules/api/websocket/interfaces/utils.ts
@@ -0,0 +1,5 @@
+import {WebSocketContextData} from '@/data/types/internal';
+
+export interface OnWsClose {
+  closeConnection(context: WebSocketContextData);
+}
diff --git a/newback/src/modules/api/websocket/transformers/ws.transformer.ts b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
index e1b350c24..5af6241b7 100644
--- a/newback/src/modules/api/websocket/transformers/ws.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
@@ -5,10 +5,14 @@ import {
   SetWsIdMessage,
   UserDto,
   UserProfileDto,
-  UserSettingsDto
+  UserSettingsDto,
+  RemoveOnlineUserMessage
 } from '@/data/types/frontend';
 import {UserModel} from '@/data/model/user.model';
-import {UserOnlineData} from '@/data/types/internal';
+import {
+  UserOnlineData,
+  WebSocketContextData
+} from '@/data/types/internal';
 import {ChannelModel} from '@/data/model/channel.model';
 import {RoomUsersModel} from '@/data/model/room.users.model';
 import {GetRoomsForUser} from '@/modules/rest/database/repository/room.repository';
@@ -138,3 +142,15 @@ export function transformAddUserOnline(online:  Record<number, string[]>, user:
     opponentWsId
   };
 }
+
+
+export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage  {
+  return {
+    online: online,
+    action: 'removeOnlineUser',
+    lastTimeOnline,
+    time,
+    handler: 'room',
+    userId: context.userId,
+  };
+}
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index a07aecdc8..90390a844 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -1,5 +1,4 @@
 import {
-  ConnectedSocket,
   MessageBody,
   OnGatewayConnection,
   SubscribeMessage,
@@ -9,23 +8,59 @@ import {
 import {IncomingMessage} from 'http';
 import {
   CatchWsErrors,
-  UserId
+  WsContext
 } from '@/utils/decorators';
 import {
   Server,
   WebSocket
 } from 'ws';
 import {WebSocketContextData} from '@/data/types/internal';
-import {Logger} from '@nestjs/common';
-import {SyncHistoryOutMessage} from '@/data/types/frontend';
+import {
+  ArgumentsHost,
+  Catch,
+  ExceptionFilter,
+  HttpException,
+  Logger,
+  UseFilters
+} from '@nestjs/common';
+import {
+  GetCountryCodeResponseMessage,
+  GrowlMessage,
+  SyncHistoryOutMessage
+} from '@/data/types/frontend';
 import {SubscribePuBSub} from '@/modules/rest/pubsub/pubsub.service';
 import {SendToClientPubSubMessage} from '@/modules/api/websocket/interfaces/pubsub';
 import {WebsocketService} from '@/modules/api/websocket/websocket.service';
+import {OnWsClose} from '@/modules/api/websocket/interfaces/utils';
+import {WsDataService} from '@/modules/api/websocket/ws.data.service';
+
+
+
+@Catch(Error)  // if we provide it on module Websocket it will also affect http,so fuck it
+// since we can't decouple this from WebSocketGateway, it should be in this file
+export class WsExceptionFilter implements ExceptionFilter {
+  catch(exception: HttpException, host: ArgumentsHost) {
+    let cbId = host.getArgByIndex(1)?.cbId;
+    if (cbId) {
+      let response: GrowlMessage = {
+          cbId: cbId,
+          action: 'growlError',
+          content: exception.message,
+          handler: 'void',
+        }
+      let websocket: WebSocket = host.getArgByIndex(0);
+      websocket.send(response);
+    } else {
+      throw exception;
+    }
+  }
+}
 
 @WebSocketGateway({
   path: '/ws'
 })
-export class WebsocketGateway implements OnGatewayConnection {
+@UseFilters(new WsExceptionFilter())
+export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
 
   @WebSocketServer()
   public readonly server!: Server;
@@ -33,9 +68,14 @@ export class WebsocketGateway implements OnGatewayConnection {
   constructor(
     public readonly logger: Logger,
     public readonly websocketService: WebsocketService,
+    public readonly wsDataService: WsDataService,
   ) {
   }
 
+  @SubscribeMessage('closeConnection')
+  public async closeConnection(@WsContext() context: WebSocketContextData) {
+    await this.websocketService.closeConnection(context)
+  }
 
   @CatchWsErrors
   async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) {
@@ -48,15 +88,16 @@ export class WebsocketGateway implements OnGatewayConnection {
   }
 
   @SubscribeMessage('syncHistory')
-  syncHistory(@MessageBody() data: SyncHistoryOutMessage, @ConnectedSocket() a, @UserId() user): any {
+  syncHistory(@MessageBody() data: SyncHistoryOutMessage, /*@ConnectedSocket() a*/ @WsContext() context): any {
   }
 
   @SubscribeMessage('printMessage')
-  printMessage(@MessageBody() data: SyncHistoryOutMessage, @ConnectedSocket() a, @UserId() user): any {
+  printMessage(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context): any {
   }
 
   @SubscribeMessage('getCountryCode')
-  getCountryCode(@MessageBody() data: SyncHistoryOutMessage, @ConnectedSocket() a, @UserId() user): any {
+  async getCountryCode(@MessageBody() data: GetCountryCodeResponseMessage, @WsContext() context): Promise<Omit<GetCountryCodeResponseMessage, 'handler'|'action'>> {
+    return this.wsDataService.getCountryCodes(context);
   }
 
 }
diff --git a/newback/src/modules/api/websocket/websocket.module.ts b/newback/src/modules/api/websocket/websocket.module.ts
new file mode 100644
index 000000000..6f2078267
--- /dev/null
+++ b/newback/src/modules/api/websocket/websocket.module.ts
@@ -0,0 +1,45 @@
+import {
+  ArgumentsHost,
+  Catch,
+  ExceptionFilter,
+  HttpException,
+  Module
+} from '@nestjs/common';
+import {RedisModule} from '@nestjs-modules/ioredis';
+import {config} from 'node-ts-config';
+import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {SessionService} from '@/modules/rest/session/session.service';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {DatabaseModule} from '@/modules/rest/database/database.module';
+import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
+import {WebsocketService} from '@/modules/api/websocket/websocket.service';
+import {WsDataService} from '@/modules/api/websocket/ws.data.service';
+import {APP_FILTER} from '@nestjs/core';
+
+
+
+@Module({
+  imports: [
+    {
+      module: WebsocketGateway,
+      imports: [DatabaseModule],
+      providers: [
+        WebsocketService,
+        RedisService,
+        PubsubService,
+        SessionService,
+        WsDataService,
+        PasswordService,
+      ]
+    },
+    RedisModule.forRoot({
+      config: {
+        host: config.redis.host,
+        port: config.redis.port,
+        db: config.redis.database,
+      }
+    })],
+})
+export class WebsocketModule {
+}
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index d1360093c..0a005401b 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -10,6 +10,7 @@ import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
 import {SessionService} from '@/modules/rest/session/session.service';
 import {UserModel} from '@/data/model/user.model';
 import {
+  getLogoutMessage,
   transformAddUserOnline,
   transformSetWsId
 } from '@/modules/api/websocket/transformers/ws.transformer';
@@ -17,6 +18,7 @@ import {WebSocketContextData} from '@/data/types/internal';
 import {RedisService} from '@/modules/rest/redis/redis.service';
 import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
 
+
 @Injectable()
 export class WebsocketService {
 
@@ -36,15 +38,17 @@ export class WebsocketService {
     let url = new URLSearchParams(urlString);
     let user: UserModel = await this.sessionService.getUserById(url.get('sessionId'));
     let id = await this.passwordService.createWsId(user.id, url.get('id'));
+    context.userId = user.id;
+    context.id = id;
     await this.ipCacheService.saveIp(user.id, ip);
     await this.redisService.addOnline(id)
     let online = await this.redisService.getOnline();
 
     let myRooms = await this.roomRepository.getRoomsForUser(user.id);
     let channelIds = myRooms.map(r => r.channelId).filter(c => c)
-    let channels = await this.roomRepository.getAllChannels(channelIds);
     let allUsersInTheseRooms = await this.roomRepository.getRoomUsers(myRooms.map(r => r.id));
     let userIds: number[] = [...new Set(allUsersInTheseRooms.map(r => r.userId))];
+    let channels = await this.roomRepository.getAllChannels(channelIds);
     let users: UserModel[] = await this.userRepository.getUsersById(userIds);
     let response = transformSetWsId(
       {
@@ -58,8 +62,6 @@ export class WebsocketService {
         time: Date.now()
       }
     )
-    context.userId = user.id;
-    context.id = user.id;
 
     let channelsToListen = [...myRooms.map(r => String(r.id)), id, `u${user.id}`, '*'];
     this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`, 'ws');
@@ -74,4 +76,23 @@ export class WebsocketService {
       '*'
     )
   }
+
+  public async closeConnection(context: WebSocketContextData) {
+    this.pubsubService.unsubscribe(context);
+    if (context.id) {
+      await this.redisService.removeOnline(context.id)
+    }
+    let online = await this.redisService.getOnline();
+    if (context.userId && !online[context.userId]) {
+      let lastTimeOnline: number = Date.now();
+      await this.userRepository.setLastTimeOnline(context.userId, lastTimeOnline);
+      this.pubsubService.emit(
+        'sendToClient',
+        {
+          content: getLogoutMessage(online, lastTimeOnline, context, lastTimeOnline),
+        },
+        '*'
+      )
+    }
+  }
 }
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
new file mode 100644
index 000000000..d7ded8018
--- /dev/null
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -0,0 +1,61 @@
+import {
+  Injectable,
+  Logger
+} from '@nestjs/common';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {
+  GetCountryCodeResponseMessage,
+  LocationDto
+} from '@/data/types/frontend';
+import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {WebSocketContextData} from '@/data/types/internal';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
+import {ConfigService} from '@/modules/rest/config/config.service';
+import {ValidationException} from '@/data/exceptions/validation.exception';
+import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
+import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
+
+
+@Injectable()
+export class WsDataService {
+
+  constructor(
+    public readonly logger: Logger,
+    private readonly configService: ConfigService,
+    private readonly passwordService: PasswordService,
+    private readonly ipCacheService: IpCacheService,
+    private readonly redisService: RedisService,
+    private readonly ipRepository: IpRepository,
+    private readonly roomRepository: RoomRepository,
+    private readonly userRepository: UserRepository,
+    private readonly pubsubService: PubsubService,
+  ) {
+  }
+
+  public async getCountryCodes(context: WebSocketContextData): Promise<Omit<GetCountryCodeResponseMessage, 'handler'| 'action'>> {
+    if (this.configService.getConfig().settings.flags) {
+      throw new ValidationException('Flags api is not enabled');
+    }
+    let usersId: number[] = await this.roomRepository.usersForUser(context.userId);
+    let userInfo: UserJoinedInfoModel[] = await this.ipRepository.getIpInfosForUsers(usersId);
+    let content: GetCountryCodeResponseMessage['content'] =userInfo.reduce((previousValue, currentValue) => {
+      if (currentValue.ip) {
+        let value: LocationDto = {
+          country: currentValue.ip.country,
+          region: currentValue.ip.region,
+          city: currentValue.ip.city,
+          countryCode: currentValue.ip.countryCode
+        }
+        previousValue[currentValue.userId] = value;
+      }
+      return previousValue;
+    }, {})
+    return {
+      content,
+    }
+  }
+
+}
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 6241474f8..3843b46fb 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -1,7 +1,17 @@
-import {Module} from '@nestjs/common';
+import {
+  ArgumentsHost,
+  Catch,
+  ExceptionFilter,
+  HttpException,
+  Module,
+  UseFilters
+} from '@nestjs/common';
 import {AuthModule} from '@/modules/api/auth/auth.module';
 import {LoggingInterceptor} from '@/modules/app/interceptors/logging.interceptor';
-import {APP_INTERCEPTOR} from '@nestjs/core';
+import {
+  APP_FILTER,
+  APP_INTERCEPTOR
+} from '@nestjs/core';
 import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {RedisModule} from '@nestjs-modules/ioredis';
 import {config} from 'node-ts-config';
@@ -15,6 +25,24 @@ import {UserRepository} from '@/modules/rest/database/repository/user.repository
 import {DatabaseModule} from '@/modules/rest/database/database.module';
 import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
 import {WebsocketService} from '@/modules/api/websocket/websocket.service';
+import {WebsocketModule} from '@/modules/api/websocket/websocket.module';
+
+
+// import {
+//   ArgumentsHost,
+//   Catch,
+//   ExceptionFilter,
+//   HttpException
+// } from '@nestjs/common';
+//
+// @Catch(Error)
+// export class HttpExceptionFilter implements ExceptionFilter {
+//   catch(exception: HttpException, host: ArgumentsHost) {
+//     throw  exception;
+//   }
+// }
+
+
 
 @Module({
   imports: [
@@ -23,17 +51,7 @@ import {WebsocketService} from '@/modules/api/websocket/websocket.service';
     ConfigModule,
     VerifyModule,
     DatabaseModule,
-    {
-      module: WebsocketGateway,
-      imports: [DatabaseModule],
-      providers: [
-        WebsocketService,
-        RedisService,
-        PubsubService,
-        SessionService,
-        PasswordService,
-      ]
-    },
+    WebsocketModule,
     RedisModule.forRoot({
       config: {
         host: config.redis.host,
diff --git a/newback/src/modules/rest/database/repository/ip.repository.ts b/newback/src/modules/rest/database/repository/ip.repository.ts
index b49ef6eaa..a5f253396 100644
--- a/newback/src/modules/rest/database/repository/ip.repository.ts
+++ b/newback/src/modules/rest/database/repository/ip.repository.ts
@@ -2,6 +2,7 @@ import {Injectable} from '@nestjs/common';
 import {InjectModel} from '@nestjs/sequelize';
 import {IpAddressModel} from '@/data/model/ip.address.model';
 import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
+import {Op} from 'sequelize';
 
 
 @Injectable()
@@ -28,4 +29,16 @@ export class IpRepository {
       raw: true
     });
   }
+
+  public async getIpInfosForUsers(userIds: number[]): Promise<UserJoinedInfoModel[]> {
+     return this.userJoinedInfoModel.findAll({
+        where: {
+          userId: {
+            [Op.in]: userIds,
+          }
+        },
+        raw: true,
+        include: ['ip']
+      })
+  }
 }
diff --git a/newback/src/modules/rest/database/repository/room.repository.ts b/newback/src/modules/rest/database/repository/room.repository.ts
index 7713bc61b..4f941946c 100644
--- a/newback/src/modules/rest/database/repository/room.repository.ts
+++ b/newback/src/modules/rest/database/repository/room.repository.ts
@@ -9,6 +9,7 @@ import {
 import {ChannelModel} from '@/data/model/channel.model';
 
 type RoomSingleRoomUser = Omit<RoomModel, 'roomUsers'>;
+
 export interface GetRoomsForUser extends RoomSingleRoomUser {
   roomUsers: RoomUsersModel;
 }
@@ -40,29 +41,46 @@ export class RoomRepository {
     });
   }
 
-    public async getRoomUsers(roomIds: number[]): Promise<Pick<RoomUsersModel, 'roomId'|'userId'>[]> {
-     // we should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
-     return  this.roomUsersModel.findAll({
-       where: {
-         roomId: {
-           [Op.in]: roomIds,
-         }
-       },
-       raw: true,
-       attributes: ['userId', 'roomId']
-     });
+  public async usersForUser(userId: number): Promise<number[]> {
+    let myRoomIds = await this.roomUsersModel.findAll({
+      where: {
+        userId
+      },
+      attributes: ['roomId']
+    });
+    let ru = await this.roomUsersModel.findAll({
+      where: {
+        roomId: {
+          [Op.in]: myRoomIds.map(r => r.roomId)
+        }
+      },
+      attributes: ['userId']
+    });
+    return ru.map(ru => ru.userId);
   }
 
+  public async getRoomUsers(roomIds: number[]): Promise<Pick<RoomUsersModel, 'roomId' | 'userId'>[]> {
+    // we should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
+    return this.roomUsersModel.findAll({
+      where: {
+        roomId: {
+          [Op.in]: roomIds,
+        }
+      },
+      raw: true,
+      attributes: ['userId', 'roomId']
+    });
+  }
 
 
   public async getRoomsForUser(userId: number): Promise<GetRoomsForUser[]> {
-     // we should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
-     return await this.roomModel.findAll({
+    // we should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
+    return await this.roomModel.findAll({
       raw: true,
       include: [{
         association: 'roomUsers',
         where: {
-           userId: userId
+          userId: userId
         }
       }],
     }) as any as GetRoomsForUser[];
diff --git a/newback/src/modules/rest/database/repository/user.repository.ts b/newback/src/modules/rest/database/repository/user.repository.ts
index 7eb2e08eb..4d090bff6 100644
--- a/newback/src/modules/rest/database/repository/user.repository.ts
+++ b/newback/src/modules/rest/database/repository/user.repository.ts
@@ -139,4 +139,13 @@ export class UserRepository {
     })
   }
 
+  public async setLastTimeOnline(userId: number, lastTimeOnline: number) {
+    await this.userModel.update({
+      lastTimeOnline
+    }, {
+      where: {
+        id: userId
+      }
+    })
+  }
 }
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/rest/ip/ip.cache.service.ts
index a0a237c96..68c1c2627 100644
--- a/newback/src/modules/rest/ip/ip.cache.service.ts
+++ b/newback/src/modules/rest/ip/ip.cache.service.ts
@@ -5,8 +5,9 @@ import {
 import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 import {IpService} from '@/modules/rest/ip/ip.service';
 import {IpAddressModel} from '@/data/model/ip.address.model';
-import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
+
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {InvalidIpException} from '@/data/exceptions/invalid.ip.exception';
 
 @Injectable()
 export class IpCacheService {
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
index 6a14e7758..b6a062f73 100644
--- a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
+++ b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
@@ -6,8 +6,8 @@ import {IpService} from '@/modules/rest/ip/ip.service';
 import {HttpModule} from '@/modules/rest/http/http.module';
 import * as pychatIpAddressFixture from '@/fixtures/ip.134.249.113.11.json';
 import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
 import {ConsoleLogger} from '@nestjs/common';
+import {InvalidIpException} from '@/data/exceptions/invalid.ip.exception';
 
 describe('IpService', () => {
 
diff --git a/newback/src/modules/rest/ip/ip.service.ts b/newback/src/modules/rest/ip/ip.service.ts
index 042f146e3..c62bf656a 100644
--- a/newback/src/modules/rest/ip/ip.service.ts
+++ b/newback/src/modules/rest/ip/ip.service.ts
@@ -4,7 +4,7 @@ import {
   IpInfoResponse,
   IpSuccessInfoResponse
 } from '@/data/types/api';
-import {InvalidIpException} from '@/modules/rest/ip/invalid.ip.exception';
+import {InvalidIpException} from '@/data/exceptions/invalid.ip.exception';
 
 @Injectable()
 export class IpService {
diff --git a/newback/src/modules/rest/redis/redis.service.ts b/newback/src/modules/rest/redis/redis.service.ts
index 24aeeb975..b54fba5eb 100644
--- a/newback/src/modules/rest/redis/redis.service.ts
+++ b/newback/src/modules/rest/redis/redis.service.ts
@@ -45,6 +45,11 @@ export class RedisService {
     this.redis.sadd(REDIS_KEYS.REDIS_ONLINE_KEY, id)
   }
 
+   public async removeOnline(id: string): Promise<void> {
+    this.logger.debug(`srem ${REDIS_KEYS.REDIS_ONLINE_KEY}=${id}` ,'redis')
+    this.redis.srem(REDIS_KEYS.REDIS_ONLINE_KEY, id)
+  }
+
   public async getOnline(): Promise<UserOnlineData> {
     let data = await this.redis.smembers(REDIS_KEYS.REDIS_ONLINE_KEY);
     this.logger.debug(`smembers ${REDIS_KEYS.REDIS_ONLINE_KEY}=${data}` ,'redis')
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index 992ccb352..892d62f70 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -1,10 +1,12 @@
 import {
   BadRequestException,
+  InternalServerErrorException,
   Logger,
   WebSocketAdapter
 } from '@nestjs/common';
 import {BaseWsInstance} from '@nestjs/websockets';
 import {
+  CLOSE_EVENT,
   CONNECTION_EVENT,
   DISCONNECT_EVENT,
   ERROR_EVENT,
@@ -19,8 +21,11 @@ import {
   WebSocketServer
 } from "ws";
 import {processErrors} from '@/utils/decorators';
-import {WebSocketContextData} from '@/data/types/internal';
-import {DefaultWsInMessage} from '@/data/types/frontend';
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  GrowlMessage
+} from '@/data/types/frontend';
 
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
@@ -37,9 +42,7 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
   public bindClientConnect(server: BaseWsInstance, callback: Function) {
     server.on(CONNECTION_EVENT, async(...args) => {
       let ws: WebSocket = args.find(a => a instanceof WebSocket)
-      if ((ws as any).context) {
-        throw Error("WTF");
-      }
+      let oldSend: WebSocket['send'] = ws.send.bind(ws);
       (ws as any).context = {
         sendToClient: (data: DefaultWsInMessage<any, any>) => {
           let message;
@@ -50,15 +53,19 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
             return
           }
           this.logger.debug(`WS:OUT ${message}`, 'ws')
-          ws.send(message)
+          oldSend(message)
         }
       };
+      ws.send = (ws as any).context.sendToClient
       await callback(...args, (ws as any).context)
     });
   }
 
   public bindClientDisconnect(client: BaseWsInstance, callback: Function) {
-    client.on(DISCONNECT_EVENT, callback);
+    client.on(DISCONNECT_EVENT, (...arg) => {
+      this.logger.log(`Closing connection ${(client as any)?.context?.id}`, 'ws')
+      callback(...arg)
+    });
   }
 
   public async close(server: BaseWsInstance) {
@@ -95,14 +102,15 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
     client: WebSocket,
     handlers: MessageMappingProperties[],
   ) {
-    client.on(MESSAGE_METADATA, (data) => {
+    client.on(MESSAGE_METADATA, async(data) => {
+      let parsed: DefaultWsOutMessage<any>;
       try {
         let s = String(data);
         this.logger.debug(`WS:IN ${s}`, 'ws')
         if (client.readyState !== client.OPEN) {
           throw new BadRequestException('Cannot process new messages, while opening a connection')
         }
-        const parsed = JSON.parse(s);
+        parsed = JSON.parse(s);
         if (!parsed.action) {
           throw new BadRequestException('Invalid message structure, "action" property is not defined')
         }
@@ -110,13 +118,30 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
         if (!handler) {
           throw new BadRequestException(`Unknown handler ${parsed.action}`);
         }
-        handler.callback(parsed);
+        let result = await handler.callback(parsed);
+        if (result) {
+          if (!parsed.cbId) {
+            throw new InternalServerErrorException(`Gateway ${parsed.action} returned result ${result}, without having cbId`)
+          }
+          let response: DefaultWsInMessage<any, any> = {
+            cbBySender: (client as any).context.id,
+            cbId: parsed.cbId,
+            handler: 'void',
+            ...result,
+          }
+          client.send(response)
+        }
       } catch (e) {
         processErrors(e, client, this.logger);
       }
 
     });
 
+    client.on(CLOSE_EVENT, (...arg) => {
+      this.logger.log(`Closing connection ${(client as any)?.context?.id}`, 'ws');
+      handlers.find(handler => handler.message === 'closeConnection').callback()
+    });
+
   }
 
   public async dispose() {
diff --git a/newback/src/utils/decorators.ts b/newback/src/utils/decorators.ts
index 1de86dc5a..b94eeaed2 100644
--- a/newback/src/utils/decorators.ts
+++ b/newback/src/utils/decorators.ts
@@ -20,10 +20,10 @@ export const WebsocketContext = createParamDecorator(
   },
 );
 
-export const UserId = createParamDecorator(
+export const WsContext = createParamDecorator(
   (data: unknown, ctx: ExecutionContext) => {
     let handler =  ctx.getArgs().find(a => a instanceof WebSocket)
-    return (handler.context as WebSocketContextData).userId;
+    return (handler.context as WebSocketContextData);
   },
 );
 
@@ -31,11 +31,11 @@ export const UserId = createParamDecorator(
 export function processErrors(e, socket, logger: Logger) {
   logger.error(`Ws error ${e.message}`, e.stack,  'ws')
   if (e instanceof UnauthorizedException) {
-    socket.close(WS_SESSION_EXPIRED_CODE, e.message || 'Invalid session')
+    socket.close(WS_SESSION_EXPIRED_CODE, (e.message || 'Invalid session').substr(0, 123))
   } else if (e?.status >= 400 && e?.status < 500) {  // Invalid frame payload data
-    socket.close(1007, `Error during creating a connection ${e.message}`);
+    socket.close(1007, `Error during creating a connection ${e.message}`.substr(0, 123));
   } else { // Internal Error
-    socket.close(1011, `Error during opening a socket ${e.message}`);
+    socket.close(1011, `Error during opening a socket ${e.message}`.substr(0, 123)); // message cannot be greather 123 bytes
   }
 }
 interface TargetCatchErrors extends OnGatewayConnection{

From f5a949a8cb4b8d4d998065e1692afea26733a3cc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 15 Apr 2022 23:52:01 +0300
Subject: [PATCH 061/221] Migrated prod

---
 common/dto.ts                                 |  10 +-
 newback/.gitignore                            |   5 +-
 newback/package.json                          |   1 +
 .../migration.start}/202204110326-init.sql    |  21 +-
 newback/src/data/migration/.gitkeep           |   0
 .../src/data/model/message.mention.model.ts   |   4 +-
 .../src/data/model/user.joined.info.model.ts  |   6 -
 newback/src/data/model/user.profile.model.ts  |   2 +-
 .../api/websocket/websocket.gateway.ts        |  23 +-
 .../modules/api/websocket/ws.data.service.ts  |   2 +-
 .../api/websocket/ws.exception.filter.ts      |  28 ++
 newback/src/utils/migration.old.ts            | 311 ++++++++++++++++++
 newback/src/utils/migration.runner.ts         |   2 +-
 13 files changed, 364 insertions(+), 51 deletions(-)
 rename newback/{config/migration-template => src/data/migration.start}/202204110326-init.sql (88%)
 create mode 100644 newback/src/data/migration/.gitkeep
 create mode 100644 newback/src/modules/api/websocket/ws.exception.filter.ts
 create mode 100644 newback/src/utils/migration.old.ts

diff --git a/common/dto.ts b/common/dto.ts
index a55be5c68..8bface623 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -134,18 +134,18 @@ export enum VerificationType {
 
 export enum ImageType {
   VIDEO = 'VIDEO',
+  FILE = 'FILE',
+  MEDIA_RECORD = 'MEDIA_RECORD',
+  AUDIO_RECORD = 'AUDIO_RECORD',
   IMAGE = 'IMAGE',
+  PREVIEW = 'PREVIEW',
   GIPHY = 'GIPHY'
 }
 
 export enum UploadedFileChoices {
   VIDEO = 'VIDEO',
-  FILE = 'FILE',
-  MEDIA_RECORD = 'MEDIA_RECORD',
-  AUDIO_RECORD = 'AUDIO_RECORD',
   IMAGE = 'IMAGE',
-  PREVIEW = 'PREVIEW',
-  ISSUE = 'ISSUE'
+  FILE = 'FILE',
 }
 
 /** CODE THAT I PUT HERE MANUALLY */
diff --git a/newback/.gitignore b/newback/.gitignore
index 54c5048f8..f70c43903 100644
--- a/newback/.gitignore
+++ b/newback/.gitignore
@@ -2,8 +2,9 @@ node_modules
 yarn-error.log
 dist
 # exclude everything
-config/migration/*
+src/data/migration/*
 coverage
 # exception to the rule
-!config/migration/.gitkeep
+!src/data/migration/.gitkeep
 codecov
+src/fixtures/prod
diff --git a/newback/package.json b/newback/package.json
index f9c91fbcf..b5d0f1b0d 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -9,6 +9,7 @@
     "migrate": "ts-node --compiler ttypescript ./src/utils/migration.runner.ts ",
     "build": "ttsc",
     "start": "ts-node --compiler ttypescript src/main.ts",
+    "start:old": "ts-node --compiler ttypescript src/utils/migration.old.ts",
     "test:html:coverage": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
     "test": "jest --runInBand --coverage --coverageReporters text"
   },
diff --git a/newback/config/migration-template/202204110326-init.sql b/newback/src/data/migration.start/202204110326-init.sql
similarity index 88%
rename from newback/config/migration-template/202204110326-init.sql
rename to newback/src/data/migration.start/202204110326-init.sql
index 21ce04a1f..c680afd34 100644
--- a/newback/config/migration-template/202204110326-init.sql
+++ b/newback/src/data/migration.start/202204110326-init.sql
@@ -70,7 +70,7 @@ CREATE TABLE `message`
 CREATE TABLE `image`
 (
     `id`                INTEGER auto_increment,
-    `type`              ENUM ('VIDEO', 'IMAGE', 'GIPHY') NOT NULL,
+    `type`              ENUM('VIDEO', 'FILE', 'MEDIA_RECORD', 'AUDIO_RECORD', 'IMAGE', 'PREVIEW', 'GIPHY') NOT NULL,
     `symbol`            VARCHAR(1)                       NOT NULL,
     `message_id`        INTEGER                          NOT NULL,
     `img`               VARCHAR(255),
@@ -190,7 +190,7 @@ CREATE TABLE `subscription_message`
 CREATE TABLE `uploaded_file`
 (
     `id`         INTEGER auto_increment,
-    `type`       ENUM ('VIDEO', 'FILE', 'MEDIA_RECORD', 'AUDIO_RECORD', 'IMAGE', 'PREVIEW', 'ISSUE') NOT NULL,
+    `type`       ENUM('VIDEO', 'IMAGE', 'FILE') NOT NULL,
     `symbol`     VARCHAR(1)                                                                          NOT NULL,
     `user_id`    INTEGER                                                                             NOT NULL,
     `file`       VARCHAR(255)                                                                        NOT NULL,
@@ -240,7 +240,6 @@ CREATE TABLE `user_joined_info`
     `id`         INTEGER auto_increment,
     `ip_id`      INTEGER  NOT NULL,
     `user_id`    INTEGER  NOT NULL,
-    `time`       DATETIME NOT NULL,
     `created_at` DATETIME NOT NULL,
     `updated_at` DATETIME NOT NULL,
     `deleted_at` DATETIME,
@@ -257,7 +256,7 @@ CREATE TABLE `user_profile`
     `name`       VARCHAR(30),
     `city`       VARCHAR(50),
     `surname`    VARCHAR(30),
-    `birthday`   DATETIME,
+    `birthday`   DATE,
     `contacts`   VARCHAR(100),
     `created_at` DATETIME NOT NULL,
     `updated_at` DATETIME NOT NULL,
@@ -288,10 +287,10 @@ CREATE TABLE `user_settings`
   DEFAULT CHARSET = utf8mb4
   COLLATE utf8mb4_general_ci;
 
-INSERT INTO user (id, last_time_online, username, sex, thumbnail, created_at, updated_at, deleted_at) VALUES (1, 1649949638861, '1', 'OTHER', null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
-INSERT INTO channel (id, name, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, '2022-04-13 16:32:11', '2022-04-13 16:32:09', null);
-INSERT INTO room (id, name, is_main_in_channel, p2p, channel_id, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, DEFAULT, 1, 1, '2022-04-13 16:35:16', '2022-04-13 16:35:20', null);
-INSERT INTO user_profile (id, name, city, surname, birthday, contacts, created_at, updated_at, deleted_at) VALUES (1, null, null, null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
-INSERT INTO user_auth (id, password, email, facebook_id, google_id, email_verification_id, created_at, updated_at, deleted_at) VALUES (1, '$2b$10$8RTcHp1.oCEYGiPgLbTHH.Fk8MC6YUySzJ8AxGFxnjFqb.zsdlH7m', 'deathangel908@gmail.com', null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
-INSERT INTO user_settings (id, suggestions, show_when_i_typing, embedded_youtube, highlight_code, message_sound, incoming_file_call_sound, online_change_sound, logs, theme, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 'error', 'COLOR_REG', '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
-INSERT INTO room_user (id, room_id, user_id, volume, notifications, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 2, 0, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+-- INSERT INTO user (id, last_time_online, username, sex, thumbnail, created_at, updated_at, deleted_at) VALUES (1, 1649949638861, '1', 'OTHER', null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+-- INSERT INTO channel (id, name, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, '2022-04-13 16:32:11', '2022-04-13 16:32:09', null);
+-- INSERT INTO room (id, name, is_main_in_channel, p2p, channel_id, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, DEFAULT, 1, 1, '2022-04-13 16:35:16', '2022-04-13 16:35:20', null);
+-- INSERT INTO user_profile (id, name, city, surname, birthday, contacts, created_at, updated_at, deleted_at) VALUES (1, null, null, null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+-- INSERT INTO user_auth (id, password, email, facebook_id, google_id, email_verification_id, created_at, updated_at, deleted_at) VALUES (1, '$2b$10$8RTcHp1.oCEYGiPgLbTHH.Fk8MC6YUySzJ8AxGFxnjFqb.zsdlH7m', 'deathangel908@gmail.com', null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+-- INSERT INTO user_settings (id, suggestions, show_when_i_typing, embedded_youtube, highlight_code, message_sound, incoming_file_call_sound, online_change_sound, logs, theme, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 'error', 'COLOR_REG', '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+-- INSERT INTO room_user (id, room_id, user_id, volume, notifications, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 2, 0, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
diff --git a/newback/src/data/migration/.gitkeep b/newback/src/data/migration/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/newback/src/data/model/message.mention.model.ts b/newback/src/data/model/message.mention.model.ts
index 9a1c4c672..150fefc08 100644
--- a/newback/src/data/model/message.mention.model.ts
+++ b/newback/src/data/model/message.mention.model.ts
@@ -32,7 +32,7 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
     type: DataType.INTEGER,
     allowNull: false
   })
-  public userId: string;
+  public userId: number;
 
   @BelongsTo(() => UserModel)
   public user: UserModel;
@@ -43,7 +43,7 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
     type: DataType.INTEGER,
     allowNull: false
   })
-  public messageId: string;
+  public messageId: number;
 
   @BelongsTo(() => MessageModel)
   public message: MessageModel;
diff --git a/newback/src/data/model/user.joined.info.model.ts b/newback/src/data/model/user.joined.info.model.ts
index 5b664672a..77f9a2cf4 100644
--- a/newback/src/data/model/user.joined.info.model.ts
+++ b/newback/src/data/model/user.joined.info.model.ts
@@ -46,10 +46,4 @@ export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
   @BelongsTo(() => UserModel)
   public user: UserModel;
 
-  @Column({
-    type: DataType.DATE,
-    allowNull: false,
-  })
-  public time: Date;
-
 }
diff --git a/newback/src/data/model/user.profile.model.ts b/newback/src/data/model/user.profile.model.ts
index ff5e838c8..d61559513 100644
--- a/newback/src/data/model/user.profile.model.ts
+++ b/newback/src/data/model/user.profile.model.ts
@@ -43,7 +43,7 @@ export class UserProfileModel extends Model<UserProfileModel> {
   public surname: string;
 
   @Column({
-    type: DataType.DATE,
+    type: DataType.DATEONLY,
     allowNull: true,
   })
   public birthday: Date;
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 90390a844..8194261fc 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -33,28 +33,7 @@ import {SendToClientPubSubMessage} from '@/modules/api/websocket/interfaces/pubs
 import {WebsocketService} from '@/modules/api/websocket/websocket.service';
 import {OnWsClose} from '@/modules/api/websocket/interfaces/utils';
 import {WsDataService} from '@/modules/api/websocket/ws.data.service';
-
-
-
-@Catch(Error)  // if we provide it on module Websocket it will also affect http,so fuck it
-// since we can't decouple this from WebSocketGateway, it should be in this file
-export class WsExceptionFilter implements ExceptionFilter {
-  catch(exception: HttpException, host: ArgumentsHost) {
-    let cbId = host.getArgByIndex(1)?.cbId;
-    if (cbId) {
-      let response: GrowlMessage = {
-          cbId: cbId,
-          action: 'growlError',
-          content: exception.message,
-          handler: 'void',
-        }
-      let websocket: WebSocket = host.getArgByIndex(0);
-      websocket.send(response);
-    } else {
-      throw exception;
-    }
-  }
-}
+import {WsExceptionFilter} from '@/modules/api/websocket/ws.exception.filter';
 
 @WebSocketGateway({
   path: '/ws'
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index d7ded8018..a142247d9 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -36,7 +36,7 @@ export class WsDataService {
   }
 
   public async getCountryCodes(context: WebSocketContextData): Promise<Omit<GetCountryCodeResponseMessage, 'handler'| 'action'>> {
-    if (this.configService.getConfig().settings.flags) {
+    if (!this.configService.getConfig().settings.flags) {
       throw new ValidationException('Flags api is not enabled');
     }
     let usersId: number[] = await this.roomRepository.usersForUser(context.userId);
diff --git a/newback/src/modules/api/websocket/ws.exception.filter.ts b/newback/src/modules/api/websocket/ws.exception.filter.ts
new file mode 100644
index 000000000..327589d5f
--- /dev/null
+++ b/newback/src/modules/api/websocket/ws.exception.filter.ts
@@ -0,0 +1,28 @@
+import {
+  ArgumentsHost,
+  Catch,
+  ExceptionFilter,
+  HttpException
+} from '@nestjs/common';
+import {WebSocket} from 'ws';
+import {GrowlMessage} from '@/data/types/frontend';
+
+@Catch(Error)  // if we provide it on module Websocket it will also affect http,so fuck it
+// since we can't decouple this from WebSocketGateway, it should be in this file
+export class WsExceptionFilter implements ExceptionFilter {
+  catch(exception: HttpException, host: ArgumentsHost) {
+    let cbId = host.getArgByIndex(1)?.cbId;
+    if (cbId) {
+      let response: GrowlMessage = {
+          cbId: cbId,
+          action: 'growlError',
+          content: exception.message,
+          handler: 'void',
+        }
+      let websocket: WebSocket = host.getArgByIndex(0);
+      websocket.send(response);
+    } else {
+      throw exception;
+    }
+  }
+}
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
new file mode 100644
index 000000000..68e9caf70
--- /dev/null
+++ b/newback/src/utils/migration.old.ts
@@ -0,0 +1,311 @@
+#!./node_modules/.bin/ts-node --compiler ttypescript src/migration.ts
+
+import {DatabaseModule} from '@/modules/rest/database/database.module';
+import {ConsoleLogger} from '@nestjs/common';
+import {UserModel} from '@/data/model/user.model';
+import {Test} from '@nestjs/testing';
+import {LoggerModule} from '@/modules/rest/logger/logger.module';
+import {ConfigModule} from '@/modules/rest/config/config.module';
+import {getModelToken} from '@nestjs/sequelize';
+import {Sequelize} from 'sequelize-typescript';
+import {Gender} from '@/data/types/frontend';
+import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
+import {UserAuthModel} from '@/data/model/user.auth.model';
+import {UserProfileModel} from '@/data/model/user.profile.model';
+import {ChannelModel} from '@/data/model/channel.model';
+import {ImageModel} from '@/data/model/image.model';
+import {MessageModel} from '@/data/model/message.model';
+import {MessageHistoryModel} from '@/data/model/message.history.model';
+import {MessageMentionModel} from '@/data/model/message.mention.model';
+import {RoomModel} from '@/data/model/room.model';
+import {RoomUsersModel} from '@/data/model/room.users.model';
+import {SubscriptionModel} from '@/data/model/subscription.model';
+import {SubscriptionMessageModel} from '@/data/model/subscription.message.model';
+import {UploadedFileModel} from '@/data/model/uploaded.file.model';
+import {VerificationModel} from '@/data/model/verification.model';
+import * as pychat_chat_channel from '@/fixtures/prod/pychat_chat_channel.json';
+import * as pychat_chat_image from '@/fixtures/prod/pychat_chat_image.json';
+import * as pychat_chat_ip_address from '@/fixtures/prod/pychat_chat_ip_address.json';
+import * as pychat_chat_message from '@/fixtures/prod/pychat_chat_message.json';
+import * as pychat_chat_messagehistory from '@/fixtures/prod/pychat_chat_messagehistory.json';
+import * as pychat_chat_messagemention from '@/fixtures/prod/pychat_chat_messagemention.json';
+import * as pychat_chat_room from '@/fixtures/prod/pychat_chat_room.json';
+import * as pychat_chat_room_users from '@/fixtures/prod/pychat_chat_room_users.json';
+import * as pychat_chat_subscription from '@/fixtures/prod/pychat_chat_subscription.json';
+import * as pychat_chat_subscription_message from '@/fixtures/prod/pychat_chat_subscription_message.json';
+import * as pychat_chat_uploadedfile from '@/fixtures/prod/pychat_chat_uploadedfile.json';
+import * as pychat_chat_user_joined_info from '@/fixtures/prod/pychat_chat_user_joined_info.json';
+import * as pychat_chat_user from '@/fixtures/prod/pychat_chat_user.json';
+import * as pychat_chat_userprofile from '@/fixtures/prod/pychat_chat_userprofile.json';
+import * as pychat_chat_verification from '@/fixtures/prod/pychat_chat_verification.json';
+import {IpAddressModel} from '@/data/model/ip.address.model';
+
+
+async function bootstrap() {
+
+  let app = await Test.createTestingModule({
+    imports: [
+      {
+        module: DatabaseModule,
+        imports: [
+          LoggerModule,
+          ConfigModule,
+          DatabaseModule,
+        ],
+      },
+
+    ],
+  }).setLogger(new ConsoleLogger()).compile();
+
+  let userModel: typeof UserModel = app.get(getModelToken(UserModel));
+  let userJoinedInfoModel: typeof UserJoinedInfoModel = app.get(getModelToken(UserJoinedInfoModel));
+  let userAuthModel: typeof UserAuthModel = app.get(getModelToken(UserAuthModel));
+  let userProfileModel: typeof UserProfileModel = app.get(getModelToken(UserProfileModel));
+  let channelModel: typeof ChannelModel = app.get(getModelToken(ChannelModel));
+  let imageModel: typeof ImageModel = app.get(getModelToken(ImageModel));
+  let messageModel: typeof MessageModel = app.get(getModelToken(MessageModel));
+  let messageHistoryModel: typeof MessageHistoryModel = app.get(getModelToken(MessageHistoryModel));
+  let messageMentionModel: typeof MessageMentionModel = app.get(getModelToken(MessageMentionModel));
+  let roomModel: typeof RoomModel = app.get(getModelToken(RoomModel));
+  let roomUsersModel: typeof RoomUsersModel = app.get(getModelToken(RoomUsersModel));
+  let subscriptionModel: typeof SubscriptionModel = app.get(getModelToken(SubscriptionModel));
+  let subscriptionMessageModel: typeof SubscriptionMessageModel = app.get(getModelToken(SubscriptionMessageModel));
+  let uploadedFileModel: typeof UploadedFileModel = app.get(getModelToken(UploadedFileModel));
+  let verificationModel: typeof VerificationModel = app.get(getModelToken(VerificationModel));
+  let ipAddressModel: typeof IpAddressModel = app.get(getModelToken(IpAddressModel));
+  let sequelize = app.get(Sequelize);
+  await sequelize.transaction(async(transaction) => {
+    let users: UserModel[] = pychat_chat_user.map(a => {
+      let b: UserModel = {
+        lastTimeOnline: a.last_time_online,
+        username: a.username,
+        id: a.id,
+        sex: a.sex === 0 ? Gender.OTHER : a.sex === 1 ? Gender.MALE : Gender.FEMALE,
+        thumbnail: a.thumbnail
+      } as any;
+      return b;
+    });
+    await userModel.bulkCreate(users, {transaction})
+
+    let channelModels = pychat_chat_channel.map(key => {
+      let result: ChannelModel = {
+        id: key.id,
+        name: key.name,
+        creatorId: key.creator_id,
+      } as any;
+      return result;
+    })
+    await channelModel.bulkCreate(channelModels, {transaction})
+
+
+
+    let ipaddress = pychat_chat_ip_address.map(key => {
+      let result: IpAddressModel = {
+        id: key.id,
+        ip: key.ip,
+        status: true,
+        isp: key.isp,
+        countryCode: key.country_code,
+        country: key.country,
+        region: key.region,
+        city: key.city,
+        lat: key.lat,
+        lon: key.lon,
+        zip: key.zip,
+        timezone: key.timezone,
+      } as any;
+      return result;
+    })
+    await ipAddressModel.bulkCreate(ipaddress, {transaction})
+
+    let rooms = pychat_chat_room.map(key => {
+      let result: RoomModel = {
+        id: key.id,
+        name: key.name,
+        deletedAt: new Date(),
+        channelId: key.channel_id,
+        creatorId: key.creator_id,
+        isMainInChannel: key.is_main_in_channel,
+        p2p: key.p2p,
+      } as any;
+      return result;
+    })
+    await roomModel.bulkCreate(rooms, {transaction})
+
+      let messaggs = pychat_chat_message.map(key => {
+      let result: MessageModel = {
+        id: key.id,
+        senderId: key.sender_id,
+        roomId: key.room_id,
+        time: key.time,
+        content: key.content,
+        symbol: key.symbol,
+        messageStatus: {'u': 'ON_SERVER', 'r': "READ", 's': "RECEIVED"}[key.message_status],
+        threadMessageCount: key.thread_messages_count,
+        parentMessageId: key.parent_message_id,
+        updatedAt: new Date(key.updated_at),
+      } as any;
+      return result;
+    })
+    await messageModel.bulkCreate(messaggs, {transaction})
+
+
+    let roomUsers = pychat_chat_room_users.map(key => {
+      let result: RoomUsersModel = {
+        id: key.id,
+        roomId: key.room_id,
+        userId: key.user_id,
+        notifications: key.notifications,
+        volume: key.volume,
+      } as any;
+      return result;
+    })
+    await roomUsersModel.bulkCreate(roomUsers, {transaction})
+
+    let subscriptions = pychat_chat_subscription.map(key => {
+      let result: SubscriptionModel = {
+        id: key.id,
+        userId: key.user_id,
+        registrationId: key.registration_id,
+        agent: key.agent,
+        updatedAt: new Date(key.updated),
+        isMobile: key.is_mobile,
+        ipId: key.ip_id,
+        createdAt: new Date(key.created),
+        deletedAt: key.inactive ? new Date() : null,
+      } as any;
+      return result;
+    })
+    await subscriptionModel.bulkCreate(subscriptions, {transaction})
+
+    let uploadedFIles = pychat_chat_uploadedfile.map(key => {
+      let result: UploadedFileModel = {
+        id: key.id,
+        type: {v: 'VIDEO', i: 'IMAGE', 'f': 'FILE'}[key.type],
+        symbol: key.symbol,
+        userId: key.user_id,
+        file: key.file,
+      } as any;
+      return result;
+    })
+    await uploadedFileModel.bulkCreate(uploadedFIles, {transaction})
+
+    let userJoinedInfo = pychat_chat_user_joined_info.map(key => {
+      let result: UserJoinedInfoModel = {
+        id: key.id,
+        createdAt: new Date(key.time),
+        ipId: key.ip_id,
+        userId: key.user_id,
+      } as any;
+      return result;
+    })
+    await userJoinedInfoModel.bulkCreate(userJoinedInfo, {transaction})
+
+
+  let verifications = pychat_chat_verification.map(key => {
+      let result: VerificationModel = {
+        id: key.id,
+        type: {
+          r: 'REGISTER',
+          p: 'PASSWORD',
+          c: 'EMAIL',
+        }[key.type],
+        token: key.token,
+        createdAt: new Date(key.time),
+        verified: key.verified,
+        userId: key.user_id,
+        email: key.email,
+      } as any;
+      return result;
+    })
+    await verificationModel.bulkCreate(verifications, {transaction})
+
+    let auth = pychat_chat_userprofile.map(u => ({...u, ...pychat_chat_user.find(us => us.id == u.user_ptr_id)})).map(key => {
+      let result: UserAuthModel = {
+        id: key.id,
+        password: key.password,
+        email: key.email,
+        facebookId: key.facebook_id,
+        googleId: key.google_id,
+        emailVerificationId: key.email_verification_id,
+      } as any;
+      return result;
+    })
+    await userAuthModel.bulkCreate(auth, {transaction})
+
+
+    let userProf = pychat_chat_userprofile.map(u => ({...u, ...pychat_chat_user.find(us => us.id == u.user_ptr_id)})).map(key => {
+      let result: UserProfileModel = {
+        id: key.id,
+        name: key.name,
+        city: key.city,
+        surname: key.surname,
+        birthday: new Date(key.birthday),
+        contacts: key.contacts,
+      } as any;
+      return result;
+    })
+    await userProfileModel.bulkCreate(userProf, {transaction})
+
+       let mentions = pychat_chat_messagemention.map(key => {
+      let result: MessageMentionModel = {
+        id: key.id,
+        symbol: key.symbol,
+        messageId: key.message_id,
+        userId: key.user_id,
+      } as any;
+      return result;
+    })
+    await messageMentionModel.bulkCreate(mentions, {transaction})
+
+
+    let subMessage = pychat_chat_subscription_message.map(key => {
+      let result: SubscriptionMessageModel = {
+        id: key.id,
+        subscriptionId: key.subscription_id,
+        messageId: key.message_id,
+        received: key.received,
+      } as any;
+      return result;
+    })
+    await subscriptionMessageModel.bulkCreate(subMessage, {transaction})
+
+      let imageModels = pychat_chat_image.map(key => {
+      let result: ImageModel = {
+        id: key.id,
+        type: {
+          i: 'IMAGE',
+          v: 'VIDEO',
+          m: 'MEDIA_RECORD',
+          a: 'AUDIO_RECORD',
+          f: 'FILE',
+          g: 'GIPHY',
+        }[key.type],
+        symbol: key.symbol,
+        messageId: key.message_id,
+        img: key.img,
+        preview: key.preview,
+        absoluteUrl: key.absolute_url,
+        webpAsboluteUrl: key.webp_absolute_url
+      } as any;
+      return result;
+    })
+    await imageModel.bulkCreate(imageModels, {transaction})
+
+
+     let histories = pychat_chat_messagehistory.map(key => {
+      let result: MessageHistoryModel = {
+        id: key.id,
+        messageId: key.message_id,
+        time: key.time,
+        content: key.content,
+      } as any;
+      return result;
+    })
+    await messageHistoryModel.bulkCreate(histories, {transaction})
+
+  })
+}
+
+bootstrap();
+
diff --git a/newback/src/utils/migration.runner.ts b/newback/src/utils/migration.runner.ts
index 96e3a9209..1fd780ed3 100644
--- a/newback/src/utils/migration.runner.ts
+++ b/newback/src/utils/migration.runner.ts
@@ -23,7 +23,7 @@ const connection = createConnection({
 connection.connect(async function (err) {
   let migrations = new CommandsRunner({
     driver: new MysqlDriver(connection),
-    directoryWithScripts: `${__dirname}/../../config/migration/`,
+    directoryWithScripts: `${__dirname}/../data/migration/`,
   });
   await migrations.run('init')
   await migrations.run('migrate')

From 57acfda7dc80210a9b3d5c960b78cc5588b032cf Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 16 Apr 2022 00:55:52 +0300
Subject: [PATCH 062/221] checks

---
 .excludeMAIN                                  |  2 +-
 common/dto.ts                                 |  4 ++
 frontend/src/ts/message_handlers/WsHandler.ts |  6 ++-
 newback/package.json                          |  4 +-
 newback/{ => src}/config/Config.d.ts          |  0
 newback/{ => src}/config/default.json         |  0
 newback/{ => src}/config/env/test.json        |  0
 newback/src/data/migration/.gitkeep           |  0
 .../modules/api/websocket/message.service.ts  | 39 +++++++++++++++++++
 .../api/websocket/websocket.gateway.ts        | 27 +++++++++++++
 .../modules/api/websocket/websocket.module.ts |  2 +
 newback/src/modules/app/app.module.ts         | 21 +---------
 .../modules/rest/database/database.module.ts  |  2 +-
 newback/src/utils/migration.old.ts            |  5 ++-
 newback/tsconfig.json                         |  1 -
 newback/yarn.lock                             |  8 ++--
 16 files changed, 89 insertions(+), 32 deletions(-)
 rename newback/{ => src}/config/Config.d.ts (100%)
 rename newback/{ => src}/config/default.json (100%)
 rename newback/{ => src}/config/env/test.json (100%)
 delete mode 100644 newback/src/data/migration/.gitkeep
 create mode 100644 newback/src/modules/api/websocket/message.service.ts
 mode change 100644 => 100755 newback/src/utils/migration.old.ts

diff --git a/.excludeMAIN b/.excludeMAIN
index 21e1a8693..1f6536db9 100644
--- a/.excludeMAIN
+++ b/.excludeMAIN
@@ -21,4 +21,4 @@ backend/chat/settings.py
 backend/photos/*
 !backend/photos/.gitkeep
 frontend/build/production.json
-newback/config/env/default.json
+newback/src/config/env/default.json
diff --git a/common/dto.ts b/common/dto.ts
index 8bface623..4093894da 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -415,6 +415,10 @@ export interface ShowITypeMessage extends DefaultWsInMessage<"showIType", "room"
   userId: number;
 }
 
+export interface ShowITypeRequestMessage extends DefaultWsOutMessage<'showIType'> {
+  roomId: number;
+}
+
 export interface SetWsIdMessage extends DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
   rooms: RoomDto[];
   channels: ChannelDto[];
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 08d6aa657..eea3f28bb 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -53,6 +53,7 @@ import type {
   SyncHistoryResponseMessage,
   UserProfileChangedMessage,
   WebRtcSetConnectionIdMessage,
+  ShowITypeRequestMessage,
 } from "@/ts/types/backend";
 import type {
   InternetAppearMessage,
@@ -278,10 +279,11 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
   }
 
   public showIType(roomId: number): void {
-    this.sendToServer({
+    let request: ShowITypeRequestMessage = {
       roomId,
       action: "showIType",
-    });
+    }
+    this.sendToServer(request);
   }
 
   public async saveUser(content: UserProfileDtoWoImage): Promise<SetUserProfileMessage | unknown> {
diff --git a/newback/package.json b/newback/package.json
index b5d0f1b0d..f8b207a14 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "generate-configs": "node-ts-config",
     "migrate": "ts-node --compiler ttypescript ./src/utils/migration.runner.ts ",
-    "build": "ttsc",
+    "build": "ttsc && cp -r ./src/config ./dist/src/",
     "start": "ts-node --compiler ttypescript src/main.ts",
     "start:old": "ts-node --compiler ttypescript src/utils/migration.old.ts",
     "test:html:coverage": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
@@ -37,7 +37,7 @@
     "lines-logger": "^2.1.2",
     "mysql2": "^2.3.3",
     "node-db-migration": "^1.4.0",
-    "node-ts-config": "^1.0.4",
+    "node-ts-config": "^1.0.5",
     "nodemailer": "^6.7.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7",
diff --git a/newback/config/Config.d.ts b/newback/src/config/Config.d.ts
similarity index 100%
rename from newback/config/Config.d.ts
rename to newback/src/config/Config.d.ts
diff --git a/newback/config/default.json b/newback/src/config/default.json
similarity index 100%
rename from newback/config/default.json
rename to newback/src/config/default.json
diff --git a/newback/config/env/test.json b/newback/src/config/env/test.json
similarity index 100%
rename from newback/config/env/test.json
rename to newback/src/config/env/test.json
diff --git a/newback/src/data/migration/.gitkeep b/newback/src/data/migration/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
new file mode 100644
index 000000000..5432ea993
--- /dev/null
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -0,0 +1,39 @@
+import {
+  Injectable,
+  Logger
+} from '@nestjs/common';
+import {UserRepository} from '@/modules/rest/database/repository/user.repository';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {ShowITypeRequestMessage} from '@/data/types/frontend';
+import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
+import {SessionService} from '@/modules/rest/session/session.service';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
+
+
+@Injectable()
+export class MessageService {
+
+  constructor(
+    public readonly logger: Logger,
+    private readonly sessionService: SessionService,
+    private readonly passwordService: PasswordService,
+    private readonly ipCacheService: IpCacheService,
+    private readonly redisService: RedisService,
+    private readonly roomRepository: RoomRepository,
+    private readonly userRepository: UserRepository,
+    private readonly pubsubService: PubsubService,
+  ) {
+  }
+
+  public async showIType(request: ShowITypeRequestMessage) {
+    // this.pubsubService.emit(
+    //     'sendToClient',
+    //     {
+    //       content: getLogoutMessage(online, lastTimeOnline, context, lastTimeOnline),
+    //     },
+    //     '*'
+    //   )
+  }
+}
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 8194261fc..4102cd0fa 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -16,16 +16,21 @@ import {
 } from 'ws';
 import {WebSocketContextData} from '@/data/types/internal';
 import {
+  ArgumentMetadata,
   ArgumentsHost,
+  BadRequestException,
   Catch,
   ExceptionFilter,
   HttpException,
+  Injectable,
   Logger,
+  PipeTransform,
   UseFilters
 } from '@nestjs/common';
 import {
   GetCountryCodeResponseMessage,
   GrowlMessage,
+  ShowITypeRequestMessage,
   SyncHistoryOutMessage
 } from '@/data/types/frontend';
 import {SubscribePuBSub} from '@/modules/rest/pubsub/pubsub.service';
@@ -34,6 +39,22 @@ import {WebsocketService} from '@/modules/api/websocket/websocket.service';
 import {OnWsClose} from '@/modules/api/websocket/interfaces/utils';
 import {WsDataService} from '@/modules/api/websocket/ws.data.service';
 import {WsExceptionFilter} from '@/modules/api/websocket/ws.exception.filter';
+import {check} from 'typend';
+
+
+@Injectable()
+export class ValidationPipe implements PipeTransform<any, any> {
+
+
+  constructor(private checker: (v: any) => void ) {
+
+  }
+  transform(value: string, metadata: ArgumentMetadata): any {
+    this.checker(value);
+    return value;
+  }
+}
+
 
 @WebSocketGateway({
   path: '/ws'
@@ -74,6 +95,12 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
   printMessage(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context): any {
   }
 
+  @SubscribeMessage('showIType')
+  showIType(@MessageBody(new ValidationPipe((v) => check<ShowITypeRequestMessage>(v))) data: SyncHistoryOutMessage, @WsContext() context): any {
+    // return this.
+  }
+
+
   @SubscribeMessage('getCountryCode')
   async getCountryCode(@MessageBody() data: GetCountryCodeResponseMessage, @WsContext() context): Promise<Omit<GetCountryCodeResponseMessage, 'handler'|'action'>> {
     return this.wsDataService.getCountryCodes(context);
diff --git a/newback/src/modules/api/websocket/websocket.module.ts b/newback/src/modules/api/websocket/websocket.module.ts
index 6f2078267..7fee905fd 100644
--- a/newback/src/modules/api/websocket/websocket.module.ts
+++ b/newback/src/modules/api/websocket/websocket.module.ts
@@ -16,6 +16,7 @@ import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
 import {WebsocketService} from '@/modules/api/websocket/websocket.service';
 import {WsDataService} from '@/modules/api/websocket/ws.data.service';
 import {APP_FILTER} from '@nestjs/core';
+import {MessageService} from '@/modules/api/websocket/message.service';
 
 
 
@@ -28,6 +29,7 @@ import {APP_FILTER} from '@nestjs/core';
         WebsocketService,
         RedisService,
         PubsubService,
+        MessageService,
         SessionService,
         WsDataService,
         PasswordService,
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 3843b46fb..9155dd3e9 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -1,30 +1,13 @@
-import {
-  ArgumentsHost,
-  Catch,
-  ExceptionFilter,
-  HttpException,
-  Module,
-  UseFilters
-} from '@nestjs/common';
+import {Module} from '@nestjs/common';
 import {AuthModule} from '@/modules/api/auth/auth.module';
 import {LoggingInterceptor} from '@/modules/app/interceptors/logging.interceptor';
-import {
-  APP_FILTER,
-  APP_INTERCEPTOR
-} from '@nestjs/core';
+import {APP_INTERCEPTOR} from '@nestjs/core';
 import {LoggerModule} from '@/modules/rest/logger/logger.module';
 import {RedisModule} from '@nestjs-modules/ioredis';
 import {config} from 'node-ts-config';
 import {ConfigModule} from '@/modules/rest/config/config.module';
 import {VerifyModule} from '@/modules/api/verify/verify.module';
-import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {SessionService} from '@/modules/rest/session/session.service';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
-import {WebsocketService} from '@/modules/api/websocket/websocket.service';
 import {WebsocketModule} from '@/modules/api/websocket/websocket.module';
 
 
diff --git a/newback/src/modules/rest/database/database.module.ts b/newback/src/modules/rest/database/database.module.ts
index a6c94b677..5ae01a461 100644
--- a/newback/src/modules/rest/database/database.module.ts
+++ b/newback/src/modules/rest/database/database.module.ts
@@ -36,7 +36,7 @@ const repositories = [
   imports: [
     SequelizeModule.forRootAsync({
       inject: [Logger],
-      useFactory: (logger: Logger) => generateOrmConfig((sql) => logger.debug(sql, 'sql')),
+      useFactory: (logger: Logger) => generateOrmConfig((sql) => logger.verbose(sql, 'sql')),
     }),
     SequelizeModule.forFeature([
       ChannelModel,
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
old mode 100644
new mode 100755
index 68e9caf70..03bc77cda
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -1,4 +1,4 @@
-#!./node_modules/.bin/ts-node --compiler ttypescript src/migration.ts
+#!/usr/bin/yarn ts-node --compiler ttypescript ./src/utils/migration.old.ts
 
 import {DatabaseModule} from '@/modules/rest/database/database.module';
 import {ConsoleLogger} from '@nestjs/common';
@@ -91,6 +91,7 @@ async function bootstrap() {
       let result: ChannelModel = {
         id: key.id,
         name: key.name,
+        deletedAt: key.disabled ?new Date(): null,
         creatorId: key.creator_id,
       } as any;
       return result;
@@ -122,7 +123,7 @@ async function bootstrap() {
       let result: RoomModel = {
         id: key.id,
         name: key.name,
-        deletedAt: new Date(),
+        deletedAt: key.disabled ?new Date(): null,
         channelId: key.channel_id,
         creatorId: key.creator_id,
         isMainInChannel: key.is_main_in_channel,
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index 9910e43cb..ea457bcbd 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -19,7 +19,6 @@
     "allowSyntheticDefaultImports": true,
     "target": "es2017",
     "sourceMap": true,
-    "outDir": "./dist",
     "baseUrl": "./",
     "incremental": true,
     "skipLibCheck": true,
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 790571882..2f9c04015 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -5029,10 +5029,10 @@ node-releases@^2.0.2:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
   integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
 
-node-ts-config@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/node-ts-config/-/node-ts-config-1.0.4.tgz#32f9ce6dca832ec73a2c1fc5da80cffcc93e73d2"
-  integrity sha512-2fFgqfDr8GICONUGBUvn8dniVWRon/Q6tbWZcZHfNsCsThY+rSAoLiHw9AbXQVHvSm2cPchfFJMqYsOrsgQmMA==
+node-ts-config@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/node-ts-config/-/node-ts-config-1.0.5.tgz#6eb6b5760dc80e55c3df1ea53a4ac26794b51cf1"
+  integrity sha512-w7aSkwKsS52k+3xAZr4BRRs30lkmkJjNViPaxH3G1gqs2ZCJq7FVonazAyP388qwOgLiSxSrTJm3c7/DGWzaSw==
   dependencies:
     json-to-ts "^1.6.0"
     minimist "^1.2.0"

From 4490486fe0e5ed309a4072a235e19b4f2bb1b256 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 16 Apr 2022 01:17:34 +0300
Subject: [PATCH 063/221] Fixed node-ts-config path, dist directory should not
 contain src, otherwise node-ts-config path won't detect jsons. so we need to
 remove things from root directory like jest.conf so it works

---
 newback/package.json             | 7 +++----
 newback/{ => src}/jest.config.ts | 0
 newback/{ => src}/jest.setup.ts  | 0
 newback/tsconfig.json            | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename newback/{ => src}/jest.config.ts (100%)
 rename newback/{ => src}/jest.setup.ts (100%)

diff --git a/newback/package.json b/newback/package.json
index f8b207a14..768fc0174 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -7,11 +7,10 @@
   "scripts": {
     "generate-configs": "node-ts-config",
     "migrate": "ts-node --compiler ttypescript ./src/utils/migration.runner.ts ",
-    "build": "ttsc && cp -r ./src/config ./dist/src/",
+    "build": "rm -rf ./dist && ttsc",
     "start": "ts-node --compiler ttypescript src/main.ts",
-    "start:old": "ts-node --compiler ttypescript src/utils/migration.old.ts",
-    "test:html:coverage": "jest --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
-    "test": "jest --runInBand --coverage --coverageReporters text"
+    "test:html:coverage": "jest --config ./src/jest.config.ts --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
+    "test": "jest --config ./src/jest.config.ts --runInBand --coverage --coverageReporters text"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/newback/jest.config.ts b/newback/src/jest.config.ts
similarity index 100%
rename from newback/jest.config.ts
rename to newback/src/jest.config.ts
diff --git a/newback/jest.setup.ts b/newback/src/jest.setup.ts
similarity index 100%
rename from newback/jest.setup.ts
rename to newback/src/jest.setup.ts
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index ea457bcbd..9910e43cb 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -19,6 +19,7 @@
     "allowSyntheticDefaultImports": true,
     "target": "es2017",
     "sourceMap": true,
+    "outDir": "./dist",
     "baseUrl": "./",
     "incremental": true,
     "skipLibCheck": true,

From 2c30f979bb8fedf7fc3f4b36cc45d47cade72cd0 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 16 Apr 2022 03:23:21 +0300
Subject: [PATCH 064/221] Added eslint conf showItype

---
 common/dto.ts                                 |  22 +-
 .../src/ts/message_handlers/RomHandler.ts     |   4 +-
 frontend/src/ts/message_handlers/WsHandler.ts |  12 +-
 newback/.eslintrc.json                        | 135 +++++++
 newback/package.json                          |  16 +-
 newback/src/data/types/typend.spec.ts         |  43 +++
 newback/src/main.ts                           |   2 +-
 .../api/websocket/interfaces/pubsub.ts        |   2 +-
 .../modules/api/websocket/message.service.ts  |  90 ++++-
 .../api/websocket/websocket.gateway.ts        |  46 +--
 .../api/websocket/websocket.service.ts        |   4 +-
 .../modules/api/websocket/ws.data.service.ts  |   6 +-
 .../modules/rest/database/database.module.ts  |   4 +-
 .../repository/message.repository.e2e.spec.ts |  43 +++
 .../repository/messages.repository.ts         |  48 +++
 .../src/modules/rest/ws.adapter/ws.adapter.ts |   6 +-
 newback/yarn.lock                             | 343 ++++++++++++++++--
 17 files changed, 712 insertions(+), 114 deletions(-)
 create mode 100644 newback/.eslintrc.json
 create mode 100644 newback/src/data/types/typend.spec.ts
 create mode 100644 newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
 create mode 100644 newback/src/modules/rest/database/repository/messages.repository.ts

diff --git a/common/dto.ts b/common/dto.ts
index 4093894da..0c5382974 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -166,6 +166,16 @@ export interface SyncHistoryOutMessage extends DefaultWsOutMessage<"syncHistory"
   receivedMessageIds: number[];
   lastSynced: number;
 }
+
+export interface ShowITypeWsInMessage extends DefaultWsInMessage<"showIType", "room"> {
+  roomId: number;
+  userId: number;
+}
+
+export interface ShowITypeWsOutMessage extends DefaultWsOutMessage<'showIType'> {
+  roomId: number;
+}
+
 /** CODE I PUT HERE MANUALLY WS IN */
 /*
  * Any means that every every registered subscriber will be called with this handler if it exists
@@ -369,11 +379,11 @@ export interface DeleteRoomMessage extends DefaultWsInMessage<"deleteRoom", "roo
   roomId: number;
 }
 
-export interface GetCountryCodeRequestMessage extends DefaultWsOutMessage<"getCountryCode"> {
+export interface GetCountryCodeWsOutMessage extends DefaultWsOutMessage<"getCountryCode"> {
 }
 
 
-export interface GetCountryCodeResponseMessage extends DefaultInMessage<"getCountryCode", "void"> {
+export interface GetCountryCodeWsInMessage extends DefaultInMessage<"getCountryCode", "void"> {
   content: Record<string, LocationDto>;
 }
 
@@ -410,14 +420,6 @@ export interface DeleteChannelMessage extends DefaultWsInMessage<"deleteChannel"
 export interface SaveRoomSettingsMessage extends DefaultWsInMessage<"saveRoomSettings", "room">, RoomNoUsersDto {
 }
 
-export interface ShowITypeMessage extends DefaultWsInMessage<"showIType", "room"> {
-  roomId: number;
-  userId: number;
-}
-
-export interface ShowITypeRequestMessage extends DefaultWsOutMessage<'showIType'> {
-  roomId: number;
-}
 
 export interface SetWsIdMessage extends DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
   rooms: RoomDto[];
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 1412737f5..d08c1887a 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -49,7 +49,7 @@ import type {
   RemoveOnlineUserMessage,
   SaveChannelSettingsMessage,
   SaveRoomSettingsMessage,
-  ShowITypeMessage,
+  ShowITypeWsInMessage,
 } from "@/ts/types/backend";
 import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import type {Logger} from "lines-logger";
@@ -228,7 +228,7 @@ export class RoomHandler extends MessageHandler {
     });
   }
 
-  public async showIType(message: ShowITypeMessage) {
+  public async showIType(message: ShowITypeWsInMessage) {
     if (this.store.myId !== message.userId) {
       await this.store.showUserIsTyping({
         userId: message.userId,
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index eea3f28bb..cbf877d25 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -39,7 +39,7 @@ import type {
   AddInviteMessage,
   AddRoomMessage,
   DefaultWsOutMessage,
-  GetCountryCodeResponseMessage,
+  GetCountryCodeWsInMessage,
   MessagesResponseMessage,
   PingMessage,
   PongMessage,
@@ -53,7 +53,7 @@ import type {
   SyncHistoryResponseMessage,
   UserProfileChangedMessage,
   WebRtcSetConnectionIdMessage,
-  ShowITypeRequestMessage,
+  ShowITypeWsOutMessage,
 } from "@/ts/types/backend";
 import type {
   InternetAppearMessage,
@@ -69,7 +69,7 @@ import {
   MessageStatus,
   WS_SESSION_EXPIRED_CODE
 } from '@/ts/types/backend';
-import {GetCountryCodeRequestMessage} from '@/ts/types/dto';
+import {GetCountryCodeWsOutMessage} from '@/ts/types/dto';
 
 enum WsState {
   NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
@@ -153,8 +153,8 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     return this.wsConnectionId;
   }
 
-  public async getCountryCode(): Promise<GetCountryCodeResponseMessage> {
-    let body: GetCountryCodeRequestMessage = {
+  public async getCountryCode(): Promise<GetCountryCodeWsInMessage> {
+    let body: GetCountryCodeWsOutMessage = {
       action: "getCountryCode",
     }
     return this.messageProc.sendToServerAndAwait(body);
@@ -279,7 +279,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
   }
 
   public showIType(roomId: number): void {
-    let request: ShowITypeRequestMessage = {
+    let request: ShowITypeWsOutMessage = {
       roomId,
       action: "showIType",
     }
diff --git a/newback/.eslintrc.json b/newback/.eslintrc.json
new file mode 100644
index 000000000..a256125a9
--- /dev/null
+++ b/newback/.eslintrc.json
@@ -0,0 +1,135 @@
+{
+  "extends": [
+    "eslint:all",
+    "plugin:@typescript-eslint/all",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+    "plugin:import/typescript",
+    "plugin:sonarjs/recommended"
+  ],
+  "plugins": [
+    "only-warn",
+    "babel",
+    "sonarjs"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "sourceType": "module",
+    "project": "./tsconfig.json"
+  },
+  "rules": {
+    "no-warning-comments": 0,
+    "object-curly-spacing": 0,
+    "init-declarations": 0, // poor choice
+    "func-style": [1, "declaration"],
+    "one-var": 0, // poor choice
+    "multiline-comment-style": 1, // turned off by default
+    "no-plusplus": 0, // too aggresive
+    "quote-props": [1, "as-needed"],
+    "camelcase": 0, // replaced with babel-camelcase
+    "no-ternary": 0, // too aggressive
+    "multiline-ternary": 0,
+    "sort-imports": 0,
+    "sort-keys": 0,
+    "new-cap": 0, // babel/new-cap
+    "array-element-newline": [1, "consistent"],
+    "comma-dangle": 0, // using typescript-eslint/comma-dangle
+    "function-call-argument-newline": [1, "consistent"],
+    "max-len": [1, { "code": 140, "ignorePattern": "http?s:\/\/", "ignoreTrailingComments": true}], // override 80 that is too low
+    "padded-blocks": [1, "never"],
+    "max-statements": [1, 25],
+    "function-paren-newline": [1, "consistent"],
+    "no-inline-comments": 0,
+    "no-confusing-arrow": 0, // conflict with no-extra-parens
+    "max-params": 0,
+    "no-void": [0], // allow void for void promise
+    "@typescript-eslint/no-untyped-public-signature": 0, // this breaks a lot: constructions public, ES6 setter should have return type etc
+    "@typescript-eslint/ban-ts-ignore": 0, // who cares, we explicitly define it.
+    "@typescript-eslint/ban-ts-comment": 0, // who cares, we explicitly define it.
+    "@typescript-eslint/space-before-function-paren": [1, "never"],
+    "@typescript-eslint/strict-boolean-expressions": 0,
+    "@typescript-eslint/no-unnecessary-type-assertion": 0, // this shity rule has bugs during lint:fix
+    "@typescript-eslint/indent": [1, 2], //replace 4 spaces
+    "@typescript-eslint/no-inferrable-types": 0, // @typescript-eslint/typedef
+    "@typescript-eslint/no-non-null-assertion": 0,
+    "@typescript-eslint/no-unused-vars-experimental": 0, // doesn't work with vue
+    "@typescript-eslint/no-type-alias": 0,
+    "@typescript-eslint/no-magic-numbers": [
+      "error",
+      {
+        "ignoreReadonlyClassProperties": true,
+        "ignoreEnums": true,
+        "ignore": [
+          -1,
+          0,
+          1,
+          1000
+        ],
+        "enforceConst": true
+      }
+    ],
+    "@typescript-eslint/comma-dangle": [1, "always-multiline"],
+    "@typescript-eslint/method-signature-style": [1, "method"],
+    "@typescript-eslint/init-declarations": 0, // let a ; try {a = funct()} catch (e) throw e; if a.sdfsd . In this example we can't have instant init
+    "@typescript-eslint/prefer-readonly-parameter-types": 0, // too many issues, we can't mofidy arguments, we can' use type like number[], because rule @typescript-eslint/array-type
+    "@typescript-eslint/naming-convention": [1,
+      {
+        "selector": "property",
+        "format": ["PascalCase", "camelCase"] // PascalCase for Vue-property-decorator components: {AppAlert}
+      }
+    ],
+    "babel/object-curly-spacing": 1,
+    "babel/quotes": 1,
+    "babel/semi": 1,
+    "babel/no-unused-expressions": 1,
+    "babel/valid-typeof": 1,
+    "babel/new-cap": 1,
+    "@typescript-eslint/no-parameter-properties": 0,
+    "babel/camelcase": 0, // use typescript-eslint/naming-convention
+    "babel/no-invalid-this": 1,
+    "import/no-named-as-default": 1, //is not part of default sert
+    "import/no-unresolved": 0,
+    "import/no-relative-parent-imports": 1,
+    "import/dynamic-import-chunkname": 0,
+    "import/exports-last":1,
+    "import/first":1,
+    "import/group-exports": 0, // vue3
+    "import/max-dependencies": 0,
+    "import/newline-after-import": 1,
+    "import/no-absolute-path":1,
+    "import/no-amd": 1,
+    "import/no-anonymous-default-export":1,
+    "import/no-commonjs": 1,
+    "import/no-cycle":1,
+    "import/no-default-export": 1,
+    "import/no-deprecated":1,
+    "import/no-dynamic-require": 1,
+    "import/no-extraneous-dependencies":1,
+    "import/no-internal-modules": 1,
+    "import/no-mutable-exports":1,
+    "import/no-named-default": 1,
+    "import/no-named-export":0, // we want them
+    "import/no-namespace": 0,
+    "import/no-nodejs-modules":1,
+    "import/no-restricted-paths": 1,
+    "import/no-self-import":1,
+    "import/no-unassigned-import": [1,  {"allow": ["**/*.sass", "**/*.css"]}],
+    "import/no-unused-modules":1,
+    "import/no-useless-path-segments": 1,
+    "import/no-webpack-loader-syntax":1,
+    "import/order": 0, // doesn't work with sorted-import
+    "import/prefer-default-export":0, // default exports are hell to IDE refactor support
+    "import/unambiguous": 1,
+    "class-methods-use-this": 0,
+    "@typescript-eslint/no-unnecessary-condition": 0 // too many times we want to make sure that variable that is not null is present or not. Let's say window.RTPConnection is declaread as non-nullable but we still check it in runtime
+  },
+  "overrides": [
+    {
+      "files": ["*.d.ts"],
+      "rules": {
+        "import/no-default-export": 0
+
+      }
+    }
+  ]
+}
diff --git a/newback/package.json b/newback/package.json
index 768fc0174..80367d75d 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -10,7 +10,10 @@
     "build": "rm -rf ./dist && ttsc",
     "start": "ts-node --compiler ttypescript src/main.ts",
     "test:html:coverage": "jest --config ./src/jest.config.ts --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
-    "test": "jest --config ./src/jest.config.ts --runInBand --coverage --coverageReporters text"
+    "test": "jest --config ./src/jest.config.ts --runInBand --coverage --coverageReporters text",
+    "lint": "eslint --ext .ts --max-warnings=0 src",
+    "lint:new": "eslint-find-rules -u ./.eslintrc.json",
+    "lint:fix": "eslint --fix --ext .ts src"
   },
   "engines": {
     "node": ">=16.0.0"
@@ -58,8 +61,6 @@
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.23",
     "@types/sequelize": "^4.28.11",
-    "@typescript-eslint/eslint-plugin": "^5.18.0",
-    "@typescript-eslint/parser": "^5.18.0",
     "eslint": "^8.12.0",
     "eslint-plugin-jest": "^26.1.4",
     "jest": "^27.5.1",
@@ -69,6 +70,13 @@
     "ts-loader": "^9.2.8",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.3",
-    "wait-for-expect": "^3.0.2"
+    "wait-for-expect": "^3.0.2",
+    "eslint-find-rules": "^4.1.0",
+    "eslint-plugin-babel": "^5.3.1",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-only-warn": "^1.0.3",
+    "eslint-plugin-sonarjs": "^0.13.0",
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0"
   }
 }
diff --git a/newback/src/data/types/typend.spec.ts b/newback/src/data/types/typend.spec.ts
new file mode 100644
index 000000000..5970d6c44
--- /dev/null
+++ b/newback/src/data/types/typend.spec.ts
@@ -0,0 +1,43 @@
+import {check} from 'typend'
+
+
+describe('typend', () => {
+
+  describe('simple', () => {
+    interface Message {
+      roomId: 3
+    }
+
+    interface Room {
+      name: string;
+      messages: Message[];
+    }
+
+    it('should replace single param', () => {
+      expect(() => check<Message>({})).toThrow()
+    });
+    it('complex', () => {
+      let room: Room = {
+        name: 'asd',
+        messages: [
+          {
+            roomId: 3,
+          }
+        ]
+      }
+      check<Room>(room)
+    });
+    it('complex3', () => {
+      interface A<T> {
+        b: T;
+        d: string;
+      }
+
+      check<A<number>>({
+        b4: 'sf'
+      })
+
+    });
+  });
+});
+
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 4aed9a0f4..486959000 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -15,7 +15,7 @@ async function bootstrap() {
   const cert = await promisify(readFile)(config.application.crtPath, 'utf-8');
 
   const app = await NestFactory.create(AppModule, {
-    logger: new ConsoleLogger(),
+    logger: [ 'log' , 'error' , 'warn' , 'debug'],
     cors: {
       allowedHeaders: ["x-requested-with", "session_id", "Content-Type"],
       methods: ["POST", "GET", "OPTIONS"],
diff --git a/newback/src/modules/api/websocket/interfaces/pubsub.ts b/newback/src/modules/api/websocket/interfaces/pubsub.ts
index 11f203a72..e8193e104 100644
--- a/newback/src/modules/api/websocket/interfaces/pubsub.ts
+++ b/newback/src/modules/api/websocket/interfaces/pubsub.ts
@@ -6,7 +6,7 @@ import {
 import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
 
 export interface PubSubMessage<A extends string, H extends HandlerName> {
-  content: DefaultWsInMessage<A, H>;
+  body: DefaultWsInMessage<A, H>;
 }
 
 // export interface SendToClientPubSubMessage<A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 5432ea993..2b18705b3 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -1,21 +1,26 @@
 import {
   Injectable,
-  Logger
-} from '@nestjs/common';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {ShowITypeRequestMessage} from '@/data/types/frontend';
-import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {SessionService} from '@/modules/rest/session/session.service';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
+  Logger,
+} from "@nestjs/common";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import type {
+  ShowITypeWsInMessage,
+  ShowITypeWsOutMessage,
+  SyncHistoryOutMessage,
+} from "@/data/types/frontend";
+import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {SessionService} from "@/modules/rest/session/session.service";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import type {WebSocketContextData} from "@/data/types/internal";
+import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
 
 
 @Injectable()
 export class MessageService {
-
-  constructor(
+  public constructor(
     public readonly logger: Logger,
     private readonly sessionService: SessionService,
     private readonly passwordService: PasswordService,
@@ -24,16 +29,61 @@ export class MessageService {
     private readonly roomRepository: RoomRepository,
     private readonly userRepository: UserRepository,
     private readonly pubsubService: PubsubService,
+    private readonly messageRepository: MessageRepository,
   ) {
   }
 
-  public async showIType(request: ShowITypeRequestMessage) {
-    // this.pubsubService.emit(
-    //     'sendToClient',
-    //     {
-    //       content: getLogoutMessage(online, lastTimeOnline, context, lastTimeOnline),
-    //     },
-    //     '*'
-    //   )
+  public showIType(data: ShowITypeWsOutMessage, context: WebSocketContextData): void {
+    const body: ShowITypeWsInMessage = {
+      action: "showIType",
+      handler: "room",
+      roomId: data.roomId,
+      userId: context.userId,
+    };
+    this.pubsubService.emit(
+      "sendToClient",
+      {
+        body,
+      },
+      String(data.roomId),
+    );
+  }
+
+  public async syncHistory(data: SyncHistoryOutMessage, context: WebSocketContextData) {
+    const messagesIds = await this.messageRepository.getNewMessagesAfterSync(data.roomIds, data.messagesIds, data.lastSynced);
+    if (data.onServerMessageIds) {
+      this.messageRepository.getMessages2(data.roomIds, data.onServerMessageIds,);
+    }
+
+  /*
+   *
+   * If in_message[VarNames.ON_SERVER_MESSAGE_IDS]:
+   * 	on_server_to_received_ids = list(Message.objects.filter(
+   * 		Q(room_id__in=room_ids)
+   * 		& Q(id__in=in_message[VarNames.ON_SERVER_MESSAGE_IDS])
+   * 		& Q(message_status=Message.MessageStatus.received.value)
+   * 	).values_list('id', flat=True))
+   * else:
+   * 	on_server_to_received_ids = []
+   *
+   * if in_message[VarNames.RECEIVED_MESSAGE_IDS] or in_message[VarNames.ON_SERVER_MESSAGE_IDS]:
+   * 	ids_to_search = in_message[VarNames.RECEIVED_MESSAGE_IDS] + in_message[VarNames.ON_SERVER_MESSAGE_IDS]
+   * 	read_ids = list(Message.objects.filter(
+   * 		Q(room_id__in=room_ids)
+   * 		& Q(id__in=ids_to_search)
+   * 		& Q(message_status=Message.MessageStatus.read.value)
+   * 	).values_list('id', flat=True))
+   * else:
+   * 	read_ids = []
+   *
+   * content = MessagesCreator.message_models_to_dtos(messages)
+   * self.ws_write({
+   * 	VarNames.CONTENT: content,
+   * 	VarNames.RECEIVED_MESSAGE_IDS: on_server_to_received_ids,
+   * 	VarNames.READ_MESSAGE_IDS: read_ids,
+   * 	VarNames.JS_MESSAGE_ID: in_message[VarNames.JS_MESSAGE_ID],
+   * 	VarNames.HANDLER_NAME: HandlerNames.NULL
+   * })
+   */
   }
 }
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 4102cd0fa..6cee1ae7b 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -16,21 +16,14 @@ import {
 } from 'ws';
 import {WebSocketContextData} from '@/data/types/internal';
 import {
-  ArgumentMetadata,
-  ArgumentsHost,
-  BadRequestException,
-  Catch,
-  ExceptionFilter,
-  HttpException,
-  Injectable,
   Logger,
-  PipeTransform,
   UseFilters
 } from '@nestjs/common';
 import {
-  GetCountryCodeResponseMessage,
-  GrowlMessage,
-  ShowITypeRequestMessage,
+  GetCountryCodeWsOutMessage,
+  GetCountryCodeWsInMessage,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutMessage,
   SyncHistoryOutMessage
 } from '@/data/types/frontend';
 import {SubscribePuBSub} from '@/modules/rest/pubsub/pubsub.service';
@@ -39,22 +32,7 @@ import {WebsocketService} from '@/modules/api/websocket/websocket.service';
 import {OnWsClose} from '@/modules/api/websocket/interfaces/utils';
 import {WsDataService} from '@/modules/api/websocket/ws.data.service';
 import {WsExceptionFilter} from '@/modules/api/websocket/ws.exception.filter';
-import {check} from 'typend';
-
-
-@Injectable()
-export class ValidationPipe implements PipeTransform<any, any> {
-
-
-  constructor(private checker: (v: any) => void ) {
-
-  }
-  transform(value: string, metadata: ArgumentMetadata): any {
-    this.checker(value);
-    return value;
-  }
-}
-
+import {MessageService} from '@/modules/api/websocket/message.service';
 
 @WebSocketGateway({
   path: '/ws'
@@ -69,6 +47,7 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
     public readonly logger: Logger,
     public readonly websocketService: WebsocketService,
     public readonly wsDataService: WsDataService,
+    public readonly messageService: MessageService,
   ) {
   }
 
@@ -84,25 +63,26 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
 
   @SubscribePuBSub('sendToClient')
   public sendToClient(ctx: WebSocketContextData, data: SendToClientPubSubMessage<any, any, any>) {
-    ctx.sendToClient(data.content);
+    ctx.sendToClient(data.body);
   }
 
   @SubscribeMessage('syncHistory')
-  syncHistory(@MessageBody() data: SyncHistoryOutMessage, /*@ConnectedSocket() a*/ @WsContext() context): any {
+ public async  syncHistory(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context: WebSocketContextData): Promise<any> {
+    await this.messageService.syncHistory(data, context);
   }
 
   @SubscribeMessage('printMessage')
-  printMessage(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context): any {
+  public async  printMessage(@MessageBody() data: SyncHistoryOutMessage, @WsContext()  context: WebSocketContextData): Promise<any> {
   }
 
   @SubscribeMessage('showIType')
-  showIType(@MessageBody(new ValidationPipe((v) => check<ShowITypeRequestMessage>(v))) data: SyncHistoryOutMessage, @WsContext() context): any {
-    // return this.
+  public async showIType(@MessageBody() data: ShowITypeWsOutMessage, @WsContext()  context: WebSocketContextData): Promise<void> {
+    await this.messageService.showIType(data, context);
   }
 
 
   @SubscribeMessage('getCountryCode')
-  async getCountryCode(@MessageBody() data: GetCountryCodeResponseMessage, @WsContext() context): Promise<Omit<GetCountryCodeResponseMessage, 'handler'|'action'>> {
+  async getCountryCode(@MessageBody() data: GetCountryCodeWsOutMessage, @WsContext()  context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, 'handler'|'action'>> {
     return this.wsDataService.getCountryCodes(context);
   }
 
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 0a005401b..d14a5d494 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -71,7 +71,7 @@ export class WebsocketService {
     this.pubsubService.emit(
       'sendToClient',
       {
-        content: data,
+        body: data,
       },
       '*'
     )
@@ -89,7 +89,7 @@ export class WebsocketService {
       this.pubsubService.emit(
         'sendToClient',
         {
-          content: getLogoutMessage(online, lastTimeOnline, context, lastTimeOnline),
+          body: getLogoutMessage(online, lastTimeOnline, context, lastTimeOnline),
         },
         '*'
       )
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index a142247d9..59566d8d7 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -5,7 +5,7 @@ import {
 import {UserRepository} from '@/modules/rest/database/repository/user.repository';
 import {PasswordService} from '@/modules/rest/password/password.service';
 import {
-  GetCountryCodeResponseMessage,
+  GetCountryCodeWsInMessage,
   LocationDto
 } from '@/data/types/frontend';
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
@@ -35,13 +35,13 @@ export class WsDataService {
   ) {
   }
 
-  public async getCountryCodes(context: WebSocketContextData): Promise<Omit<GetCountryCodeResponseMessage, 'handler'| 'action'>> {
+  public async getCountryCodes(context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, 'handler'| 'action'>> {
     if (!this.configService.getConfig().settings.flags) {
       throw new ValidationException('Flags api is not enabled');
     }
     let usersId: number[] = await this.roomRepository.usersForUser(context.userId);
     let userInfo: UserJoinedInfoModel[] = await this.ipRepository.getIpInfosForUsers(usersId);
-    let content: GetCountryCodeResponseMessage['content'] =userInfo.reduce((previousValue, currentValue) => {
+    let content: GetCountryCodeWsInMessage['content'] =userInfo.reduce((previousValue, currentValue) => {
       if (currentValue.ip) {
         let value: LocationDto = {
           country: currentValue.ip.country,
diff --git a/newback/src/modules/rest/database/database.module.ts b/newback/src/modules/rest/database/database.module.ts
index 5ae01a461..894e9cb12 100644
--- a/newback/src/modules/rest/database/database.module.ts
+++ b/newback/src/modules/rest/database/database.module.ts
@@ -24,19 +24,21 @@ import {UserRepository} from '@/modules/rest/database/repository/user.repository
 import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
 import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
 import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
+import {MessageRepository} from '@/modules/rest/database/repository/messages.repository';
 
 const repositories = [
   UserRepository,
   RoomRepository,
   IpRepository,
   VerificationRepository,
+  MessageRepository,
 ];
 
 @Module({
   imports: [
     SequelizeModule.forRootAsync({
       inject: [Logger],
-      useFactory: (logger: Logger) => generateOrmConfig((sql) => logger.verbose(sql, 'sql')),
+      useFactory: (logger: Logger) => generateOrmConfig((sql) => sql.length > 2000 ? logger.verbose(sql, 'sql'): logger.debug(sql, 'sql')),
     }),
     SequelizeModule.forFeature([
       ChannelModel,
diff --git a/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts b/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
new file mode 100644
index 000000000..b2ad237df
--- /dev/null
+++ b/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
@@ -0,0 +1,43 @@
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {ConsoleLogger} from "@nestjs/common";
+import type {
+  TestingModule,
+} from "@nestjs/testing";
+import {
+  Test,
+} from "@nestjs/testing";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {ConfigModule} from "@/modules/rest/config/config.module";
+import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+
+describe("MessageRepository", () => {
+  let app: TestingModule;
+  beforeAll(async() => {
+    app = await Test.createTestingModule({
+      imports: [
+        {
+          module: DatabaseModule,
+          imports: [
+            LoggerModule,
+            ConfigModule,
+            DatabaseModule,
+          ],
+        },
+
+      ],
+    }).setLogger(new ConsoleLogger()).
+      compile();
+  });
+  describe("getNewMessagesFromRoom", () => {
+    it("should produce correct sql", async() => {
+      const mr: MessageRepository = app.get(MessageRepository);
+      const result = await mr.getNewMessagesAfterSync([1, 2], [3, 4], 3600000);
+    });
+  });
+  describe("getMessages2", () => {
+    it("should produce correct sql", async() => {
+      const mr: MessageRepository = app.get(MessageRepository);
+      const result = await mr.getMessages2([1, 2], [3, 4]);
+    });
+  });
+});
diff --git a/newback/src/modules/rest/database/repository/messages.repository.ts b/newback/src/modules/rest/database/repository/messages.repository.ts
new file mode 100644
index 000000000..10a611677
--- /dev/null
+++ b/newback/src/modules/rest/database/repository/messages.repository.ts
@@ -0,0 +1,48 @@
+import {Injectable} from "@nestjs/common";
+import {InjectModel} from "@nestjs/sequelize";
+import {Op} from "sequelize";
+import {MessageModel} from "@/data/model/message.model";
+import {MessageStatus} from "@/data/types/frontend";
+
+
+@Injectable()
+export class MessageRepository {
+  public constructor(
+    @InjectModel(MessageModel) private readonly messageModel: typeof MessageModel,
+  ) {
+  }
+
+  public async getNewMessagesAfterSync(roomIds: number[], messageIds: number[], lastSynced: number): Promise<MessageModel[]> {
+    return this.messageModel.findAll({
+      where: {
+        roomId: {
+          [Op.in]: roomIds,
+        },
+        id: {
+          [Op.notIn]: messageIds,
+        },
+        [Op.or]: {
+          updatedAt: {
+            [Op.gt]: Date.now() - lastSynced,
+          },
+          messageStatus: MessageStatus.ON_SERVER,
+        },
+      },
+    });
+  }
+
+  public async getMessages2(roomIds: number[], onServerMessageIds: number[]): Promise<MessageModel[]> {
+    return this.messageModel.findAll({
+      where: {
+        roomId: {
+          [Op.in]: roomIds,
+        },
+        id: {
+          [Op.in]: onServerMessageIds,
+        },
+        messageStatus: MessageStatus.RECEIVED,
+      },
+      attributes: ["id"],
+    });
+  }
+}
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index 892d62f70..3a31e20eb 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -52,7 +52,11 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
             processErrors(e, ws, this.logger)
             return
           }
-          this.logger.debug(`WS:OUT ${message}`, 'ws')
+          if (message.length > 2000) {
+            this.logger.verbose(`WS:OUT ${message}`, 'ws')
+          } else {
+            this.logger.debug(`WS:OUT ${message}`, 'ws')
+          }
           oldSend(message)
         }
       };
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 2f9c04015..8dad0190d 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -1094,14 +1094,14 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d"
-  integrity sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.18.0"
-    "@typescript-eslint/type-utils" "5.18.0"
-    "@typescript-eslint/utils" "5.18.0"
+"@typescript-eslint/eslint-plugin@^5.17.0":
+  version "5.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.19.0.tgz#9608a4b6d0427104bccf132f058cba629a6553c0"
+  integrity sha512-w59GpFqDYGnWFim9p6TGJz7a3qWeENJuAKCqjGSx+Hq/bwq3RZwXYqy98KIfN85yDqz9mq6QXiY5h0FjGQLyEg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.19.0"
+    "@typescript-eslint/type-utils" "5.19.0"
+    "@typescript-eslint/utils" "5.19.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -1109,14 +1109,14 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.18.0.tgz#2bcd4ff21df33621df33e942ccb21cb897f004c6"
-  integrity sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==
+"@typescript-eslint/parser@^5.17.0":
+  version "5.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.19.0.tgz#05e587c1492868929b931afa0cb5579b0f728e75"
+  integrity sha512-yhktJjMCJX8BSBczh1F/uY8wGRYrBeyn84kH6oyqdIJwTGKmzX5Qiq49LRQ0Jh0LXnWijEziSo6BRqny8nqLVQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.18.0"
-    "@typescript-eslint/types" "5.18.0"
-    "@typescript-eslint/typescript-estree" "5.18.0"
+    "@typescript-eslint/scope-manager" "5.19.0"
+    "@typescript-eslint/types" "5.19.0"
+    "@typescript-eslint/typescript-estree" "5.19.0"
     debug "^4.3.2"
 
 "@typescript-eslint/scope-manager@5.18.0":
@@ -1127,12 +1127,20 @@
     "@typescript-eslint/types" "5.18.0"
     "@typescript-eslint/visitor-keys" "5.18.0"
 
-"@typescript-eslint/type-utils@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz#62dbfc8478abf36ba94a90ddf10be3cc8e471c74"
-  integrity sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==
+"@typescript-eslint/scope-manager@5.19.0":
+  version "5.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.19.0.tgz#97e59b0bcbcb54dbcdfba96fc103b9020bbe9cb4"
+  integrity sha512-Fz+VrjLmwq5fbQn5W7cIJZ066HxLMKvDEmf4eu1tZ8O956aoX45jAuBB76miAECMTODyUxH61AQM7q4/GOMQ5g==
   dependencies:
-    "@typescript-eslint/utils" "5.18.0"
+    "@typescript-eslint/types" "5.19.0"
+    "@typescript-eslint/visitor-keys" "5.19.0"
+
+"@typescript-eslint/type-utils@5.19.0":
+  version "5.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.19.0.tgz#80f2125b0dfe82494bbae1ea99f1c0186d420282"
+  integrity sha512-O6XQ4RI4rQcBGshTQAYBUIGsKqrKeuIOz9v8bckXZnSeXjn/1+BDZndHLe10UplQeJLXDNbaZYrAytKNQO2T4Q==
+  dependencies:
+    "@typescript-eslint/utils" "5.19.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
@@ -1141,6 +1149,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.18.0.tgz#4f0425d85fdb863071680983853c59a62ce9566e"
   integrity sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==
 
+"@typescript-eslint/types@5.19.0":
+  version "5.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.19.0.tgz#12d3d600d754259da771806ee8b2c842d3be8d12"
+  integrity sha512-zR1ithF4Iyq1wLwkDcT+qFnhs8L5VUtjgac212ftiOP/ZZUOCuuF2DeGiZZGQXGoHA50OreZqLH5NjDcDqn34w==
+
 "@typescript-eslint/typescript-estree@5.18.0":
   version "5.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz#6498e5ee69a32e82b6e18689e2f72e4060986474"
@@ -1154,7 +1167,32 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.18.0", "@typescript-eslint/utils@^5.10.0":
+"@typescript-eslint/typescript-estree@5.19.0":
+  version "5.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.19.0.tgz#fc987b8f62883f9ea6a5b488bdbcd20d33c0025f"
+  integrity sha512-dRPuD4ocXdaE1BM/dNR21elSEUPKaWgowCA0bqJ6YbYkvtrPVEvZ+zqcX5a8ECYn3q5iBSSUcBBD42ubaOp0Hw==
+  dependencies:
+    "@typescript-eslint/types" "5.19.0"
+    "@typescript-eslint/visitor-keys" "5.19.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.19.0":
+  version "5.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.19.0.tgz#fe87f1e3003d9973ec361ed10d36b4342f1ded1e"
+  integrity sha512-ZuEckdupXpXamKvFz/Ql8YnePh2ZWcwz7APICzJL985Rp5C2AYcHO62oJzIqNhAMtMK6XvrlBTZeNG8n7gS3lQ==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.19.0"
+    "@typescript-eslint/types" "5.19.0"
+    "@typescript-eslint/typescript-estree" "5.19.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/utils@^5.10.0":
   version "5.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855"
   integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==
@@ -1174,6 +1212,14 @@
     "@typescript-eslint/types" "5.18.0"
     eslint-visitor-keys "^3.0.0"
 
+"@typescript-eslint/visitor-keys@5.19.0":
+  version "5.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.19.0.tgz#c84ebc7f6c744707a361ca5ec7f7f64cd85b8af6"
+  integrity sha512-Ym7zZoMDZcAKWsULi2s7UMLREdVQdScPQ/fKWMYefarCztWlHPFVJo8racf8R0Gc8FAEJ2eD4of8As1oFtnQlQ==
+  dependencies:
+    "@typescript-eslint/types" "5.19.0"
+    eslint-visitor-keys "^3.0.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -1429,6 +1475,11 @@ ansi-escapes@^4.2.1:
   dependencies:
     type-fest "^0.21.3"
 
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -1501,7 +1552,7 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
-array-includes@^3.0.2:
+array-includes@^3.0.2, array-includes@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
   integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
@@ -1517,6 +1568,16 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+array.prototype.flat@^1.2.5:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
+  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.2"
+    es-shim-unscopables "^1.0.0"
+
 arrify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
@@ -1947,6 +2008,15 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -1971,6 +2041,11 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -2220,7 +2295,7 @@ dayjs@^1.10.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.0.tgz#009bf7ef2e2ea2d5db2e6583d2d39a4b5061e805"
   integrity sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==
 
-debug@2.6.9:
+debug@2.6.9, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2234,6 +2309,13 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, d
   dependencies:
     ms "2.1.2"
 
+debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 decimal.js@^10.2.1:
   version "10.3.1"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
@@ -2366,6 +2448,13 @@ discontinuous-range@1.0.0:
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
   integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+  dependencies:
+    esutils "^2.0.2"
+
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -2573,11 +2662,44 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.19.1:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
+es-abstract@^1.19.2:
+  version "1.19.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.5.tgz#a2cb01eb87f724e815b278b0dd0d00f36ca9a7f1"
+  integrity sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -2656,6 +2778,60 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-find-rules@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-find-rules/-/eslint-find-rules-4.1.0.tgz#f32671050cafbbf140592ab7fd04c2acc9117f5c"
+  integrity sha512-2nLJ0UrQRUGbOX8ksSxTgDNWGBW0RidIEIMlwNe1YR4RkjYksFDPYWf3WO9QFWM2NqkuHlTTeyOM94vaNwaFVw==
+  dependencies:
+    cliui "^3.2.0"
+    eslint-rule-documentation "^1.0.23"
+    glob "^7.2.0"
+    which "^1.3.1"
+    window-size "^0.3.0"
+    yargs "^16.2.0"
+
+eslint-import-resolver-node@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
+  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
+  dependencies:
+    debug "^3.2.7"
+    resolve "^1.20.0"
+
+eslint-module-utils@^2.7.3:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
+  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
+  dependencies:
+    debug "^3.2.7"
+    find-up "^2.1.0"
+
+eslint-plugin-babel@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz#75a2413ffbf17e7be57458301c60291f2cfbf560"
+  integrity sha512-VsQEr6NH3dj664+EyxJwO4FCYm/00JhYb3Sk3ft8o+fpKuIfQ9TaW6uVUfvwMXHcf/lsnRIoyFPsLMyiWCSL/g==
+  dependencies:
+    eslint-rule-composer "^0.3.0"
+
+eslint-plugin-import@^2.25.4:
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
+  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
+  dependencies:
+    array-includes "^3.1.4"
+    array.prototype.flat "^1.2.5"
+    debug "^2.6.9"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-module-utils "^2.7.3"
+    has "^1.0.3"
+    is-core-module "^2.8.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.values "^1.1.5"
+    resolve "^1.22.0"
+    tsconfig-paths "^3.14.1"
+
 eslint-plugin-jest@^26.1.4:
   version "26.1.4"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.4.tgz#8e3410093ff4439d0c3a371add5bf9e05623a57a"
@@ -2663,6 +2839,26 @@ eslint-plugin-jest@^26.1.4:
   dependencies:
     "@typescript-eslint/utils" "^5.10.0"
 
+eslint-plugin-only-warn@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-only-warn/-/eslint-plugin-only-warn-1.0.3.tgz#a75f3a9ded7f03e9808e75ec27f22b644084506e"
+  integrity sha512-XQOX/TfLoLw6h8ky51d29uUjXRTQHqBGXPylDEmy5fe/w7LIOnp8MA24b1OSMEn9BQoKow1q3g1kLe5/9uBTvw==
+
+eslint-plugin-sonarjs@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-0.13.0.tgz#c34d140cc90abaaed38f5a5201a2ccdebe398862"
+  integrity sha512-t3m7ta0EspzDxSOZh3cEOJIJVZgN/TlJYaBGnQlK6W/PZNbWep8q4RQskkJkA7/zwNpX0BaoEOSUUrqaADVoqA==
+
+eslint-rule-composer@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
+  integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
+
+eslint-rule-documentation@^1.0.23:
+  version "1.0.23"
+  resolved "https://registry.yarnpkg.com/eslint-rule-documentation/-/eslint-rule-documentation-1.0.23.tgz#4e0886145597a78d24524ec7e0cf18c6fedc23a8"
+  integrity sha512-pWReu3fkohwyvztx/oQWWgld2iad25TfUdi6wvhhaDPIQjHU/pyvlKgXFw1kX31SQK2Nq9MH+vRDWB0ZLy8fYw==
+
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -2996,6 +3192,13 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
+find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -3268,7 +3471,7 @@ glob@7.1.7:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.2.0, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@7.2.0, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -3736,6 +3939,13 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -3803,7 +4013,7 @@ is-regex@^1.0.3, is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-shared-array-buffer@^1.0.1:
+is-shared-array-buffer@^1.0.1, is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
   integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
@@ -4591,6 +4801,14 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -4847,7 +5065,7 @@ minimalistic-assert@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@^3.0.4:
+minimatch@^3.0.4, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -4913,7 +5131,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -5085,6 +5303,11 @@ nth-check@~1.0.1:
   dependencies:
     boolbase "~1.0.0"
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
 nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -5138,7 +5361,7 @@ object.getownpropertydescriptors@^2.0.2:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.values@^1.0.3:
+object.values@^1.0.3, object.values@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
   integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
@@ -5240,6 +5463,13 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -5247,6 +5477,13 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -5254,6 +5491,11 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -5318,6 +5560,11 @@ parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -5798,7 +6045,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@>=1.9.0, resolve@^1.1.6, resolve@^1.15.1, resolve@^1.20.0:
+resolve@>=1.9.0, resolve@^1.1.6, resolve@^1.15.1, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -6156,6 +6403,15 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -6236,6 +6492,13 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -6558,7 +6821,7 @@ tsconfig-paths-webpack-plugin@3.5.2:
     enhanced-resolve "^5.7.0"
     tsconfig-paths "^3.9.0"
 
-tsconfig-paths@3.14.1, tsconfig-paths@^3.9.0:
+tsconfig-paths@3.14.1, tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
   integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
@@ -6913,6 +7176,13 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
+which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -6927,6 +7197,11 @@ wide-align@^1.1.2:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
+window-size@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.3.0.tgz#b8f0b66e325d22160751e496337e44b45b727546"
+  integrity sha1-uPC2bjJdIhYHUeSWM35EtFtydUY=
+
 windows-release@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-4.0.0.tgz#4725ec70217d1bf6e02c7772413b29cdde9ec377"
@@ -6961,6 +7236,14 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"

From 328b6924f844d55a523a51a4955882e48690501c Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 16 Apr 2022 03:38:27 +0300
Subject: [PATCH 065/221] eslint backend

---
 common/dto.ts                                 | 153 ++---
 newback/src/config/Config.d.ts                |   1 -
 .../data/exceptions/invalid.ip.exception.ts   |   3 +-
 .../data/exceptions/validation.exception.ts   |   3 +-
 newback/src/data/model/channel.model.ts       |   8 +-
 newback/src/data/model/image.model.ts         |  14 +-
 newback/src/data/model/ip.address.model.ts    |  12 +-
 .../src/data/model/message.history.model.ts   |  12 +-
 .../src/data/model/message.mention.model.ts   |  19 +-
 newback/src/data/model/message.model.ts       |  17 +-
 newback/src/data/model/room.model.ts          |  29 +-
 newback/src/data/model/room.users.model.ts    |  16 +-
 .../data/model/subscription.message.model.ts  |  17 +-
 newback/src/data/model/subscription.model.ts  |  15 +-
 newback/src/data/model/uploaded.file.model.ts |  11 +-
 newback/src/data/model/user.auth.model.ts     |  13 +-
 .../src/data/model/user.joined.info.model.ts  |  14 +-
 newback/src/data/model/user.model.ts          |  22 +-
 newback/src/data/model/user.profile.model.ts  |  17 +-
 newback/src/data/model/user.settings.model.ts |  19 +-
 newback/src/data/model/verification.model.ts  |  13 +-
 newback/src/data/types/api.ts                 |   4 +-
 newback/src/data/types/internal.ts            |   6 +-
 newback/src/data/types/typend.spec.ts         |  34 +-
 newback/src/jest.config.ts                    |  66 +-
 newback/src/jest.setup.ts                     |   4 +-
 newback/src/main.ts                           |  32 +-
 .../src/modules/api/auth/auth.controller.ts   |  49 +-
 .../src/modules/api/auth/auth.module.spec.ts  | 648 +++++++++---------
 newback/src/modules/api/auth/auth.module.ts   |  42 +-
 newback/src/modules/api/auth/auth.service.ts  | 209 +++---
 .../modules/api/auth/facebook.auth.service.ts |  40 +-
 .../modules/api/auth/google.auth.service.ts   |  14 +-
 .../facebook.auth.request.validator.ts        |   6 +-
 .../google.auth.reques.validator.ts           |   6 +-
 .../validators/login.request.validator.ts     |  15 +-
 .../validators/sign.up.request.validator.ts   |  18 +-
 .../validate.email.request.validator.ts       |   4 +-
 .../validate.user.request.validator.ts        |  10 +-
 .../accept.token.request.validator.ts         |   8 +-
 .../confirm.email.request.validator.ts        |   4 +-
 .../send.restore.password.validator.ts        |  12 +-
 .../verify.token.request.validator.ts         |   4 +-
 .../modules/api/verify/verify.controller.ts   |  38 +-
 .../modules/api/verify/verify.module.spec.ts  | 320 +++++----
 .../src/modules/api/verify/verify.module.ts   |  20 +-
 .../src/modules/api/verify/verify.service.ts  |  70 +-
 .../api/websocket/interfaces/pubsub.ts        |  19 +-
 .../modules/api/websocket/interfaces/utils.ts |   2 +-
 .../websocket/transformers/ws.transformer.ts  | 111 +--
 .../websocket/websocket.gateway.e2e.spec.ts   | 105 +--
 .../api/websocket/websocket.gateway.ts        |  68 +-
 .../modules/api/websocket/websocket.module.ts |  36 +-
 .../api/websocket/websocket.service.ts        |  83 ++-
 .../modules/api/websocket/ws.data.service.ts  |  54 +-
 .../api/websocket/ws.exception.filter.ts      |  34 +-
 newback/src/modules/app/app.module.ts         |  56 +-
 .../src/modules/app/guards/captcha.guard.ts   |  20 +-
 .../app/interceptors/logging.interceptor.ts   |  35 +-
 .../src/modules/rest/config/config.module.ts  |  20 +-
 .../src/modules/rest/config/config.service.ts |   6 +-
 .../modules/rest/database/database.module.ts  |  56 +-
 .../rest/database/repository/ip.repository.ts |  33 +-
 .../database/repository/room.repository.ts    |  78 ++-
 .../database/repository/user.repository.ts    |  85 +--
 .../repository/verification.repository.ts     |  35 +-
 .../src/modules/rest/email/email.module.ts    |  36 +-
 .../modules/rest/email/email.service.spec.ts  | 112 +--
 .../src/modules/rest/email/email.service.ts   |  35 +-
 .../modules/rest/html/html.service.spec.ts    |  38 +-
 newback/src/modules/rest/html/html.service.ts |  22 +-
 newback/src/modules/rest/http/http.module.ts  |  22 +-
 newback/src/modules/rest/http/http.service.ts |  39 +-
 .../src/modules/rest/ip/ip.cache.service.ts   |  41 +-
 newback/src/modules/rest/ip/ip.module.ts      |  12 +-
 .../modules/rest/ip/ip.service.e2e.spec.ts    |  53 +-
 newback/src/modules/rest/ip/ip.service.ts     |  21 +-
 .../src/modules/rest/logger/logger.module.ts  |   6 +-
 .../modules/rest/password/password.service.ts |  16 +-
 .../src/modules/rest/pubsub/pubsub.service.ts |  65 +-
 .../src/modules/rest/redis/redis.service.ts   |  61 +-
 .../modules/rest/session/session.service.ts   |  21 +-
 .../src/modules/rest/ws.adapter/ws.adapter.ts | 106 +--
 newback/src/utils/consts.ts                   |   4 +-
 newback/src/utils/decorators.ts               |  47 +-
 newback/src/utils/helpers.spec.ts             |  21 +-
 newback/src/utils/helpers.ts                  |  24 +-
 newback/src/utils/migration.old.ts            | 284 ++++----
 newback/src/utils/migration.runner.ts         |  30 +-
 89 files changed, 2085 insertions(+), 2078 deletions(-)

diff --git a/common/dto.ts b/common/dto.ts
index 0c5382974..252b760af 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -19,16 +19,13 @@ export interface AcceptTokenRequest {
   password: string;
 }
 
-export interface AcceptTokenResponse extends SessionResponse {
-
-}
+export type AcceptTokenResponse = SessionResponse;
 
 export interface VerifyTokenResponse extends OkResponse {
   username: string;
 }
 
-export interface SendRestorePasswordResponse extends OkResponse {
-}
+export type SendRestorePasswordResponse = OkResponse;
 
 export interface CaptchaRequest {
   captcha?: string;
@@ -57,16 +54,13 @@ export interface ConfirmEmailRequest {
   token: string;
 }
 
-export interface ConfirmEmailResponse extends OkResponse {
-}
+export type ConfirmEmailResponse = OkResponse;
 
 export interface SessionResponse {
   session: string;
 }
 
-export interface SignInResponse extends SessionResponse {
-
-}
+export type SignInResponse = SessionResponse;
 
 
 interface TypeGeneratorForOauth1 extends SessionResponse {
@@ -75,7 +69,7 @@ interface TypeGeneratorForOauth1 extends SessionResponse {
 }
 
 interface TypeGeneratorForOauth2 extends SessionResponse {
-  isNewAccount: false
+  isNewAccount: false;
 }
 
 export type OauthSessionResponse =
@@ -86,21 +80,15 @@ export type OauthSessionResponse =
 export type GoogleSignInResponse = OauthSessionResponse;
 export type FacebookSignInResponse = OauthSessionResponse;
 
-export interface SignUpResponse extends SessionResponse {
-
-}
+export type SignUpResponse = SessionResponse;
 
 export interface OkResponse {
   ok: true;
 }
 
-export interface ValidateUserResponse extends OkResponse {
+export type ValidateUserResponse = OkResponse;
 
-}
-
-export interface ValidateEmailResponse extends OkResponse {
-
-}
+export type ValidateEmailResponse = OkResponse;
 
 export interface ValidateUserEmailRequest {
   email: string;
@@ -108,44 +96,44 @@ export interface ValidateUserEmailRequest {
 
 // ISO/IEC 5218 1 male, 2 - female
 export enum Gender {
-  MALE = 'MALE',
-  FEMALE = 'FEMALE',
-  OTHER = 'OTHER',
+  MALE = "MALE",
+  FEMALE = "FEMALE",
+  OTHER = "OTHER",
 }
 
 export enum MessageStatus {
-  ON_SERVER = 'ON_SERVER',  // uploaded to server
-  READ = 'READ',
-  RECEIVED = 'RECEIVED', //sent
+  ON_SERVER = "ON_SERVER", // Uploaded to server
+  READ = "READ",
+  RECEIVED = "RECEIVED", // Sent
 }
 
 export enum Theme {
-  COLOR_LOR = 'COLOR_LOR',
-  COLOR_REG = 'COLOR_REG',
-  COLOR_WHITE = 'COLOR_WHITE'
+  COLOR_LOR = "COLOR_LOR",
+  COLOR_REG = "COLOR_REG",
+  COLOR_WHITE = "COLOR_WHITE",
 }
 
 
 export enum VerificationType {
-  REGISTER = 'REGISTER', // when user sign up with email, we want to confirm that it's his/her email
-  PASSWORD = 'PASSWORD', // when user request a pasword change
-  EMAIL = 'EMAIL', // when user changes an email
+  REGISTER = "REGISTER", // When user sign up with email, we want to confirm that it's his/her email
+  PASSWORD = "PASSWORD", // When user request a pasword change
+  EMAIL = "EMAIL", // When user changes an email
 }
 
 export enum ImageType {
-  VIDEO = 'VIDEO',
-  FILE = 'FILE',
-  MEDIA_RECORD = 'MEDIA_RECORD',
-  AUDIO_RECORD = 'AUDIO_RECORD',
-  IMAGE = 'IMAGE',
-  PREVIEW = 'PREVIEW',
-  GIPHY = 'GIPHY'
+  VIDEO = "VIDEO",
+  FILE = "FILE",
+  MEDIA_RECORD = "MEDIA_RECORD",
+  AUDIO_RECORD = "AUDIO_RECORD",
+  IMAGE = "IMAGE",
+  PREVIEW = "PREVIEW",
+  GIPHY = "GIPHY",
 }
 
 export enum UploadedFileChoices {
-  VIDEO = 'VIDEO',
-  IMAGE = 'IMAGE',
-  FILE = 'FILE',
+  VIDEO = "VIDEO",
+  IMAGE = "IMAGE",
+  FILE = "FILE",
 }
 
 /** CODE THAT I PUT HERE MANUALLY */
@@ -172,7 +160,7 @@ export interface ShowITypeWsInMessage extends DefaultWsInMessage<"showIType", "r
   userId: number;
 }
 
-export interface ShowITypeWsOutMessage extends DefaultWsOutMessage<'showIType'> {
+export interface ShowITypeWsOutMessage extends DefaultWsOutMessage<"showIType"> {
   roomId: number;
 }
 
@@ -217,7 +205,6 @@ export interface ChangeUserOnlineBase {
 }
 
 
-
 export type HandlerType<A extends string, H extends HandlerName> = (a: DefaultInMessage<A, H | "*">) => Promise<void> | void;
 
 export type HandlerTypes<K extends string, H extends HandlerName> = {
@@ -295,42 +282,42 @@ export type CallStatus =
   | "sent_offer";
 
 
-
-/** wsInMessages.ts */
+/** WsInMessages.ts */
 /**
  * This file should only contain structures created by server. Only BE -> FE by websockets
  * and processed by MessageHandler
  */
 
-// import type {
-//   ChannelDto,
-//   LocationDto,
-//   MessageModelDto,
-//   RoomDto,
-//   RoomNoUsersDto,
-//   UserDto,
-//   UserProfileDto,
-//   UserProfileDtoWoImage,
-//   UserSettingsDto,
-// } from "@/ts/types/dto";
-//
-// import type {
-//   AcceptFileContent,
-//   AddRoomBase,
-//   BrowserBase,
-//   CallBackMessage,
-//   ChangeUserOnlineBase,
-//   DefaultInMessage,
-//   HandlerName,
-//   NewRoom,
-//   OfferFileContent,
-//   OpponentWsId,
-//   ReplyWebRtc,
-//   RoomExistedBefore,
-//   WebRtcDefaultMessage,
-// } from "@/ts/types/backend";
-// import type {MessageStatus} from "@/ts/types/model";
-
+/*
+ * Import type {
+ *   ChannelDto,
+ *   LocationDto,
+ *   MessageModelDto,
+ *   RoomDto,
+ *   RoomNoUsersDto,
+ *   UserDto,
+ *   UserProfileDto,
+ *   UserProfileDtoWoImage,
+ *   UserSettingsDto,
+ * } from "@/ts/types/dto";
+ *
+ * import type {
+ *   AcceptFileContent,
+ *   AddRoomBase,
+ *   BrowserBase,
+ *   CallBackMessage,
+ *   ChangeUserOnlineBase,
+ *   DefaultInMessage,
+ *   HandlerName,
+ *   NewRoom,
+ *   OfferFileContent,
+ *   OpponentWsId,
+ *   ReplyWebRtc,
+ *   RoomExistedBefore,
+ *   WebRtcDefaultMessage,
+ * } from "@/ts/types/backend";
+ * import type {MessageStatus} from "@/ts/types/model";
+ */
 
 
 export interface MessagesResponseMessage {
@@ -379,8 +366,7 @@ export interface DeleteRoomMessage extends DefaultWsInMessage<"deleteRoom", "roo
   roomId: number;
 }
 
-export interface GetCountryCodeWsOutMessage extends DefaultWsOutMessage<"getCountryCode"> {
-}
+export type GetCountryCodeWsOutMessage = DefaultWsOutMessage<"getCountryCode">;
 
 
 export interface GetCountryCodeWsInMessage extends DefaultInMessage<"getCountryCode", "void"> {
@@ -487,7 +473,7 @@ export interface UserProfileChangedMessage extends DefaultWsInMessage<"userProfi
 
 }
 
-export interface GrowlMessage extends DefaultWsInMessage<'growlError', 'void'> {
+export interface GrowlMessage extends DefaultWsInMessage<"growlError", "void"> {
   content: string;
   action: "growlError";
 }
@@ -525,18 +511,15 @@ export interface DestroyFileConnectionMessage extends DefaultWsInMessage<"destro
   content: "decline" | "success";
 }
 
-/** wsOutMEssages */
+/** WsOutMEssages */
 /**
  * This file only contains messages that sent to backend api. FE -> BE by websockets
  */
 
-// import type {DefaultMessage} from "@/ts/types/backend";
-
-
-
+// Import type {DefaultMessage} from "@/ts/types/backend";
 
 
-/// IMPORTED FROM OTHERS
+// / IMPORTED FROM OTHERS
 
 
 export interface MessageModelDto {
@@ -577,7 +560,7 @@ export interface UserProfileDtoWoImage {
   id: number;
 }
 
-export declare type LogLevel = 'log_raise_error' | 'log_with_warnings' | 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'disable';
+export declare type LogLevel = "debug" | "disable" | "error" | "info" | "log_raise_error" | "log_with_warnings" | "trace" | "warn";
 
 export interface UserSettingsDto {
   embeddedYoutube: boolean;
diff --git a/newback/src/config/Config.d.ts b/newback/src/config/Config.d.ts
index 527bc0f99..7010d50fa 100644
--- a/newback/src/config/Config.d.ts
+++ b/newback/src/config/Config.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 declare module "node-ts-config" {
   interface IConfig {
diff --git a/newback/src/data/exceptions/invalid.ip.exception.ts b/newback/src/data/exceptions/invalid.ip.exception.ts
index abc545c73..35755e8e1 100644
--- a/newback/src/data/exceptions/invalid.ip.exception.ts
+++ b/newback/src/data/exceptions/invalid.ip.exception.ts
@@ -1,7 +1,8 @@
-import {HttpException} from '@nestjs/common';
+import {HttpException} from "@nestjs/common";
 
 export class InvalidIpException extends HttpException {
   public readonly networkError: boolean;
+
   public readonly ip: string;
 
   constructor(ip: string, error: string, networkError: boolean) {
diff --git a/newback/src/data/exceptions/validation.exception.ts b/newback/src/data/exceptions/validation.exception.ts
index 0c64f774b..395315264 100644
--- a/newback/src/data/exceptions/validation.exception.ts
+++ b/newback/src/data/exceptions/validation.exception.ts
@@ -1,7 +1,6 @@
-import {HttpException} from '@nestjs/common';
+import {HttpException} from "@nestjs/common";
 
 export class ValidationException extends HttpException {
-
   constructor(error) {
     super(error, 4002);
   }
diff --git a/newback/src/data/model/channel.model.ts b/newback/src/data/model/channel.model.ts
index ab3a380ec..f81e0becc 100644
--- a/newback/src/data/model/channel.model.ts
+++ b/newback/src/data/model/channel.model.ts
@@ -5,13 +5,13 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
 
 
 @Injectable()
-@Table({tableName: 'channel'})
+@Table({tableName: "channel"})
 export class ChannelModel extends Model<ChannelModel> {
   @Column({
     type: DataType.INTEGER,
diff --git a/newback/src/data/model/image.model.ts b/newback/src/data/model/image.model.ts
index b58f1a85e..4e0ebb358 100644
--- a/newback/src/data/model/image.model.ts
+++ b/newback/src/data/model/image.model.ts
@@ -6,19 +6,17 @@ import {
   Model,
   Table,
   Unique,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {ImageType} from '@/data/types/frontend';
-import {MessageModel} from '@/data/model/message.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {ImageType} from "@/data/types/frontend";
+import {MessageModel} from "@/data/model/message.model";
 
-const uniqueUserIdSymbMess = 'unique_image_symbol_message';
+const uniqueUserIdSymbMess = "unique_image_symbol_message";
 
 
 @Injectable()
-@Table({tableName: 'image'})
+@Table({tableName: "image"})
 export class ImageModel extends Model<ImageModel> {
-
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
diff --git a/newback/src/data/model/ip.address.model.ts b/newback/src/data/model/ip.address.model.ts
index 608485d84..a69c32872 100644
--- a/newback/src/data/model/ip.address.model.ts
+++ b/newback/src/data/model/ip.address.model.ts
@@ -3,14 +3,13 @@ import {
   DataType,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {MysqlBool} from '@/data/types/internal';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {MysqlBool} from "@/data/types/internal";
 
 @Injectable()
-@Table({tableName: 'ip_address'})
+@Table({tableName: "ip_address"})
 export class IpAddressModel extends Model<IpAddressModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
@@ -67,6 +66,7 @@ export class IpAddressModel extends Model<IpAddressModel> {
     allowNull: true,
   })
   public lat: number;
+
   @Column({
     type: DataType.DOUBLE,
     allowNull: true,
@@ -84,6 +84,4 @@ export class IpAddressModel extends Model<IpAddressModel> {
     allowNull: true,
   })
   public timezone: string;
-
-
 }
diff --git a/newback/src/data/model/message.history.model.ts b/newback/src/data/model/message.history.model.ts
index 829cf0431..edb92d6f4 100644
--- a/newback/src/data/model/message.history.model.ts
+++ b/newback/src/data/model/message.history.model.ts
@@ -5,13 +5,13 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {MessageModel} from '@/data/model/message.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {MessageModel} from "@/data/model/message.model";
 
 
 @Injectable()
-@Table({tableName: 'message_history'})
+@Table({tableName: "message_history"})
 export class MessageHistoryModel extends Model<MessageHistoryModel> {
   @Column({
     type: DataType.INTEGER,
@@ -38,8 +38,8 @@ export class MessageHistoryModel extends Model<MessageHistoryModel> {
   public time: number;
 
   @Column({
-    type: DataType.TEXT('long'),
-    allowNull: true, // idk but it contains null
+    type: DataType.TEXT("long"),
+    allowNull: true, // Idk but it contains null
   })
   public content: string;
 }
diff --git a/newback/src/data/model/message.mention.model.ts b/newback/src/data/model/message.mention.model.ts
index 150fefc08..069f87870 100644
--- a/newback/src/data/model/message.mention.model.ts
+++ b/newback/src/data/model/message.mention.model.ts
@@ -6,19 +6,18 @@ import {
   Model,
   Table,
   Unique,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
-import {MessageModel} from '@/data/model/message.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+import {MessageModel} from "@/data/model/message.model";
 
-const uniqueUserIdSymbMess = 'unique_message_mention_user_id_symbol_message_id';
+const uniqueUserIdSymbMess = "unique_message_mention_user_id_symbol_message_id";
 
 @Injectable()
 @Table({
-  tableName: 'message_mention',
+  tableName: "message_mention",
 })
 export class MessageMentionModel extends Model<MessageMentionModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
@@ -30,7 +29,7 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
   @Unique(uniqueUserIdSymbMess)
   @Column({
     type: DataType.INTEGER,
-    allowNull: false
+    allowNull: false,
   })
   public userId: number;
 
@@ -41,7 +40,7 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
   @Unique(uniqueUserIdSymbMess)
   @Column({
     type: DataType.INTEGER,
-    allowNull: false
+    allowNull: false,
   })
   public messageId: number;
 
@@ -51,7 +50,7 @@ export class MessageMentionModel extends Model<MessageMentionModel> {
   @Unique(uniqueUserIdSymbMess)
   @Column({
     type: DataType.STRING(1),
-    allowNull: false
+    allowNull: false,
   })
   public symbol: string;
 }
diff --git a/newback/src/data/model/message.model.ts b/newback/src/data/model/message.model.ts
index cc2c5389f..f4ae55696 100644
--- a/newback/src/data/model/message.model.ts
+++ b/newback/src/data/model/message.model.ts
@@ -5,16 +5,15 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {MessageStatus,} from '@/data/types/frontend';
-import {UserModel} from '@/data/model/user.model';
-import {RoomModel} from '@/data/model/room.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {MessageStatus} from "@/data/types/frontend";
+import {UserModel} from "@/data/model/user.model";
+import {RoomModel} from "@/data/model/room.model";
 
 @Injectable()
-@Table({tableName: 'message'})
+@Table({tableName: "message"})
 export class MessageModel extends Model<MessageModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
@@ -50,7 +49,7 @@ export class MessageModel extends Model<MessageModel> {
   public time: number;
 
   @Column({
-    type: DataType.TEXT('long'),
+    type: DataType.TEXT("long"),
     allowNull: true,
   })
   public content: string;
@@ -70,7 +69,7 @@ export class MessageModel extends Model<MessageModel> {
   @Column({
     type: DataType.INTEGER,
     allowNull: false,
-    defaultValue: 0
+    defaultValue: 0,
   })
   public threadMessageCount: number;
 
diff --git a/newback/src/data/model/room.model.ts b/newback/src/data/model/room.model.ts
index fc3f10be6..a6ed96450 100644
--- a/newback/src/data/model/room.model.ts
+++ b/newback/src/data/model/room.model.ts
@@ -6,24 +6,25 @@ import {
   HasMany,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
-import {ChannelModel} from '@/data/model/channel.model';
-import {RoomUsersModel} from '@/data/model/room.users.model';
-import {MysqlBool} from '@/data/types/internal';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+import {ChannelModel} from "@/data/model/channel.model";
+import {RoomUsersModel} from "@/data/model/room.users.model";
+import {MysqlBool} from "@/data/types/internal";
 
 
-// 	constraint admin_should_not_be_define_for_private_rooms
-// 		check (`creator_id` is null or `name` is not null),
-// 	constraint channel_should_exist_for_public_room_and_not_exist_for_private
-// 		check (`channel_id` is null and `name` is null or `channel_id` is not n),
-// 	constraint p2p_only_if_private
-// 		check (`p2p` = 0x00 or `name` is null)
+/*
+ * 	Constraint admin_should_not_be_define_for_private_rooms
+ * 		check (`creator_id` is null or `name` is not null),
+ * 	constraint channel_should_exist_for_public_room_and_not_exist_for_private
+ * 		check (`channel_id` is null and `name` is null or `channel_id` is not n),
+ * 	constraint p2p_only_if_private
+ * 		check (`p2p` = 0x00 or `name` is null)
+ */
 @Injectable()
-@Table({tableName: 'room'})
+@Table({tableName: "room"})
 export class RoomModel extends Model<RoomModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
diff --git a/newback/src/data/model/room.users.model.ts b/newback/src/data/model/room.users.model.ts
index 210848a65..6ad430dbf 100644
--- a/newback/src/data/model/room.users.model.ts
+++ b/newback/src/data/model/room.users.model.ts
@@ -6,18 +6,17 @@ import {
   Model,
   Table,
   Unique,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
-import {RoomModel} from '@/data/model/room.model';
-import {MysqlBool} from '@/data/types/internal';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+import {RoomModel} from "@/data/model/room.model";
+import {MysqlBool} from "@/data/types/internal";
 
-const uniqueRoomUser = 'unique_room_user_room_id_user_id';
+const uniqueRoomUser = "unique_room_user_room_id_user_id";
 
 @Injectable()
-@Table({tableName: 'room_user'})
+@Table({tableName: "room_user"})
 export class RoomUsersModel extends Model<RoomUsersModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
@@ -61,5 +60,4 @@ export class RoomUsersModel extends Model<RoomUsersModel> {
     allowNull: false,
   })
   public notifications: MysqlBool;
-
 }
diff --git a/newback/src/data/model/subscription.message.model.ts b/newback/src/data/model/subscription.message.model.ts
index 5f5524362..be20955ab 100644
--- a/newback/src/data/model/subscription.message.model.ts
+++ b/newback/src/data/model/subscription.message.model.ts
@@ -6,18 +6,17 @@ import {
   Model,
   Table,
   Unique,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {MessageModel} from '@/data/model/message.model';
-import {SubscriptionModel} from '@/data/model/subscription.model';
-import {MysqlBool} from '@/data/types/internal';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {MessageModel} from "@/data/model/message.model";
+import {SubscriptionModel} from "@/data/model/subscription.model";
+import {MysqlBool} from "@/data/types/internal";
 
-const uniqueSubscriptionMessage = 'unique_subscription_message_subscription_id_message_id';
+const uniqueSubscriptionMessage = "unique_subscription_message_subscription_id_message_id";
 
 @Injectable()
-@Table({tableName: 'subscription_message'})
+@Table({tableName: "subscription_message"})
 export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
@@ -53,6 +52,4 @@ export class SubscriptionMessageModel extends Model<SubscriptionMessageModel> {
     allowNull: false,
   })
   public received: MysqlBool;
-
-
 }
diff --git a/newback/src/data/model/subscription.model.ts b/newback/src/data/model/subscription.model.ts
index 4d5ed2ef2..3221d16a1 100644
--- a/newback/src/data/model/subscription.model.ts
+++ b/newback/src/data/model/subscription.model.ts
@@ -5,17 +5,16 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
-import {UploadedFileChoices} from '@/data/types/frontend';
-import {IpAddressModel} from '@/data/model/ip.address.model';
-import {MysqlBool} from '@/data/types/internal';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+import {UploadedFileChoices} from "@/data/types/frontend";
+import {IpAddressModel} from "@/data/model/ip.address.model";
+import {MysqlBool} from "@/data/types/internal";
 
 @Injectable()
-@Table({tableName: 'subscription'})
+@Table({tableName: "subscription"})
 export class SubscriptionModel extends Model<SubscriptionModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
diff --git a/newback/src/data/model/uploaded.file.model.ts b/newback/src/data/model/uploaded.file.model.ts
index 11942e414..b10128061 100644
--- a/newback/src/data/model/uploaded.file.model.ts
+++ b/newback/src/data/model/uploaded.file.model.ts
@@ -5,15 +5,14 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UploadedFileChoices} from '@/data/types/frontend';
-import {UserModel} from '@/data/model/user.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UploadedFileChoices} from "@/data/types/frontend";
+import {UserModel} from "@/data/model/user.model";
 
 @Injectable()
-@Table({tableName: 'uploaded_file'})
+@Table({tableName: "uploaded_file"})
 export class UploadedFileModel extends Model<UploadedFileModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
diff --git a/newback/src/data/model/user.auth.model.ts b/newback/src/data/model/user.auth.model.ts
index cd6690988..958ddb2fd 100644
--- a/newback/src/data/model/user.auth.model.ts
+++ b/newback/src/data/model/user.auth.model.ts
@@ -5,15 +5,14 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
-import {VerificationModel} from '@/data/model/verification.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+import {VerificationModel} from "@/data/model/verification.model";
 
 @Injectable()
-@Table({tableName: 'user_auth'})
+@Table({tableName: "user_auth"})
 export class UserAuthModel extends Model<UserAuthModel> {
-
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
@@ -27,7 +26,7 @@ export class UserAuthModel extends Model<UserAuthModel> {
 
   @Column({
     type: DataType.STRING,
-    allowNull: false
+    allowNull: false,
   })
   public password: string;
 
diff --git a/newback/src/data/model/user.joined.info.model.ts b/newback/src/data/model/user.joined.info.model.ts
index 77f9a2cf4..392c1ebc8 100644
--- a/newback/src/data/model/user.joined.info.model.ts
+++ b/newback/src/data/model/user.joined.info.model.ts
@@ -6,17 +6,16 @@ import {
   Model,
   Table,
   Unique,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
-import {IpAddressModel} from '@/data/model/ip.address.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+import {IpAddressModel} from "@/data/model/ip.address.model";
 
-const uniqueUserJoinedInfoUserIdIpId = 'unique_user_joined_info_user_id_ip_id';
+const uniqueUserJoinedInfoUserIdIpId = "unique_user_joined_info_user_id_ip_id";
 
 @Injectable()
-@Table({tableName: 'user_joined_info'})
+@Table({tableName: "user_joined_info"})
 export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
@@ -45,5 +44,4 @@ export class UserJoinedInfoModel extends Model<UserJoinedInfoModel> {
 
   @BelongsTo(() => UserModel)
   public user: UserModel;
-
 }
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index 3c769c723..321761952 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -4,17 +4,17 @@ import {
   HasOne,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {Gender} from '@/data/types/frontend';
-import {UserAuthModel} from '@/data/model/user.auth.model';
-import {MAX_USERNAME_LENGTH} from '@/utils/consts';
-import {UserProfileModel} from '@/data/model/user.profile.model';
-import {UserSettingsModel} from '@/data/model/user.settings.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {Gender} from "@/data/types/frontend";
+import {UserAuthModel} from "@/data/model/user.auth.model";
+import {MAX_USERNAME_LENGTH} from "@/utils/consts";
+import {UserProfileModel} from "@/data/model/user.profile.model";
+import {UserSettingsModel} from "@/data/model/user.settings.model";
 
 
 @Injectable()
-@Table({tableName: 'user'})
+@Table({tableName: "user"})
 export class UserModel extends Model<UserModel> {
   @Column({
     type: DataType.INTEGER,
@@ -36,13 +36,13 @@ export class UserModel extends Model<UserModel> {
   })
   public username: string;
 
-  @HasOne(() => UserAuthModel, 'id')
+  @HasOne(() => UserAuthModel, "id")
   public userAuth: UserAuthModel;
 
-  @HasOne(() => UserProfileModel, 'id')
+  @HasOne(() => UserProfileModel, "id")
   public userProfile: UserProfileModel;
 
-  @HasOne(() => UserSettingsModel, 'id')
+  @HasOne(() => UserSettingsModel, "id")
   public userSettings: UserSettingsModel;
 
   @Column({
diff --git a/newback/src/data/model/user.profile.model.ts b/newback/src/data/model/user.profile.model.ts
index d61559513..dd9b73a35 100644
--- a/newback/src/data/model/user.profile.model.ts
+++ b/newback/src/data/model/user.profile.model.ts
@@ -5,14 +5,13 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
 
 @Injectable()
-@Table({tableName: 'user_profile'})
+@Table({tableName: "user_profile"})
 export class UserProfileModel extends Model<UserProfileModel> {
-
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
@@ -26,19 +25,19 @@ export class UserProfileModel extends Model<UserProfileModel> {
 
   @Column({
     type: DataType.STRING(30),
-    allowNull: true
+    allowNull: true,
   })
   public name: string;
 
   @Column({
     type: DataType.STRING(50),
-    allowNull: true
+    allowNull: true,
   })
   public city: string;
 
   @Column({
     type: DataType.STRING(30),
-    allowNull: true
+    allowNull: true,
   })
   public surname: string;
 
@@ -50,7 +49,7 @@ export class UserProfileModel extends Model<UserProfileModel> {
 
   @Column({
     type: DataType.STRING(100),
-    allowNull: true
+    allowNull: true,
   })
   public contacts: string;
 }
diff --git a/newback/src/data/model/user.settings.model.ts b/newback/src/data/model/user.settings.model.ts
index faa8876ac..58827c86b 100644
--- a/newback/src/data/model/user.settings.model.ts
+++ b/newback/src/data/model/user.settings.model.ts
@@ -5,20 +5,19 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {Theme,} from '@/data/types/frontend';
-import {UserModel} from '@/data/model/user.model';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {Theme} from "@/data/types/frontend";
+import {UserModel} from "@/data/model/user.model";
 import {
   LogLevel,
-  logLevels
-} from 'lines-logger'
-import {MysqlBool} from '@/data/types/internal';
+  logLevels,
+} from "lines-logger";
+import {MysqlBool} from "@/data/types/internal";
 
 @Injectable()
-@Table({tableName: 'user_settings'})
+@Table({tableName: "user_settings"})
 export class UserSettingsModel extends Model<UserSettingsModel> {
-
   @ForeignKey(() => UserModel)
   @Column({
     type: DataType.INTEGER,
@@ -81,7 +80,7 @@ export class UserSettingsModel extends Model<UserSettingsModel> {
   @Column({
     type: DataType.ENUM(...Object.keys(logLevels)),
     allowNull: false,
-    defaultValue: 'error',
+    defaultValue: "error",
   })
   public logs: LogLevel;
 
diff --git a/newback/src/data/model/verification.model.ts b/newback/src/data/model/verification.model.ts
index 7fe673895..2592587ed 100644
--- a/newback/src/data/model/verification.model.ts
+++ b/newback/src/data/model/verification.model.ts
@@ -5,16 +5,15 @@ import {
   ForeignKey,
   Model,
   Table,
-} from 'sequelize-typescript';
-import {Injectable} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
-import {VerificationType} from '@/data/types/frontend';
-import {MysqlBool} from '@/data/types/internal';
+} from "sequelize-typescript";
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+import {VerificationType} from "@/data/types/frontend";
+import {MysqlBool} from "@/data/types/internal";
 
 @Injectable()
-@Table({tableName: 'verification'})
+@Table({tableName: "verification"})
 export class VerificationModel extends Model<VerificationModel> {
-
   @Column({
     type: DataType.INTEGER,
     autoIncrement: true,
diff --git a/newback/src/data/types/api.ts b/newback/src/data/types/api.ts
index 0b27c9cdf..31ac9d185 100644
--- a/newback/src/data/types/api.ts
+++ b/newback/src/data/types/api.ts
@@ -6,11 +6,11 @@ export interface FacebookGetUserResponse {
 
 export interface IpFailedInfoResponse {
   message: string;
-  status: 'fail';
+  status: "fail";
 }
 
 export interface IpSuccessInfoResponse {
-  status: 'success';
+  status: "success";
   country: string;
   countryCode: string;
   region: string;
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index d4dd2f9a5..65271823d 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,11 +1,11 @@
-import {DefaultWsInMessage} from '@/data/types/frontend';
+import type {DefaultWsInMessage} from "@/data/types/frontend";
 
 export interface WebSocketContextData {
   userId: number;
   id: string;
   sendToClient(data: DefaultWsInMessage<any, any>);
 }
-export type UserOnlineData = Record<string, string[]>
+export type UserOnlineData = Record<string, string[]>;
 
 // https://stackoverflow.com/questions/48881009/convert-tinyint-field-as-boolean-in-result-using-sequelize-raw-query-node-js
-export type MysqlBool = 0 | 1 | true | false  ;
+export type MysqlBool = 0 | 1 | false | true;
diff --git a/newback/src/data/types/typend.spec.ts b/newback/src/data/types/typend.spec.ts
index 5970d6c44..abf3e7170 100644
--- a/newback/src/data/types/typend.spec.ts
+++ b/newback/src/data/types/typend.spec.ts
@@ -1,11 +1,10 @@
-import {check} from 'typend'
+import {check} from "typend";
 
 
-describe('typend', () => {
-
-  describe('simple', () => {
+describe("typend", () => {
+  describe("simple", () => {
     interface Message {
-      roomId: 3
+      roomId: 3;
     }
 
     interface Room {
@@ -13,30 +12,29 @@ describe('typend', () => {
       messages: Message[];
     }
 
-    it('should replace single param', () => {
-      expect(() => check<Message>({})).toThrow()
+    it("should replace single param", () => {
+      expect(() => check<Message>({})).toThrow();
     });
-    it('complex', () => {
-      let room: Room = {
-        name: 'asd',
+    it("complex", () => {
+      const room: Room = {
+        name: "asd",
         messages: [
           {
             roomId: 3,
-          }
-        ]
-      }
-      check<Room>(room)
+          },
+        ],
+      };
+      check<Room>(room);
     });
-    it('complex3', () => {
+    it("complex3", () => {
       interface A<T> {
         b: T;
         d: string;
       }
 
       check<A<number>>({
-        b4: 'sf'
-      })
-
+        b4: "sf",
+      });
     });
   });
 });
diff --git a/newback/src/jest.config.ts b/newback/src/jest.config.ts
index 66704c601..46ecc72a7 100644
--- a/newback/src/jest.config.ts
+++ b/newback/src/jest.config.ts
@@ -1,43 +1,37 @@
-import type {Config} from '@jest/types';
+import type {Config} from "@jest/types";
 
 // Sync object
 const config: Config.InitialOptions = {
   verbose: true,
 };
 
-export default async(): Promise<Config.InitialOptions> => {
-  return {
-    globals: {
-      'ts-jest': {
-        compiler: 'ttypescript'
-      },
+export default async(): Promise<Config.InitialOptions> => ({
+  globals: {
+    "ts-jest": {
+      compiler: "ttypescript",
     },
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "globalSetup": "./jest.setup.ts",
-    "modulePathIgnorePatterns": [
-      "e2e.spec.ts"
-    ],
-    "testRegex": ".*\\.spec\\.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "collectCoverageFrom": [
-      "**/*.(t|j)s"
-    ],
-    "coveragePathIgnorePatterns": [
-      "/node_modules/",
-      "/coverage/",
-      "/ormconfig.ts",
-      "/jest.config.ts",
-      "/dist/",
-      ".module.ts$",
-      ".dto.ts$"
-    ],
-    "coverageDirectory": "./coverage",
-    "testEnvironment": "node",
-  }
-};
+  },
+  moduleFileExtensions: [
+    "js",
+    "json",
+    "ts",
+  ],
+  globalSetup: "./jest.setup.ts",
+  modulePathIgnorePatterns: ["e2e.spec.ts"],
+  testRegex: ".*\\.spec\\.ts$",
+  transform: {
+    "^.+\\.(t|j)s$": "ts-jest",
+  },
+  collectCoverageFrom: ["**/*.(t|j)s"],
+  coveragePathIgnorePatterns: [
+    "/node_modules/",
+    "/coverage/",
+    "/ormconfig.ts",
+    "/jest.config.ts",
+    "/dist/",
+    ".module.ts$",
+    ".dto.ts$",
+  ],
+  coverageDirectory: "./coverage",
+  testEnvironment: "node",
+});
diff --git a/newback/src/jest.setup.ts b/newback/src/jest.setup.ts
index 3d1e8924f..d46ef7c15 100644
--- a/newback/src/jest.setup.ts
+++ b/newback/src/jest.setup.ts
@@ -1,3 +1,3 @@
-module.exports = async () => {
-    process.env.TZ = 'UTC';
+module.exports = async() => {
+  process.env.TZ = "UTC";
 };
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 486959000..42c7b020b 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -1,33 +1,33 @@
-import {NestFactory} from '@nestjs/core';
-import {AppModule} from '@/modules/app/app.module';
-import {config} from 'node-ts-config';
+import {NestFactory} from "@nestjs/core";
+import {AppModule} from "@/modules/app/app.module";
+import {config} from "node-ts-config";
 import {
   ConsoleLogger,
   Logger,
-  ValidationPipe
-} from '@nestjs/common';
-import {readFile} from 'fs';
-import {promisify} from 'util';
-import {WsAdapter} from '@/modules/rest/ws.adapter/ws.adapter';
+  ValidationPipe,
+} from "@nestjs/common";
+import {readFile} from "fs";
+import {promisify} from "util";
+import {WsAdapter} from "@/modules/rest/ws.adapter/ws.adapter";
 
 async function bootstrap() {
-  const key = await promisify(readFile)(config.application.keyPath, 'utf-8');
-  const cert = await promisify(readFile)(config.application.crtPath, 'utf-8');
+  const key = await promisify(readFile)(config.application.keyPath, "utf-8");
+  const cert = await promisify(readFile)(config.application.crtPath, "utf-8");
 
   const app = await NestFactory.create(AppModule, {
-    logger: [ 'log' , 'error' , 'warn' , 'debug'],
+    logger: ["log", "error", "warn", "debug"],
     cors: {
       allowedHeaders: ["x-requested-with", "session_id", "Content-Type"],
       methods: ["POST", "GET", "OPTIONS"],
-      origin: "*"
+      origin: "*",
     },
     httpsOptions: {
       key,
-      cert
-    }
+      cert,
+    },
   });
-  let logger = app.get(Logger);
-  app.useLogger(logger)
+  const logger = app.get(Logger);
+  app.useLogger(logger);
   app.useWebSocketAdapter(new WsAdapter((app as any).getUnderlyingHttpServer(), logger));
   app.useGlobalPipes(new ValidationPipe());
   await app.listen(config.application.port);
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index bcd996d25..d4da1b823 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -3,28 +3,28 @@ import {
   Controller,
   Ip,
   Post,
-  UseGuards
-} from '@nestjs/common';
-import {AuthService} from '@/modules/api/auth/auth.service';
-import {LoginRequestValidator} from '@/modules/api/auth/validators/login.request.validator';
-import {SignUpRequestValidator} from '@/modules/api/auth/validators/sign.up.request.validator';
-import {ValidateUserRequestValidator} from '@/modules/api/auth/validators/validate.user.request.validator';
-import {
+  UseGuards,
+} from "@nestjs/common";
+import {AuthService} from "@/modules/api/auth/auth.service";
+import {LoginRequestValidator} from "@/modules/api/auth/validators/login.request.validator";
+import {SignUpRequestValidator} from "@/modules/api/auth/validators/sign.up.request.validator";
+import {ValidateUserRequestValidator} from "@/modules/api/auth/validators/validate.user.request.validator";
+import type {
   FacebookSignInResponse,
   GoogleSignInResponse,
   SignInResponse,
   SignUpResponse,
   ValidateEmailResponse,
-  ValidateUserResponse
-} from '@/data/types/frontend';
-import {GoogleAuthRequestValidator} from '@/modules/api/auth/validators/google.auth.reques.validator';
-import {CaptchaGuard} from '@/modules/app/guards/captcha.guard';
-import {ValidateEmailRequestValidator} from '@/modules/api/auth/validators/validate.email.request.validator';
-import {FacebookAuthRequestValidator} from '@/modules/api/auth/validators/facebook.auth.request.validator';
+  ValidateUserResponse,
+} from "@/data/types/frontend";
+import {GoogleAuthRequestValidator} from "@/modules/api/auth/validators/google.auth.reques.validator";
+import {CaptchaGuard} from "@/modules/app/guards/captcha.guard";
+import {ValidateEmailRequestValidator} from "@/modules/api/auth/validators/validate.email.request.validator";
+import {FacebookAuthRequestValidator} from "@/modules/api/auth/validators/facebook.auth.request.validator";
 
 
 @Controller({
-  path: '/api/auth'
+  path: "/api/auth",
 })
 export class AuthController {
   constructor(
@@ -33,40 +33,39 @@ export class AuthController {
   }
 
   @UseGuards(CaptchaGuard)
-  @Post('/sign-in')
+  @Post("/sign-in")
   public async auth(@Body() body: LoginRequestValidator): Promise<SignInResponse> {
     return this.authservice.authorize(body);
   }
 
-  @Post('/google-sign-in')
+  @Post("/google-sign-in")
   public async googleAuth(@Body() body: GoogleAuthRequestValidator): Promise<GoogleSignInResponse> {
     return this.authservice.authorizeGoogle(body);
   }
 
-  @Post('/facebook-sign-in')
+  @Post("/facebook-sign-in")
   public async facebookAuh(@Body() body: FacebookAuthRequestValidator): Promise<FacebookSignInResponse> {
     return this.authservice.authorizeFacebook(body);
   }
 
-  @Post('/sign-up')
+  @Post("/sign-up")
   public async register(@Body() body: SignUpRequestValidator, @Ip() ip): Promise<SignUpResponse> {
     return this.authservice.registerUser(body, ip);
   }
 
-  @Post('/validate-email')
+  @Post("/validate-email")
   public async validateEmail(@Body() body: ValidateEmailRequestValidator): Promise<ValidateEmailResponse> {
     await this.authservice.validateEmail(body.email);
     return {
-      ok: true
-    }
+      ok: true,
+    };
   }
 
-  @Post('/validate-user')
+  @Post("/validate-user")
   public async validateUser(@Body() body: ValidateUserRequestValidator): Promise<ValidateUserResponse> {
     await this.authservice.validateUser(body.username);
     return {
-      ok: true
-    }
+      ok: true,
+    };
   }
-
 }
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 7deda4e95..670722249 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -1,64 +1,64 @@
+import type {INestApplication} from "@nestjs/common";
 import {
   ConsoleLogger,
-  INestApplication,
   Logger,
-  ValidationPipe
-} from '@nestjs/common';
-import * as supertest from 'supertest';
-import {Test} from '@nestjs/testing';
-import {AuthService} from '@/modules/api/auth/auth.service';
-import {AuthController} from '@/modules/api/auth/auth.controller';
-import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {EmailService} from '@/modules/rest/email/email.service';
-import {MailerService} from '@nestjs-modules/mailer';
-import {Sequelize} from 'sequelize-typescript';
-import {HtmlService} from '@/modules/rest/html/html.service';
+  ValidationPipe,
+} from "@nestjs/common";
+import * as supertest from "supertest";
+import {Test} from "@nestjs/testing";
+import {AuthService} from "@/modules/api/auth/auth.service";
+import {AuthController} from "@/modules/api/auth/auth.controller";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {EmailService} from "@/modules/rest/email/email.service";
+import {MailerService} from "@nestjs-modules/mailer";
+import {Sequelize} from "sequelize-typescript";
+import {HtmlService} from "@/modules/rest/html/html.service";
 import waitForExpect from "wait-for-expect";
-import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
-import {OAuth2Client} from 'google-auth-library';
-import {HttpService} from '@/modules/rest/http/http.service';
-import fetch from 'node-fetch';
-import * as googleResponseFixture from '@/fixtures/google.response.fixture.json';
-import * as facebookGetTokenResponseFixture from '@/fixtures/facebook.get.token.response.json';
-import * as facebookGetUserResponseFixture from '@/fixtures/facebook.get.user.response.json';
-import {ConfigService} from '@/modules/rest/config/config.service';
+import {GoogleAuthService} from "@/modules/api/auth/google.auth.service";
+import type {OAuth2Client} from "google-auth-library";
+import {HttpService} from "@/modules/rest/http/http.service";
+import type fetch from "node-fetch";
+import * as googleResponseFixture from "@/fixtures/google.response.fixture.json";
+import * as facebookGetTokenResponseFixture from "@/fixtures/facebook.get.token.response.json";
+import * as facebookGetUserResponseFixture from "@/fixtures/facebook.get.user.response.json";
+import {ConfigService} from "@/modules/rest/config/config.service";
+import type {
+  IConfig,
+} from "node-ts-config";
 import {
   config,
-  IConfig
-} from 'node-ts-config';
-import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {IpService} from '@/modules/rest/ip/ip.service';
-import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
-import {IpAddressModel} from '@/data/model/ip.address.model';
-import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
-import {SessionService} from '@/modules/rest/session/session.service';
+} from "node-ts-config";
+import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {IpService} from "@/modules/rest/ip/ip.service";
+import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
+import type {IpAddressModel} from "@/data/model/ip.address.model";
+import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
+import {SessionService} from "@/modules/rest/session/session.service";
 
-describe('AuthModule', () => {
+describe("AuthModule", () => {
   let app: INestApplication;
   let request: supertest.SuperTest<supertest.Test>;
-  let userRepository: UserRepository = {} as UserRepository;
-  let verificationRepository: VerificationRepository = {} as VerificationRepository;
-  let ipRepository: IpRepository = {} as IpRepository;
-  let roomRepository: RoomRepository = {} as RoomRepository;
-  let redisService: RedisService = {} as RedisService;
-  let sequelize: Sequelize = {} as Sequelize;
-  let mailerService: MailerService = {} as MailerService;
-  let oauth2Client: OAuth2Client = {} as OAuth2Client;
+  const userRepository: UserRepository = {} as UserRepository;
+  const verificationRepository: VerificationRepository = {} as VerificationRepository;
+  const ipRepository: IpRepository = {} as IpRepository;
+  const roomRepository: RoomRepository = {} as RoomRepository;
+  const redisService: RedisService = {} as RedisService;
+  const sequelize: Sequelize = {} as Sequelize;
+  const mailerService: MailerService = {} as MailerService;
+  const oauth2Client: OAuth2Client = {} as OAuth2Client;
   let nodeApply: (...args) => void = () => {
   };
-  let configService: ConfigService = {} as ConfigService;
+  const configService: ConfigService = {} as ConfigService;
   beforeAll(async() => {
-    //required to compile Guards like CaptchaGuard
-    configService.getConfig = jest.fn().mockReturnValue(config)
+    // Required to compile Guards like CaptchaGuard
+    configService.getConfig = jest.fn().mockReturnValue(config);
     const moduleFixture = await Test.createTestingModule({
-      imports: [
-        LoggerModule,
-      ],
+      imports: [LoggerModule],
       providers: [
         PasswordService,
         AuthService,
@@ -74,11 +74,11 @@ describe('AuthModule', () => {
         },
         {
           provide: MailerService,
-          useValue: mailerService
+          useValue: mailerService,
         },
         {
           provide: Sequelize,
-          useValue: sequelize
+          useValue: sequelize,
         },
         {
           provide: MailerService,
@@ -94,7 +94,7 @@ describe('AuthModule', () => {
         },
         {
           provide: VerificationRepository,
-          useValue: verificationRepository
+          useValue: verificationRepository,
         },
         {
           provide: IpRepository,
@@ -107,22 +107,22 @@ describe('AuthModule', () => {
         {
           provide: GoogleAuthService,
           inject: [Logger],
-          useFactory: (logger) => new GoogleAuthService(logger, oauth2Client)
+          useFactory: (logger) => new GoogleAuthService(logger, oauth2Client),
         },
         {
           provide: HttpService,
           inject: [Logger],
           useFactory: (logger) => new HttpService(logger, new Proxy(() => {
           }, {
-            apply: function (target: {}, thisArg: any, argArray: any[]): any {
-              return nodeApply(...argArray)
-            }
-          }) as typeof fetch)
+            apply(target: {}, thisArg: any, argArray: any[]): any {
+              return nodeApply.apply(this, argArray);
+            },
+          }) as typeof fetch),
         },
       ],
-      controllers: [AuthController]
-    }).setLogger(new ConsoleLogger())
-      .compile();
+      controllers: [AuthController],
+    }).setLogger(new ConsoleLogger()).
+      compile();
     app = moduleFixture.createNestApplication();
     app.useGlobalPipes(new ValidationPipe());
     await app.init();
@@ -130,288 +130,300 @@ describe('AuthModule', () => {
   });
 
   beforeEach(() => {
-    configService.getConfig = jest.fn().mockReturnValue(config)
-  })
+    configService.getConfig = jest.fn().mockReturnValue(config);
+  });
 
   afterEach(() => {
     jest.clearAllMocks();
-    Object.keys(userRepository).forEach(key => delete userRepository[key]);
-    Object.keys(roomRepository).forEach(key => delete roomRepository[key]);
-    Object.keys(redisService).forEach(key => delete redisService[key]);
-    Object.keys(sequelize).forEach(key => delete sequelize[key]);
-    Object.keys(mailerService).forEach(key => delete mailerService[key]);
-    Object.keys(oauth2Client).forEach(key => delete oauth2Client[key]);
-    Object.keys(ipRepository).forEach(key => delete ipRepository[key]);
+    Object.keys(userRepository).forEach((key) => delete userRepository[key]);
+    Object.keys(roomRepository).forEach((key) => delete roomRepository[key]);
+    Object.keys(redisService).forEach((key) => delete redisService[key]);
+    Object.keys(sequelize).forEach((key) => delete sequelize[key]);
+    Object.keys(mailerService).forEach((key) => delete mailerService[key]);
+    Object.keys(oauth2Client).forEach((key) => delete oauth2Client[key]);
+    Object.keys(ipRepository).forEach((key) => delete ipRepository[key]);
     nodeApply = () => {
     };
-    Object.keys(configService).forEach(key => delete configService[key]);
-    Object.keys(verificationRepository).forEach(key => delete configService[key]);
-
+    Object.keys(configService).forEach((key) => delete configService[key]);
+    Object.keys(verificationRepository).forEach((key) => delete configService[key]);
   });
 
   afterAll(async() => {
-    await app.close()
+    await app.close();
   });
 
-  describe('sign-in', () => {
-    it('should throw if user not exists', async() => {
+  describe("sign-in", () => {
+    it("should throw if user not exists", async() => {
       userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request
-        .post('/api/auth/sign-in').send({
-          username: 'a',
-          password: 'as$'
-        }).expect(409, {
+      await request.
+        post("/api/auth/sign-in").send({
+          username: "a",
+          password: "as$",
+        }).
+        expect(409, {
           error: "Conflict",
           message: "User with login doesn't exists",
-          statusCode: 409
+          statusCode: 409,
         });
     });
-    it('should throw exception that captcha missing', async() => {
+    it("should throw exception that captcha missing", async() => {
       configService.getConfig = jest.fn().mockReturnValue({
         recaptcha: {
           publicKey: "a",
           privateKey: "a",
-        }
-      } as IConfig)
-      const {body} = await request
-        .post('/api/auth/sign-in').send({
-          username: 'a',
-          password: 'as$'
-        }).expect(400, {
+        },
+      } as IConfig);
+      const {body} = await request.
+        post("/api/auth/sign-in").send({
+          username: "a",
+          password: "as$",
+        }).
+        expect(400, {
           statusCode: 400,
-          message: 'Captcha is missing',
-          error: 'Bad Request'
+          message: "Captcha is missing",
+          error: "Bad Request",
         });
-    })
-    it('should go throw captcha when its presnt', async() => {
-      let passwordService = app.get(PasswordService);
+    });
+    it("should go throw captcha when its presnt", async() => {
+      const passwordService = app.get(PasswordService);
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      let password = await passwordService.createPassword("koko");
+      const password = await passwordService.createPassword("koko");
       userRepository.getUserByUserName = jest.fn().mockResolvedValue({
         userAuth: {
-          password: password
+          password,
         },
-        id: 3
-      })
+        id: 3,
+      });
       configService.getConfig = jest.fn().mockReturnValue({
         recaptcha: {
           publicKey: "a",
           privateKey: "a",
-        }
+        },
       } as IConfig);
       nodeApply = jest.fn().mockReturnValue({json: jest.fn().mockResolvedValue({success: true})});
-      const {body} = await request
-        .post('/api/auth/sign-in').send({
-          username: 'a',
-          password: 'koko',
-          captcha: 'asd'
+      const {body} = await request.
+        post("/api/auth/sign-in").send({
+          username: "a",
+          password: "koko",
+          captcha: "asd",
         });
       expect(body).toMatchObject({session: expect.any(String)});
-    })
+    });
 
-    it('should throw if password invalid', async() => {
+    it("should throw if password invalid", async() => {
       userRepository.getUserByUserName = jest.fn().mockResolvedValue({
         userAuth: {
-          password: 's'
+          password: "s",
         },
-        id: 3
-      })
-      const {body} = await request
-        .post('/api/auth/sign-in').send({
-          username: 'a',
-          password: 'as$'
-        }).expect(401, {
+        id: 3,
+      });
+      const {body} = await request.
+        post("/api/auth/sign-in").send({
+          username: "a",
+          password: "as$",
+        }).
+        expect(401, {
           error: "Unauthorized",
           message: "Invalid password",
-          statusCode: 401
+          statusCode: 401,
         });
-    })
-    it('should return session', async() => {
-      let passwordService = app.get(PasswordService);
+    });
+    it("should return session", async() => {
+      const passwordService = app.get(PasswordService);
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      let password = await passwordService.createPassword("koko");
+      const password = await passwordService.createPassword("koko");
       userRepository.getUserByUserName = jest.fn().mockResolvedValue({
         userAuth: {
-          password: password
+          password,
         },
-        id: 3
-      })
-      const {body} = await request
-        .post('/api/auth/sign-in').send({
-          username: 'a',
-          password: 'koko'
+        id: 3,
+      });
+      const {body} = await request.
+        post("/api/auth/sign-in").send({
+          username: "a",
+          password: "koko",
         });
       expect(body).toMatchObject({session: expect.any(String)});
-    })
+    });
   });
 
-  describe('google-sign-in', () => {
-    it('should login if user exists', async() => {
+  describe("google-sign-in", () => {
+    it("should login if user exists", async() => {
       sequelize.transaction = (resolve) => resolve();
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
       userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue({
         id: 1,
         user: {
-          username: 'as'
-        }
+          username: "as",
+        },
       });
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
-        getPayload: jest.fn().mockReturnValue(googleResponseFixture)
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
       });
-      const {body} = await request
-        .post('/api/auth/google-sign-in').send({
-          token: 'aasdasd',
-        }).expect(201);
+      const {body} = await request.
+        post("/api/auth/google-sign-in").send({
+          token: "aasdasd",
+        }).
+        expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
         isNewAccount: false,
-      })
+      });
     });
-    it('should create a new user when email is new and user with email not exist', async() => {
-      sequelize.transaction = (resolve) => resolve('transaction');
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+    it("should create a new user when email is new and user with email not exist", async() => {
+      sequelize.transaction = (resolve) => resolve("transaction");
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
       userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       userRepository.createUser = jest.fn().mockResolvedValue(3);
       roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-      let createUserSpy = jest.spyOn(userRepository, 'createUser');
+      const createUserSpy = jest.spyOn(userRepository, "createUser");
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
-        getPayload: jest.fn().mockReturnValue(googleResponseFixture)
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
       });
-      const {body} = await request
-        .post('/api/auth/google-sign-in').send({
-          token: 'aasdasd',
-        }).expect(201);
+      const {body} = await request.
+        post("/api/auth/google-sign-in").send({
+          token: "aasdasd",
+        }).
+        expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
         isNewAccount: true,
-        username: 'death' // from fixture
-      })
+        username: "death", // From fixture
+      });
       expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
-        "email": "death@gmail.com",
-        "googleId": "death@gmail.com",
-        "name": "Andrew",
-        "password": expect.any(String),
-        "sex": "OTHER",
-        "surname": "Superman",
-        "thumbnail": "https://lh3.googleusercontent.com/a-/xxxxxxxxxxxx-xxxxxxxxxxxx",
-        "username": "death",
-      }), 'transaction')
+        email: "death@gmail.com",
+        googleId: "death@gmail.com",
+        name: "Andrew",
+        password: expect.any(String),
+        sex: "OTHER",
+        surname: "Superman",
+        thumbnail: "https://lh3.googleusercontent.com/a-/xxxxxxxxxxxx-xxxxxxxxxxxx",
+        username: "death",
+      }), "transaction");
     });
-    it('should throw an error if email exists', async() => {
+    it("should throw an error if email exists", async() => {
       sequelize.transaction = (resolve) => resolve();
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
       userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
-      // userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      // userRepository.createUser = jest.fn().mockResolvedValue(3);
-      // roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+
+      /*
+       * UserRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+       * userRepository.createUser = jest.fn().mockResolvedValue(3);
+       * roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+       */
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
-        getPayload: jest.fn().mockReturnValue(googleResponseFixture)
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
       });
-      const {body} = await request
-        .post('/api/auth/google-sign-in').send({
-          token: 'aasdasd',
-        }).expect(409);
+      const {body} = await request.
+        post("/api/auth/google-sign-in").send({
+          token: "aasdasd",
+        }).
+        expect(409);
       expect(body).toMatchObject({
         error: "Conflict",
         statusCode: 409,
         message: "User with this email already exist, but has no connected google account." +
           " If this is you, please login as this user and connect this google profile in profile settings",
-      })
+      });
     });
   });
 
-  describe('facebook-sign-in', () => {
-    it('should login if user exists', async() => {
+  describe("facebook-sign-in", () => {
+    it("should login if user exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      nodeApply = jest.fn()
-        .mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)})
-        .mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
+      nodeApply = jest.fn().
+        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
+        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
       configService.getConfig = jest.fn().mockReturnValue({
         auth: {
           facebook: {
-            accessToken: "test"
-          }
-        }
-      } as IConfig)
+            accessToken: "test",
+          },
+        },
+      } as IConfig);
       userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue({
         id: 1,
         user: {
-          username: 'as'
-        }
+          username: "as",
+        },
       });
-      const {body} = await request
-        .post('/api/auth/facebook-sign-in').send({
-          token: 'aasdasd',
-        }).expect(201);
+      const {body} = await request.
+        post("/api/auth/facebook-sign-in").send({
+          token: "aasdasd",
+        }).
+        expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
         isNewAccount: false,
-      })
+      });
     });
-    it('should create a new user when email is new and user with email not exist', async() => {
-      sequelize.transaction = (resolve) => resolve('transaction');
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
+    it("should create a new user when email is new and user with email not exist", async() => {
+      sequelize.transaction = (resolve) => resolve("transaction");
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
 
-      nodeApply = jest.fn()
-        .mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)})
-        .mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
+      nodeApply = jest.fn().
+        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
+        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
       configService.getConfig = jest.fn().mockReturnValue({
         auth: {
           facebook: {
-            accessToken: "test"
-          }
-        }
-      } as IConfig)
+            accessToken: "test",
+          },
+        },
+      } as IConfig);
       userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue(null);
 
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       userRepository.createUser = jest.fn().mockResolvedValue(3);
       roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-      let createUserSpy = jest.spyOn(userRepository, 'createUser');
+      const createUserSpy = jest.spyOn(userRepository, "createUser");
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
-        getPayload: jest.fn().mockReturnValue(googleResponseFixture)
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
       });
-      const {body} = await request
-        .post('/api/auth/facebook-sign-in').send({
-          token: 'aasdasd',
-        }).expect(201);
+      const {body} = await request.
+        post("/api/auth/facebook-sign-in").send({
+          token: "aasdasd",
+        }).
+        expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
         isNewAccount: true,
-        username: 'Andrew_Koidan' // from fixture
-      })
+        username: "Andrew_Koidan", // From fixture
+      });
       expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
-        "facebookId": "1096917160382471",
-        "name": "Andrew",
-        "password": expect.any(String),
-        "sex": "OTHER",
-        "surname": "Koidan",
-        "username": "Andrew_Koidan"
-      }), 'transaction')
+        facebookId: "1096917160382471",
+        name: "Andrew",
+        password: expect.any(String),
+        sex: "OTHER",
+        surname: "Koidan",
+        username: "Andrew_Koidan",
+      }), "transaction");
     });
   });
 
-  describe('sign-up', () => {
-    it('returns session', async() => {
+  describe("sign-up", () => {
+    it("returns session", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       userRepository.createUser = jest.fn().mockResolvedValue(3);
       roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
-      const {body} = await request
-        .post('/api/auth/sign-up').send({
-          username: 'a',
-          password: 'as$'
-        }).expect(201);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      const {body} = await request.
+        post("/api/auth/sign-up").send({
+          username: "a",
+          password: "as$",
+        }).
+        expect(201);
 
       expect(body).toMatchObject({session: expect.any(String)});
     });
-    it('sends an email', async() => {
-      configService.getConfig = jest.fn().mockReturnValue({...config, email: {}})
+    it("sends an email", async() => {
+      configService.getConfig = jest.fn().mockReturnValue({...config,
+        email: {}});
       sequelize.transaction = (resolve) => resolve();
       verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
@@ -420,143 +432,143 @@ describe('AuthModule', () => {
       roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
       mailerService.sendMail = jest.fn();
       ipRepository.getIp = jest.fn().mockResolvedValue({
-        country: 'Ukraine',
-        city: 'Mariupol',
-        isp: 'AZOV',
-      } as IpAddressModel)
-      let spy = jest.spyOn(mailerService, 'sendMail').mockResolvedValue(true);
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined)
-      const {body} = await request
-        .post('/api/auth/sign-up').send({
-          username: 'a',
-          password: 'as$',
-          email: 'death@gmail.com'
-        }).expect(201);
+        country: "Ukraine",
+        city: "Mariupol",
+        isp: "AZOV",
+      } as IpAddressModel);
+      const spy = jest.spyOn(mailerService, "sendMail").mockResolvedValue(true);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      const {body} = await request.
+        post("/api/auth/sign-up").send({
+          username: "a",
+          password: "as$",
+          email: "death@gmail.com",
+        }).
+        expect(201);
 
       expect(body).toMatchObject({session: expect.any(String)});
       await waitForExpect(() => {
         expect(spy).toHaveBeenCalledTimes(1);
       }, 30); // 30ms is more than enough
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.any(String)}))
-
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.any(String)}));
     });
-    it('throws an error if user exists', async() => {
+    it("throws an error if user exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
-      const {body} = await request
-        .post('/api/auth/sign-up').send({
-          username: 'a',
-          password: 'as$'
-        }).expect(409, {
+      const {body} = await request.
+        post("/api/auth/sign-up").send({
+          username: "a",
+          password: "as$",
+        }).
+        expect(409, {
           error: "Conflict",
           message: "User with this username already exist",
-          statusCode: 409
+          statusCode: 409,
         });
     });
-    it('throws an error if email exists', async() => {
+    it("throws an error if email exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
-      const {body} = await request
-        .post('/api/auth/sign-up').send({
-          username: 'a',
-          password: 'as$',
-          email: 'death@gmail.com'
-        }).expect(409, {
+      const {body} = await request.
+        post("/api/auth/sign-up").send({
+          username: "a",
+          password: "as$",
+          email: "death@gmail.com",
+        }).
+        expect(409, {
           error: "Conflict",
           message: "User with this email already exist",
-          statusCode: 409
+          statusCode: 409,
         });
     });
   });
 
-  describe('validate-email', () => {
-
-    it('should return ok', async() => {
+  describe("validate-email", () => {
+    it("should return ok", async() => {
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
-      await request
-        .post('/api/auth/validate-email').send({
-          email: 'blah@gmail.com',
-        }).expect(201, {ok: true});
+      await request.
+        post("/api/auth/validate-email").send({
+          email: "blah@gmail.com",
+        }).
+        expect(201, {ok: true});
     });
-    it('should error if email exists', async() => {
+    it("should error if email exists", async() => {
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
-      await request
-        .post('/api/auth/validate-email').send({
-          email: 'exist@gmail.com',
-        }).expect(409, {
-          "error": "Conflict",
-          "message": "User with this email already exist",
-          "statusCode": 409,
+      await request.
+        post("/api/auth/validate-email").send({
+          email: "exist@gmail.com",
+        }).
+        expect(409, {
+          error: "Conflict",
+          message: "User with this email already exist",
+          statusCode: 409,
         });
     });
-    it('should give error on invalid email', async() => {
-      await request
-        .post('/api/auth/validate-email').send({
-          email: 'invalidemail',
-        }).expect(400, {
-          "error": "Bad Request",
-          "message": [
-            'email must be an email',
-          ],
-          "statusCode": 400,
+    it("should give error on invalid email", async() => {
+      await request.
+        post("/api/auth/validate-email").send({
+          email: "invalidemail",
+        }).
+        expect(400, {
+          error: "Bad Request",
+          message: ["email must be an email"],
+          statusCode: 400,
         });
     });
   });
-  describe('validate-user', () => {
-
-    it('should return ok', async() => {
+  describe("validate-user", () => {
+    it("should return ok", async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      await request
-        .post('/api/auth/validate-user').send({
-          username: 'a',
-        }).expect(201, {ok: true});
+      await request.
+        post("/api/auth/validate-user").send({
+          username: "a",
+        }).
+        expect(201, {ok: true});
     });
-    it('should error if user exists', async() => {
+    it("should error if user exists", async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
-      await request
-        .post('/api/auth/validate-user').send({
-          username: 'a',
-        }).expect(409, {
-          "error": "Conflict",
-          "message": "User with this username already exist",
-          "statusCode": 409,
+      await request.
+        post("/api/auth/validate-user").send({
+          username: "a",
+        }).
+        expect(409, {
+          error: "Conflict",
+          message: "User with this username already exist",
+          statusCode: 409,
         });
     });
-    it('should give error on invalid character for username', async() => {
-      await request
-        .post('/api/auth/validate-user').send({
-          username: '%',
-        }).expect(400, {
-          "error": "Bad Request",
-          "message": [
-            "Username can only contain latin characters, numbers and symbols '-' '_'",
-          ],
-          "statusCode": 400,
+    it("should give error on invalid character for username", async() => {
+      await request.
+        post("/api/auth/validate-user").send({
+          username: "%",
+        }).
+        expect(400, {
+          error: "Bad Request",
+          message: ["Username can only contain latin characters, numbers and symbols '-' '_'"],
+          statusCode: 400,
         });
     });
-    it('should give error on invalid and also correct ones', async() => {
-      await request
-        .post('/api/auth/validate-user').send({
-          username: '%asfasdf',
-        }).expect(400, {
-          "error": "Bad Request",
-          "message": [
-            "Username can only contain latin characters, numbers and symbols '-' '_'",
-          ],
-          "statusCode": 400,
+    it("should give error on invalid and also correct ones", async() => {
+      await request.
+        post("/api/auth/validate-user").send({
+          username: "%asfasdf",
+        }).
+        expect(400, {
+          error: "Bad Request",
+          message: ["Username can only contain latin characters, numbers and symbols '-' '_'"],
+          statusCode: 400,
         });
     });
-    it('should give error if username has great length', async() => {
-      await request
-        .post('/api/auth/validate-user').send({
-          username: '1234567890123456789',
-        }).expect(400, {
-          "error": "Bad Request",
-          "message": [
-            "Username should be 1-16 characters",
-          ],
-          "statusCode": 400,
+    it("should give error if username has great length", async() => {
+      await request.
+        post("/api/auth/validate-user").send({
+          username: "1234567890123456789",
+        }).
+        expect(400, {
+          error: "Bad Request",
+          message: ["Username should be 1-16 characters"],
+          statusCode: 400,
         });
     });
   });
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index b26d4967c..a4e4d88fe 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -1,21 +1,21 @@
 import {
   Logger,
-  Module
-} from '@nestjs/common';
-import {AuthController} from '@/modules/api/auth/auth.controller';
-import {AuthService} from '@/modules/api/auth/auth.service';
-import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {EmailModule} from '@/modules/rest/email/email.module';
-import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {OAuth2Client} from 'google-auth-library';
-import {config} from 'node-ts-config';
-import {HttpModule} from '@/modules/rest/http/http.module';
-import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
-import {ConfigService} from '@/modules/rest/config/config.service';
-import {IpModule} from '@/modules/rest/ip/ip.module';
-import {SessionService} from '@/modules/rest/session/session.service';
+  Module,
+} from "@nestjs/common";
+import {AuthController} from "@/modules/api/auth/auth.controller";
+import {AuthService} from "@/modules/api/auth/auth.service";
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {EmailModule} from "@/modules/rest/email/email.module";
+import {GoogleAuthService} from "@/modules/api/auth/google.auth.service";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {OAuth2Client} from "google-auth-library";
+import {config} from "node-ts-config";
+import {HttpModule} from "@/modules/rest/http/http.module";
+import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
+import {ConfigService} from "@/modules/rest/config/config.service";
+import {IpModule} from "@/modules/rest/ip/ip.module";
+import {SessionService} from "@/modules/rest/session/session.service";
 
 @Module({
   imports: [DatabaseModule, EmailModule, HttpModule, IpModule],
@@ -28,12 +28,10 @@ import {SessionService} from '@/modules/rest/session/session.service';
     SessionService,
     {
       provide: GoogleAuthService,
-      useFactory: (logger) => {
-        return new GoogleAuthService(logger, config.auth?.google?.clientId ? new OAuth2Client(
-          config.auth.google.clientId,
-        ) : null)
-      },
-      inject: [Logger, ConfigService]
+      useFactory: (logger) => new GoogleAuthService(logger, config.auth?.google?.clientId ? new OAuth2Client(
+        config.auth.google.clientId,
+      ) : null),
+      inject: [Logger, ConfigService],
     },
   ],
 })
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 5e5052e84..6c851195a 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -2,42 +2,41 @@ import {
   ConflictException,
   Injectable,
   Logger,
-  UnauthorizedException
-} from '@nestjs/common';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {
-  FaceBookAuthRequest,
+  UnauthorizedException,
+} from "@nestjs/common";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import type {FaceBookAuthRequest,
   FacebookSignInResponse,
-  Gender,
   GoogleAuthRequest,
   GoogleSignInResponse,
   SignInRequest,
   SignInResponse,
   SignUpRequest,
-  SignUpResponse,
-  VerificationType
-} from '@/data/types/frontend';
-import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
+  SignUpResponse} from "@/data/types/frontend";
+import {
+  Gender,
+  VerificationType,
+} from "@/data/types/frontend";
+import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
 import {
   ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH
-} from '@/utils/consts';
-import {EmailService} from '@/modules/rest/email/email.service';
-import {Transaction} from 'sequelize';
-import {Sequelize} from 'sequelize-typescript';
-import {GoogleAuthService} from '@/modules/api/auth/google.auth.service';
-import {TokenPayload} from 'google-auth-library';
-import {generateUserName} from '@/utils/helpers';
-import {FacebookAuthService} from '@/modules/api/auth/facebook.auth.service';
-import {FacebookGetUserResponse} from '@/data/types/api';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
-import {SessionService} from '@/modules/rest/session/session.service';
+  MAX_USERNAME_LENGTH,
+} from "@/utils/consts";
+import {EmailService} from "@/modules/rest/email/email.service";
+import type {Transaction} from "sequelize";
+import {Sequelize} from "sequelize-typescript";
+import {GoogleAuthService} from "@/modules/api/auth/google.auth.service";
+import type {TokenPayload} from "google-auth-library";
+import {generateUserName} from "@/utils/helpers";
+import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
+import type {FacebookGetUserResponse} from "@/data/types/api";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
+import {SessionService} from "@/modules/rest/session/session.service";
 
 @Injectable()
 export class AuthService {
-
   constructor(
     private readonly userRepository: UserRepository,
     private readonly roomRepository: RoomRepository,
@@ -55,77 +54,81 @@ export class AuthService {
 
 
   public async authorizeFacebook(body: FaceBookAuthRequest): Promise<FacebookSignInResponse> {
-    let fbResponse: FacebookGetUserResponse = await this.facebookService.validate(body.token);
+    const fbResponse: FacebookGetUserResponse = await this.facebookService.validate(body.token);
     return this.sequelize.transaction(async(t) => {
-      let userAuth = await this.userRepository.getUserMyAuthFacebook(fbResponse.id, t)
+      const userAuth = await this.userRepository.getUserMyAuthFacebook(fbResponse.id, t);
       if (userAuth) {
-        let session = await this.sessionService.createAndSaveSession(userAuth.id);
-        let response: FacebookSignInResponse = {session, isNewAccount: false};
-        return response;
-      } else {
-        let username = generateUserName(`${fbResponse.first_name}_${fbResponse.last_name}`);
-        if (await this.userRepository.checkUserExistByUserName(username)) {
-          // the chance that there will be a user with same id is insignificant
-          username = await this.passwordService.generateRandomString(MAX_USERNAME_LENGTH);
-        }
-        this.logger.log(`Generates username='${username}' for fbId ${fbResponse.id}`, 'auth.service');
-        const password = await this.passwordService.createPassword(await this.passwordService.generateRandomString(16));
-
-        let userId = await this.userRepository.createUser({
-          password,
-          username,
-          name: fbResponse.first_name,
-          surname: fbResponse.last_name,
-          sex: Gender.OTHER,
-          facebookId: fbResponse.id
-        }, t)
-        await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
-
-        let session = await this.sessionService.createAndSaveSession(userId);
-        let response: FacebookSignInResponse = {session, isNewAccount: true, username};
+        const session = await this.sessionService.createAndSaveSession(userAuth.id);
+        const response: FacebookSignInResponse = {session,
+          isNewAccount: false};
         return response;
       }
+      let username = generateUserName(`${fbResponse.first_name}_${fbResponse.last_name}`);
+      if (await this.userRepository.checkUserExistByUserName(username)) {
+        // The chance that there will be a user with same id is insignificant
+        username = await this.passwordService.generateRandomString(MAX_USERNAME_LENGTH);
+      }
+      this.logger.log(`Generates username='${username}' for fbId ${fbResponse.id}`, "auth.service");
+      const password = await this.passwordService.createPassword(await this.passwordService.generateRandomString(16));
+
+      const userId = await this.userRepository.createUser({
+        password,
+        username,
+        name: fbResponse.first_name,
+        surname: fbResponse.last_name,
+        sex: Gender.OTHER,
+        facebookId: fbResponse.id,
+      }, t);
+      await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
+
+      const session = await this.sessionService.createAndSaveSession(userId);
+      const response: FacebookSignInResponse = {session,
+        isNewAccount: true,
+        username};
+      return response;
     });
   }
 
 
   public async authorizeGoogle(body: GoogleAuthRequest): Promise<GoogleSignInResponse> {
-    let googleResponse: TokenPayload = await this.googleAuthService.validate(body.token);
+    const googleResponse: TokenPayload = await this.googleAuthService.validate(body.token);
     return this.sequelize.transaction(async(t) => {
-      let userAuth = await this.userRepository.getUserMyAuthGoogle(googleResponse.email, t)
+      const userAuth = await this.userRepository.getUserMyAuthGoogle(googleResponse.email, t);
       if (userAuth) {
-        let session = await this.sessionService.createAndSaveSession(userAuth.id);
-        let response: GoogleSignInResponse = {session, isNewAccount: false};
-        return response;
-      } else {
-        let username = generateUserName(googleResponse.email);
-        if (await this.userRepository.checkUserExistByEmail(googleResponse.email)) {
-          throw new ConflictException("User with this email already exist, but has no connected google account." +
-            " If this is you, please login as this user and connect this google profile in profile settings")
-        }
-        if (await this.userRepository.checkUserExistByUserName(username)) {
-          // the chance that there will be a user with same id is insignificant
-          username = await this.passwordService.generateRandomString(MAX_USERNAME_LENGTH);
-        }
-        this.logger.log(`Generates username='${username}' for email ${googleResponse.email}`, 'auth.service');
-        const password = await this.passwordService.createPassword(await this.passwordService.generateRandomString(16));
-
-        let userId = await this.userRepository.createUser({
-          googleId: googleResponse.email,
-          password,
-          email: googleResponse.email,
-          username,
-          thumbnail: googleResponse.picture,
-          name: googleResponse.given_name,
-          surname: googleResponse.family_name,
-          sex: Gender.OTHER,
-        }, t)
-        await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
-
-        let session = await this.sessionService.createAndSaveSession(userId);
-        let response: GoogleSignInResponse = {session, isNewAccount: true, username};
+        const session = await this.sessionService.createAndSaveSession(userAuth.id);
+        const response: GoogleSignInResponse = {session,
+          isNewAccount: false};
         return response;
       }
+      let username = generateUserName(googleResponse.email);
+      if (await this.userRepository.checkUserExistByEmail(googleResponse.email)) {
+        throw new ConflictException("User with this email already exist, but has no connected google account." +
+            " If this is you, please login as this user and connect this google profile in profile settings");
+      }
+      if (await this.userRepository.checkUserExistByUserName(username)) {
+        // The chance that there will be a user with same id is insignificant
+        username = await this.passwordService.generateRandomString(MAX_USERNAME_LENGTH);
+      }
+      this.logger.log(`Generates username='${username}' for email ${googleResponse.email}`, "auth.service");
+      const password = await this.passwordService.createPassword(await this.passwordService.generateRandomString(16));
+
+      const userId = await this.userRepository.createUser({
+        googleId: googleResponse.email,
+        password,
+        email: googleResponse.email,
+        username,
+        thumbnail: googleResponse.picture,
+        name: googleResponse.given_name,
+        surname: googleResponse.family_name,
+        sex: Gender.OTHER,
+      }, t);
+      await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
+
+      const session = await this.sessionService.createAndSaveSession(userId);
+      const response: GoogleSignInResponse = {session,
+        isNewAccount: true,
+        username};
+      return response;
     });
   }
 
@@ -136,42 +139,42 @@ export class AuthService {
       userId = result?.user?.id;
       password = result?.password;
     } else {
-      const result = await this.userRepository.getUserByUserName(body.username, ['userAuth']);
+      const result = await this.userRepository.getUserByUserName(body.username, ["userAuth"]);
       userId = result?.id;
       password = result?.userAuth?.password;
     }
     if (!password) {
       throw new ConflictException("User with login doesn't exists");
     }
-    let matches = await this.passwordService.checkPassword(body.password, password);
+    const matches = await this.passwordService.checkPassword(body.password, password);
     if (!matches) {
       throw new UnauthorizedException("Invalid password");
     }
     const session = await this.sessionService.createAndSaveSession(userId);
-    return {session}
+    return {session};
   }
 
   public async sendVerificationEmail(email: string, userId: number, username: string, ip: string) {
     try {
-      this.logger.debug(`Preparing for sending verification email to userId ${userId}`, 'auth.service')
+      this.logger.debug(`Preparing for sending verification email to userId ${userId}`, "auth.service");
       await this.sequelize.transaction(async(t) => {
-        let token = await this.passwordService.generateRandomString(32);
-        this.logger.log(`Generated token for userId ${userId}: ${token}`, 'auth.service')
-        await this.verificationRepository.createVerification(email, userId, token, VerificationType.REGISTER, t)
-        let ipInfo = await this.ipCacheService.getIpString(ip)
-        await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ipInfo)
+        const token = await this.passwordService.generateRandomString(32);
+        this.logger.log(`Generated token for userId ${userId}: ${token}`, "auth.service");
+        await this.verificationRepository.createVerification(email, userId, token, VerificationType.REGISTER, t);
+        const ipInfo = await this.ipCacheService.getIpString(ip);
+        await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ipInfo);
       });
     } catch (e) {
-      this.logger.error(`Can't send email to userid ${userId} ${email} because ${e.message}`, e.stack, 'auth.service')
+      this.logger.error(`Can't send email to userid ${userId} ${email} because ${e.message}`, e.stack, "auth.service");
     }
-
   }
 
   public async registerUser(data: SignUpRequest, ip: string): Promise<SignUpResponse> {
     const {session, userId} = await this.sequelize.transaction(async(t) => {
-      let userId = await this.createUser(data, t);
-      let session = await this.sessionService.createAndSaveSession(userId);
-      return {session, userId};
+      const userId = await this.createUser(data, t);
+      const session = await this.sessionService.createAndSaveSession(userId);
+      return {session,
+        userId};
     });
     if (data.email) {
       void this.sendVerificationEmail(data.email, userId, data.username, ip);
@@ -180,28 +183,28 @@ export class AuthService {
   }
 
   public async validateEmail(email: string): Promise<void> {
-    let exist = await this.userRepository.checkUserExistByEmail(email);
+    const exist = await this.userRepository.checkUserExistByEmail(email);
     if (exist) {
       throw new ConflictException("User with this email already exist");
     }
   }
 
   public async validateUser(userName: string, transaction?: Transaction): Promise<void> {
-    let exist = await this.userRepository.checkUserExistByUserName(userName, transaction);
+    const exist = await this.userRepository.checkUserExistByUserName(userName, transaction);
     if (exist) {
       throw new ConflictException("User with this username already exist");
     }
   }
 
-  public async createUser(data: SignUpRequest, transaction?: Transaction): Promise<number>{
+  public async createUser(data: SignUpRequest, transaction?: Transaction): Promise<number> {
     await this.validateUser(data.username, transaction);
     if (data.email) {
-      await this.validateEmail(data.email)
+      await this.validateEmail(data.email);
     }
     const password = await this.passwordService.createPassword(data.password);
-    let userId = await this.userRepository.createUser({...data, password}, transaction)
+    const userId = await this.userRepository.createUser({...data,
+      password}, transaction);
     await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, transaction);
     return userId;
   }
-
 }
diff --git a/newback/src/modules/api/auth/facebook.auth.service.ts b/newback/src/modules/api/auth/facebook.auth.service.ts
index feb489e2e..a2da369f4 100644
--- a/newback/src/modules/api/auth/facebook.auth.service.ts
+++ b/newback/src/modules/api/auth/facebook.auth.service.ts
@@ -4,14 +4,13 @@ import {
   InternalServerErrorException,
   Logger,
   ServiceUnavailableException,
-} from '@nestjs/common';
-import {HttpService} from '@/modules/rest/http/http.service';
-import {ConfigService} from '@/modules/rest/config/config.service';
-import {FacebookGetUserResponse} from '@/data/types/api';
+} from "@nestjs/common";
+import {HttpService} from "@/modules/rest/http/http.service";
+import {ConfigService} from "@/modules/rest/config/config.service";
+import type {FacebookGetUserResponse} from "@/data/types/api";
 
 @Injectable()
 export class FacebookAuthService {
-
   public constructor(
     private readonly logger: Logger,
     private readonly httpService: HttpService,
@@ -21,42 +20,41 @@ export class FacebookAuthService {
   }
 
   public async validate(idToken: string): Promise<FacebookGetUserResponse> {
-    let accessToken = this.configService.getConfig().auth?.facebook?.accessToken;
+    const accessToken = this.configService.getConfig().auth?.facebook?.accessToken;
     if (!accessToken) {
       throw new ServiceUnavailableException("facebook access token is not specified");
     }
     const response = await this.httpService.getUrlEncoded(
-      'https://graph.facebook.com/debug_token',
+      "https://graph.facebook.com/debug_token",
       {
         input_token: idToken,
-        access_token: accessToken
+        access_token: accessToken,
       }
     );
     if (!response?.data) {
-      throw new InternalServerErrorException("facebook api is down")
+      throw new InternalServerErrorException("facebook api is down");
     }
     if (!response.data.is_valid) {
       if (response.data.error) {
-        throw new BadRequestException(`facebook api error down error=${response.data.error.message} code=${response.data.error.code}`)
+        throw new BadRequestException(`facebook api error down error=${response.data.error.message} code=${response.data.error.code}`);
       } else {
-        throw new InternalServerErrorException("invalid facebook response")
+        throw new InternalServerErrorException("invalid facebook response");
       }
     }
-    let userId = response.data.user_id;
-    this.logger.log(`got userId='${userId}' for facebookToken='${idToken}'`, 'facebook.auth.service');
+    const userId = response.data.user_id;
+    this.logger.log(`got userId='${userId}' for facebookToken='${idToken}'`, "facebook.auth.service");
     if (!userId) {
-      throw new InternalServerErrorException("invalid facebook response, userId is missing")
+      throw new InternalServerErrorException("invalid facebook response, userId is missing");
     }
-    let facebookUser: FacebookGetUserResponse = await this.httpService.getUrlEncoded(`https://graph.facebook.com/${userId}`,
+    const facebookUser: FacebookGetUserResponse = await this.httpService.getUrlEncoded(`https://graph.facebook.com/${userId}`,
       {
-        'access_token': accessToken,
-        'fields': ['email', 'first_name', 'last_name'].join(',')
-      }
-    )
+        access_token: accessToken,
+        fields: ["email", "first_name", "last_name"].join(","),
+      });
     if (!facebookUser.id) {
-      throw new InternalServerErrorException("invalid facebook response, id is missing")
+      throw new InternalServerErrorException("invalid facebook response, id is missing");
     }
-    this.logger.log(`got userid='${facebookUser.id}' for facebookToken='${idToken}'`, 'facebook.auth.service');
+    this.logger.log(`got userid='${facebookUser.id}' for facebookToken='${idToken}'`, "facebook.auth.service");
     return facebookUser;
   }
 }
diff --git a/newback/src/modules/api/auth/google.auth.service.ts b/newback/src/modules/api/auth/google.auth.service.ts
index cd5772df6..2305809a9 100644
--- a/newback/src/modules/api/auth/google.auth.service.ts
+++ b/newback/src/modules/api/auth/google.auth.service.ts
@@ -1,17 +1,16 @@
-import {
+import type {
   OAuth2Client,
-  TokenPayload
-} from 'google-auth-library';
+  TokenPayload,
+} from "google-auth-library";
 import {
   ForbiddenException,
   Injectable,
   Logger,
   ServiceUnavailableException,
-} from '@nestjs/common';
+} from "@nestjs/common";
 
 @Injectable()
 export class GoogleAuthService {
-
   public constructor(
     private readonly logger: Logger,
     private readonly oauth2Client: OAuth2Client | null,
@@ -37,7 +36,8 @@ export class GoogleAuthService {
    *    "exp": 1649759247,
    *    "jti": "xxxxxxxxxxxxxxxxxxxxxxxxx"
    * }
-   * */
+   *
+   */
   public async validate(idToken: string): Promise<TokenPayload> {
     if (!this.oauth2Client) {
       throw new ServiceUnavailableException("google client id not specifed");
@@ -47,7 +47,7 @@ export class GoogleAuthService {
     });
     const payload = response.getPayload()!;
     if (!payload) {
-      throw new ForbiddenException('Invalid google credentials')
+      throw new ForbiddenException("Invalid google credentials");
     }
     return payload;
   }
diff --git a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
index a34d3b2c0..90d88a8ad 100644
--- a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
@@ -1,9 +1,7 @@
-import {IsString} from 'class-validator';
-import {FaceBookAuthRequest,} from '@/data/types/frontend';
+import {IsString} from "class-validator";
+import type {FaceBookAuthRequest} from "@/data/types/frontend";
 
 export class FacebookAuthRequestValidator implements FaceBookAuthRequest {
-
   @IsString()
   public token: string;
-
 }
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
index c91e074ba..3d7f9949f 100644
--- a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -1,9 +1,7 @@
-import {IsString,} from 'class-validator';
-import {GoogleAuthRequest} from '@/data/types/frontend';
+import {IsString} from "class-validator";
+import type {GoogleAuthRequest} from "@/data/types/frontend";
 
 export class GoogleAuthRequestValidator implements GoogleAuthRequest {
-
   @IsString()
   public token: string;
-
 }
diff --git a/newback/src/modules/api/auth/validators/login.request.validator.ts b/newback/src/modules/api/auth/validators/login.request.validator.ts
index 4f02ece2a..e0a511e23 100644
--- a/newback/src/modules/api/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/login.request.validator.ts
@@ -3,29 +3,28 @@ import {
   IsString,
   Matches,
   ValidateIf,
-} from 'class-validator';
-import {SignInRequest} from '@/data/types/frontend';
+} from "class-validator";
+import type {SignInRequest} from "@/data/types/frontend";
 
 export class LoginRequestValidator implements SignInRequest {
-
-  @ValidateIf(o => !o.email || o.username)
+  @ValidateIf((o) => !o.email || o.username)
   @IsString()
   @Matches(/^\S+$/, {
-    message: `Username can't contain whitespaces`
+    message: "Username can't contain whitespaces",
   })
   public username?: string;
 
-  @ValidateIf(o => !o.username || o.email)
+  @ValidateIf((o) => !o.username || o.email)
   @IsString()
   @IsEmail()
   @Matches(/^\S+$/, {
-    message: `email can't contain whitespaces`
+    message: "email can't contain whitespaces",
   })
   public email?: string;
 
   @IsString()
   @Matches(/^\S+$/, {
-    message: `Password can't contain whitespaces`
+    message: "Password can't contain whitespaces",
   })
   public password: string;
 }
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index 67bcc70ff..d166e0259 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -5,30 +5,29 @@ import {
   IsString,
   Length,
   Matches,
-} from 'class-validator';
+} from "class-validator";
+import type {SignUpRequest} from "@/data/types/frontend";
 import {
   Gender,
-  SignUpRequest,
-} from '@/data/types/frontend';
-import {MAX_USERNAME_LENGTH} from '@/utils/consts';
+} from "@/data/types/frontend";
+import {MAX_USERNAME_LENGTH} from "@/utils/consts";
 
 export class SignUpRequestValidator implements SignUpRequest {
-
   @IsString()
   @Length(1, MAX_USERNAME_LENGTH, {
-    message: `Username should be 1-${MAX_USERNAME_LENGTH} characters`
+    message: `Username should be 1-${MAX_USERNAME_LENGTH} characters`,
   })
   @Matches(/^[a-zA-Z-_0-9]+$/, {
-    message: `Username can only contain latin characters, numbers and symbols '-' '_'`
+    message: "Username can only contain latin characters, numbers and symbols '-' '_'",
   })
   public username: string;
 
   @IsString()
   @Length(3, 128, {
-    message: "Passwords should contain 3-64 symbols"
+    message: "Passwords should contain 3-64 symbols",
   })
   @Matches(/^\S+$/, {
-    message: `Password can't contain whitespaces`
+    message: "Password can't contain whitespaces",
   })
   public password: string;
 
@@ -39,5 +38,4 @@ export class SignUpRequestValidator implements SignUpRequest {
   @IsOptional()
   @IsEmail()
   public email?: string;
-
 }
diff --git a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
index 1c1cbfebd..f4086fe95 100644
--- a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
@@ -1,8 +1,8 @@
 import {
   IsEmail,
   IsString,
-} from 'class-validator';
-import {ValidateUserEmailRequest} from '@/data/types/frontend';
+} from "class-validator";
+import type {ValidateUserEmailRequest} from "@/data/types/frontend";
 
 export class ValidateEmailRequestValidator implements ValidateUserEmailRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index b8ccae791..b34bdb978 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -2,17 +2,17 @@ import {
   IsString,
   Length,
   Matches,
-} from 'class-validator';
-import {ValidateUserRequest} from '@/data/types/frontend';
-import {MAX_USERNAME_LENGTH} from '@/utils/consts';
+} from "class-validator";
+import type {ValidateUserRequest} from "@/data/types/frontend";
+import {MAX_USERNAME_LENGTH} from "@/utils/consts";
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {
   @IsString()
   @Length(1, MAX_USERNAME_LENGTH, {
-    message: `Username should be 1-${MAX_USERNAME_LENGTH} characters`
+    message: `Username should be 1-${MAX_USERNAME_LENGTH} characters`,
   })
   @Matches(/^[a-zA-Z-_0-9]+$/, {
-    message: `Username can only contain latin characters, numbers and symbols '-' '_'`
+    message: "Username can only contain latin characters, numbers and symbols '-' '_'",
   })
   public username: string;
 }
diff --git a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
index 85ee7d48d..b9886d715 100644
--- a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
@@ -2,8 +2,8 @@ import {
   IsString,
   Length,
   Matches,
-} from 'class-validator';
-import {AcceptTokenRequest} from '@/data/types/frontend';
+} from "class-validator";
+import type {AcceptTokenRequest} from "@/data/types/frontend";
 
 
 export class AcceptTokenRequestValidator implements AcceptTokenRequest {
@@ -12,10 +12,10 @@ export class AcceptTokenRequestValidator implements AcceptTokenRequest {
 
   @IsString()
   @Length(3, 128, {
-    message: "Passwords should contain 3-64 symbols"
+    message: "Passwords should contain 3-64 symbols",
   })
   @Matches(/^\S+$/, {
-    message: `Password can't contain whitespaces`
+    message: "Password can't contain whitespaces",
   })
   public password: string;
 }
diff --git a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
index 94052e1c5..f47b956cd 100644
--- a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
@@ -1,5 +1,5 @@
-import {IsString,} from 'class-validator';
-import {ConfirmEmailRequest} from '@/data/types/frontend';
+import {IsString} from "class-validator";
+import type {ConfirmEmailRequest} from "@/data/types/frontend";
 
 
 export class ConfirmEmailRequestValidator implements ConfirmEmailRequest {
diff --git a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
index bd5aeed21..f7b76799c 100644
--- a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
+++ b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
@@ -3,22 +3,22 @@ import {
   IsString,
   Matches,
   ValidateIf,
-} from 'class-validator';
-import {SendRestorePasswordRequest} from '@/data/types/frontend';
+} from "class-validator";
+import type {SendRestorePasswordRequest} from "@/data/types/frontend";
 
 export class SendRestorePasswordValidator implements SendRestorePasswordRequest {
-  @ValidateIf(o => !o.email || o.username)
+  @ValidateIf((o) => !o.email || o.username)
   @IsString()
   @Matches(/^\S+$/, {
-    message: `Username can't contain whitespaces`
+    message: "Username can't contain whitespaces",
   })
   public username?: string;
 
-  @ValidateIf(o => !o.username || o.email)
+  @ValidateIf((o) => !o.username || o.email)
   @IsString()
   @IsEmail()
   @Matches(/^\S+$/, {
-    message: `email can't contain whitespaces`
+    message: "email can't contain whitespaces",
   })
   public email?: string;
 }
diff --git a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
index 880f5cab0..7d93e3091 100644
--- a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
@@ -1,5 +1,5 @@
-import {IsString,} from 'class-validator';
-import {VerifyTokenRequest} from '@/data/types/frontend';
+import {IsString} from "class-validator";
+import type {VerifyTokenRequest} from "@/data/types/frontend";
 
 
 export class VerifyTokenRequestValidator implements VerifyTokenRequest {
diff --git a/newback/src/modules/api/verify/verify.controller.ts b/newback/src/modules/api/verify/verify.controller.ts
index 55321fe35..a371d9cb3 100644
--- a/newback/src/modules/api/verify/verify.controller.ts
+++ b/newback/src/modules/api/verify/verify.controller.ts
@@ -3,24 +3,24 @@ import {
   Controller,
   Ip,
   Post,
-  UseGuards
-} from '@nestjs/common';
-import {CaptchaGuard} from '@/modules/app/guards/captcha.guard';
-import {SendRestorePasswordValidator} from '@/modules/api/verify/validators/send.restore.password.validator';
-import {
+  UseGuards,
+} from "@nestjs/common";
+import {CaptchaGuard} from "@/modules/app/guards/captcha.guard";
+import {SendRestorePasswordValidator} from "@/modules/api/verify/validators/send.restore.password.validator";
+import type {
   AcceptTokenResponse,
   ConfirmEmailResponse,
   SendRestorePasswordResponse,
-  VerifyTokenResponse
-} from '@/data/types/frontend';
-import {VerifyTokenRequestValidator} from '@/modules/api/verify/validators/verify.token.request.validator';
-import {ConfirmEmailRequestValidator} from '@/modules/api/verify/validators/confirm.email.request.validator';
-import {AcceptTokenRequestValidator} from '@/modules/api/verify/validators/accept.token.request.validator';
-import {VerifyService} from '@/modules/api/verify/verify.service';
+  VerifyTokenResponse,
+} from "@/data/types/frontend";
+import {VerifyTokenRequestValidator} from "@/modules/api/verify/validators/verify.token.request.validator";
+import {ConfirmEmailRequestValidator} from "@/modules/api/verify/validators/confirm.email.request.validator";
+import {AcceptTokenRequestValidator} from "@/modules/api/verify/validators/accept.token.request.validator";
+import {VerifyService} from "@/modules/api/verify/verify.service";
 
 
 @Controller({
-  path: '/api/verify'
+  path: "/api/verify",
 })
 export class VerifyController {
   constructor(
@@ -29,28 +29,28 @@ export class VerifyController {
   }
 
   @UseGuards(CaptchaGuard)
-  @Post('/send-restore-password')
+  @Post("/send-restore-password")
   public async sendRestorePassword(@Body() body: SendRestorePasswordValidator, @Ip() ip: string): Promise<SendRestorePasswordResponse> {
     await this.verifyService.sendRestorePassword(body, ip);
     return {
-      ok: true
-    }
+      ok: true,
+    };
   }
 
-  @Post('/verify-token')
+  @Post("/verify-token")
   public async verifyToken(@Body() body: VerifyTokenRequestValidator): Promise<VerifyTokenResponse> {
     return this.verifyService.verifyToken(body.token);
   }
 
-  @Post('/confirm-email')
+  @Post("/confirm-email")
   public async confirmEmail(@Body() body: ConfirmEmailRequestValidator): Promise<ConfirmEmailResponse> {
     await this.verifyService.confirmEmail(body);
     return {
       ok: true,
-    }
+    };
   }
 
-  @Post('/accept-token')
+  @Post("/accept-token")
   public async acceptToken(@Body() body: AcceptTokenRequestValidator): Promise<AcceptTokenResponse> {
     return this.verifyService.acceptToken(body);
   }
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index 171902d1a..ac6b459d6 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -1,52 +1,50 @@
+import type {INestApplication} from "@nestjs/common";
 import {
   ConsoleLogger,
-  INestApplication,
   Logger,
-  ValidationPipe
-} from '@nestjs/common';
-import * as supertest from 'supertest';
-import {Test} from '@nestjs/testing';
-import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {EmailService} from '@/modules/rest/email/email.service';
-import {MailerService} from '@nestjs-modules/mailer';
-import {Sequelize} from 'sequelize-typescript';
-import {HtmlService} from '@/modules/rest/html/html.service';
-import {HttpService} from '@/modules/rest/http/http.service';
-import fetch from 'node-fetch';
-import {ConfigService} from '@/modules/rest/config/config.service';
-import {config} from 'node-ts-config';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {IpService} from '@/modules/rest/ip/ip.service';
-import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
-import {IpAddressModel} from '@/data/model/ip.address.model';
-import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
-import {VerificationType} from '@/data/types/frontend';
-import {VerifyController} from '@/modules/api/verify/verify.controller';
-import {VerifyService} from '@/modules/api/verify/verify.service';
-import {SessionService} from '@/modules/rest/session/session.service';
+  ValidationPipe,
+} from "@nestjs/common";
+import * as supertest from "supertest";
+import {Test} from "@nestjs/testing";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import type {RoomRepository} from "@/modules/rest/database/repository/room.repository";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {EmailService} from "@/modules/rest/email/email.service";
+import {MailerService} from "@nestjs-modules/mailer";
+import {Sequelize} from "sequelize-typescript";
+import {HtmlService} from "@/modules/rest/html/html.service";
+import {HttpService} from "@/modules/rest/http/http.service";
+import type fetch from "node-fetch";
+import {ConfigService} from "@/modules/rest/config/config.service";
+import {config} from "node-ts-config";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {IpService} from "@/modules/rest/ip/ip.service";
+import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
+import type {IpAddressModel} from "@/data/model/ip.address.model";
+import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
+import {VerificationType} from "@/data/types/frontend";
+import {VerifyController} from "@/modules/api/verify/verify.controller";
+import {VerifyService} from "@/modules/api/verify/verify.service";
+import {SessionService} from "@/modules/rest/session/session.service";
 
-describe('VerifyModule', () => {
+describe("VerifyModule", () => {
   let app: INestApplication;
   let request: supertest.SuperTest<supertest.Test>;
-  let userRepository: UserRepository = {} as UserRepository;
-  let verificationRepository: VerificationRepository = {} as VerificationRepository;
-  let ipRepository: IpRepository = {} as IpRepository;
-  let roomRepository: RoomRepository = {} as RoomRepository;
-  let redisService: RedisService = {} as RedisService;
-  let sequelize: Sequelize = {} as Sequelize;
-  let mailerService: MailerService = {} as MailerService;
-  let configService: ConfigService = {} as ConfigService;
+  const userRepository: UserRepository = {} as UserRepository;
+  const verificationRepository: VerificationRepository = {} as VerificationRepository;
+  const ipRepository: IpRepository = {} as IpRepository;
+  const roomRepository: RoomRepository = {} as RoomRepository;
+  const redisService: RedisService = {} as RedisService;
+  const sequelize: Sequelize = {} as Sequelize;
+  const mailerService: MailerService = {} as MailerService;
+  const configService: ConfigService = {} as ConfigService;
   beforeAll(async() => {
-    //required to compile Guards like CaptchaGuard
-    configService.getConfig = jest.fn().mockReturnValue(config)
+    // Required to compile Guards like CaptchaGuard
+    configService.getConfig = jest.fn().mockReturnValue(config);
     const moduleFixture = await Test.createTestingModule({
-      imports: [
-        LoggerModule,
-      ],
+      imports: [LoggerModule],
       providers: [
         PasswordService,
         HtmlService,
@@ -61,11 +59,11 @@ describe('VerifyModule', () => {
         },
         {
           provide: MailerService,
-          useValue: mailerService
+          useValue: mailerService,
         },
         {
           provide: Sequelize,
-          useValue: sequelize
+          useValue: sequelize,
         },
         {
           provide: MailerService,
@@ -81,7 +79,7 @@ describe('VerifyModule', () => {
         },
         {
           provide: VerificationRepository,
-          useValue: verificationRepository
+          useValue: verificationRepository,
         },
         {
           provide: IpRepository,
@@ -92,15 +90,15 @@ describe('VerifyModule', () => {
           inject: [Logger],
           useFactory: (logger) => new HttpService(logger, new Proxy(() => {
           }, {
-            apply: function (target: {}, thisArg: any, argArray: any[]): any {
+            apply(target: {}, thisArg: any, argArray: any[]): any {
               throw Error("Unsupported");
-            }
-          }) as typeof fetch)
+            },
+          }) as typeof fetch),
         },
       ],
-      controllers: [VerifyController]
-    }).setLogger(new ConsoleLogger())
-      .compile();
+      controllers: [VerifyController],
+    }).setLogger(new ConsoleLogger()).
+      compile();
     app = moduleFixture.createNestApplication();
     app.useGlobalPipes(new ValidationPipe());
     await app.init();
@@ -108,178 +106,200 @@ describe('VerifyModule', () => {
   });
 
   beforeEach(() => {
-    configService.getConfig = jest.fn().mockReturnValue(config)
-  })
+    configService.getConfig = jest.fn().mockReturnValue(config);
+  });
 
   afterEach(() => {
     jest.clearAllMocks();
-    Object.keys(userRepository).forEach(key => delete userRepository[key]);
-    Object.keys(roomRepository).forEach(key => delete roomRepository[key]);
-    Object.keys(redisService).forEach(key => delete redisService[key]);
-    Object.keys(sequelize).forEach(key => delete sequelize[key]);
-    Object.keys(mailerService).forEach(key => delete mailerService[key]);
-    Object.keys(ipRepository).forEach(key => delete ipRepository[key]);
-    Object.keys(configService).forEach(key => delete configService[key]);
-    Object.keys(verificationRepository).forEach(key => delete configService[key]);
-
+    Object.keys(userRepository).forEach((key) => delete userRepository[key]);
+    Object.keys(roomRepository).forEach((key) => delete roomRepository[key]);
+    Object.keys(redisService).forEach((key) => delete redisService[key]);
+    Object.keys(sequelize).forEach((key) => delete sequelize[key]);
+    Object.keys(mailerService).forEach((key) => delete mailerService[key]);
+    Object.keys(ipRepository).forEach((key) => delete ipRepository[key]);
+    Object.keys(configService).forEach((key) => delete configService[key]);
+    Object.keys(verificationRepository).forEach((key) => delete configService[key]);
   });
 
   afterAll(async() => {
-    await app.close()
+    await app.close();
   });
 
-  describe('send-restore-password', () => {
-    it('sends password when by username', async() => {
-      configService.getConfig = jest.fn().mockReturnValue({...config, email: {}})
+  describe("send-restore-password", () => {
+    it("sends password when by username", async() => {
+      configService.getConfig = jest.fn().mockReturnValue({...config,
+        email: {}});
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByUserName = jest.fn().mockResolvedValue({
         userAuth: {
-          email: 'asd'
+          email: "asd",
         },
         id: 3,
-        username: 'forpassword'
-      })
+        username: "forpassword",
+      });
       verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
       mailerService.sendMail = jest.fn();
-      let spy = jest.spyOn(mailerService, 'sendMail');
+      const spy = jest.spyOn(mailerService, "sendMail");
       ipRepository.getIp = jest.fn().mockResolvedValue({
-        country: 'Ukraine',
-        city: 'Mariupol',
-        isp: 'AZOV',
-      } as IpAddressModel)
+        country: "Ukraine",
+        city: "Mariupol",
+        isp: "AZOV",
+      } as IpAddressModel);
 
-      await request
-        .post('/api/verify/send-restore-password').send({
-          username: 'a',
-        }).expect(201, {ok: true});
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
+      await request.
+        post("/api/verify/send-restore-password").send({
+          username: "a",
+        }).
+        expect(201, {ok: true});
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining("You have requested to change password on")}));
     });
-    it('sends password when by email', async() => {
-      configService.getConfig = jest.fn().mockReturnValue({...config, email: {}})
+    it("sends password when by email", async() => {
+      configService.getConfig = jest.fn().mockReturnValue({...config,
+        email: {}});
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByEmail = jest.fn().mockResolvedValue({
-        email: 'asd',
+        email: "asd",
         user: {
           id: 3,
-          username: 'forpassword'
-        }
-      })
+          username: "forpassword",
+        },
+      });
       verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
       mailerService.sendMail = jest.fn();
-      let spy = jest.spyOn(mailerService, 'sendMail');
+      const spy = jest.spyOn(mailerService, "sendMail");
       ipRepository.getIp = jest.fn().mockResolvedValue({
-        country: 'Ukraine',
-        city: 'Mariupol',
-        isp: 'AZOV',
-      } as IpAddressModel)
+        country: "Ukraine",
+        city: "Mariupol",
+        isp: "AZOV",
+      } as IpAddressModel);
 
-      await request
-        .post('/api/verify/send-restore-password').send({
-          email: 'a@gmail.com',
-        }).expect(201, {ok: true});
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining('You have requested to change password on')}))
+      await request.
+        post("/api/verify/send-restore-password").send({
+          email: "a@gmail.com",
+        }).
+        expect(201, {ok: true});
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining("You have requested to change password on")}));
     });
-    it('throws an error if user doesnt exists', async() => {
+    it("throws an error if user doesnt exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request
-        .post('/api/verify/send-restore-password').send({
-          username: 'a@gmail.com',
-        }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
+      await request.
+        post("/api/verify/send-restore-password").send({
+          username: "a@gmail.com",
+        }).
+        expect(400, {statusCode: 400,
+          message: "User with this username doesnt exit",
+          error: "Bad Request"});
     });
   });
-  describe('verify-token', () => {
-    it('should return error when token doesnt exist', async() => {
+  describe("verify-token", () => {
+    it("should return error when token doesnt exist", async() => {
       verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
-      await request
-        .post('/api/verify/verify-token').send({
-          token: 'a',
-        }).expect(400, {statusCode: 400, message: 'Invalid token', error: 'Bad Request'});
+      await request.
+        post("/api/verify/verify-token").send({
+          token: "a",
+        }).
+        expect(400, {statusCode: 400,
+          message: "Invalid token",
+          error: "Bad Request"});
     });
-    it('should return ok when token valid', async() => {
+    it("should return ok when token valid", async() => {
       verificationRepository.getVerification = jest.fn().mockResolvedValue({
         type: VerificationType.PASSWORD,
         createdAt: new Date(),
         user: {
-          username: 'a'
-        }
+          username: "a",
+        },
       });
 
-      await request
-        .post('/api/verify/verify-token').send({
-          token: 'a',
-        }).expect(201, {ok: true, username: 'a'});
+      await request.
+        post("/api/verify/verify-token").send({
+          token: "a",
+        }).
+        expect(201, {ok: true,
+          username: "a"});
     });
-    it('throws an error if user doesnt exists', async() => {
+    it("throws an error if user doesnt exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request
-        .post('/api/verify/send-restore-password').send({
-          username: 'a@gmail.com',
-        }).expect(400, {statusCode: 400, message: 'User with this username doesnt exit', error: 'Bad Request'});
+      await request.
+        post("/api/verify/send-restore-password").send({
+          username: "a@gmail.com",
+        }).
+        expect(400, {statusCode: 400,
+          message: "User with this username doesnt exit",
+          error: "Bad Request"});
     });
   });
 
-  describe('confirm-email', () => {
-    it('should return error when token doesnt exist', async() => {
+  describe("confirm-email", () => {
+    it("should return error when token doesnt exist", async() => {
       sequelize.transaction = (resolve) => resolve();
       verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
-      await request
-        .post('/api/verify/confirm-email').send({
-          token: 'a',
-        }).expect(400, {statusCode: 400, message: 'Invalid token', error: 'Bad Request'});
+      await request.
+        post("/api/verify/confirm-email").send({
+          token: "a",
+        }).
+        expect(400, {statusCode: 400,
+          message: "Invalid token",
+          error: "Bad Request"});
     });
-    it('should set email confirmed', async() => {
+    it("should set email confirmed", async() => {
       sequelize.transaction = (resolve) => resolve();
-      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
-      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
+      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined);
+      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined);
       verificationRepository.getVerification = jest.fn().mockResolvedValue({
         type: VerificationType.REGISTER,
         createdAt: new Date(),
         user: {
-          username: 'a'
-        }
+          username: "a",
+        },
       });
 
-      await request
-        .post('/api/verify/confirm-email').send({
-          token: 'a',
-        }).expect(201, {ok: true});
+      await request.
+        post("/api/verify/confirm-email").send({
+          token: "a",
+        }).
+        expect(201, {ok: true});
     });
   });
-  describe('accept-token', () => {
-    it('should return error when token doesnt exist', async() => {
+  describe("accept-token", () => {
+    it("should return error when token doesnt exist", async() => {
       sequelize.transaction = (resolve) => resolve();
       verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
-      await request
-        .post('/api/verify/accept-token').send({
-          token: 'a',
-          password: 'asd',
-        }).expect(400, {statusCode: 400, message: 'Invalid token', error: 'Bad Request'});
+      await request.
+        post("/api/verify/accept-token").send({
+          token: "a",
+          password: "asd",
+        }).
+        expect(400, {statusCode: 400,
+          message: "Invalid token",
+          error: "Bad Request"});
     });
-    it('should set email confirmed', async() => {
+    it("should set email confirmed", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.updateUserPassword = jest.fn().mockResolvedValue(undefined);
-      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined)
-      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined)
+      verificationRepository.markVerificationVerified = jest.fn().mockResolvedValue(undefined);
+      verificationRepository.setUserVerification = jest.fn().mockResolvedValue(undefined);
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
       verificationRepository.getVerification = jest.fn().mockResolvedValue({
         type: VerificationType.PASSWORD,
         createdAt: new Date(),
         user: {
-          username: 'a',
-          password: 'asd',
-        }
+          username: "a",
+          password: "asd",
+        },
       });
 
-      const {body} = await request
-        .post('/api/verify/accept-token').send({
-          token: 'a',
-          password: 'asd',
-        }).expect(201);
+      const {body} = await request.
+        post("/api/verify/accept-token").send({
+          token: "a",
+          password: "asd",
+        }).
+        expect(201);
       expect(body).toMatchObject({session: expect.any(String)});
     });
   });
diff --git a/newback/src/modules/api/verify/verify.module.ts b/newback/src/modules/api/verify/verify.module.ts
index 55e898ea3..34a1091c1 100644
--- a/newback/src/modules/api/verify/verify.module.ts
+++ b/newback/src/modules/api/verify/verify.module.ts
@@ -1,13 +1,13 @@
-import {Module} from '@nestjs/common';
-import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {EmailModule} from '@/modules/rest/email/email.module';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {HttpModule} from '@/modules/rest/http/http.module';
-import {IpModule} from '@/modules/rest/ip/ip.module';
-import {VerifyController} from '@/modules/api/verify/verify.controller';
-import {SessionService} from '@/modules/rest/session/session.service';
-import {VerifyService} from '@/modules/api/verify/verify.service';
+import {Module} from "@nestjs/common";
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {EmailModule} from "@/modules/rest/email/email.module";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {HttpModule} from "@/modules/rest/http/http.module";
+import {IpModule} from "@/modules/rest/ip/ip.module";
+import {VerifyController} from "@/modules/api/verify/verify.controller";
+import {SessionService} from "@/modules/rest/session/session.service";
+import {VerifyService} from "@/modules/api/verify/verify.service";
 
 @Module({
   imports: [DatabaseModule, EmailModule, HttpModule, IpModule],
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index ca97775d1..c0ca79d5c 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -1,24 +1,26 @@
 import {
   BadRequestException,
   Injectable,
-  Logger
-} from '@nestjs/common';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {
+  Logger,
+} from "@nestjs/common";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import type {
   AcceptTokenRequest,
   AcceptTokenResponse,
   ConfirmEmailRequest,
   SendRestorePasswordRequest,
+  VerifyTokenResponse,
+} from "@/data/types/frontend";
+import {
   VerificationType,
-  VerifyTokenResponse
-} from '@/data/types/frontend';
-import {EmailService} from '@/modules/rest/email/email.service';
-import {Sequelize} from 'sequelize-typescript';
-import {VerificationModel} from '@/data/model/verification.model';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
-import {SessionService} from '@/modules/rest/session/session.service';
+} from "@/data/types/frontend";
+import {EmailService} from "@/modules/rest/email/email.service";
+import {Sequelize} from "sequelize-typescript";
+import type {VerificationModel} from "@/data/model/verification.model";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
+import {SessionService} from "@/modules/rest/session/session.service";
 
 @Injectable()
 export class VerifyService {
@@ -35,13 +37,13 @@ export class VerifyService {
   }
 
   public async verifyToken(token: string): Promise<VerifyTokenResponse> {
-    let verificationModel: VerificationModel = await this.verificationRepository.getVerification(token);
-    //https://pychat.org/#/auth/proceed-reset-password?token=evhv0zum3l8gavzql4xk5u16q2h9gqd2
-    this.doTokenVerification(verificationModel, VerificationType.PASSWORD)
+    const verificationModel: VerificationModel = await this.verificationRepository.getVerification(token);
+    // https://pychat.org/#/auth/proceed-reset-password?token=evhv0zum3l8gavzql4xk5u16q2h9gqd2
+    this.doTokenVerification(verificationModel, VerificationType.PASSWORD);
     return {
       ok: true,
-      username: verificationModel.user.username
-    }
+      username: verificationModel.user.username,
+    };
   }
 
   public async sendRestorePassword(body: SendRestorePasswordRequest, ip: string): Promise<void> {
@@ -56,7 +58,7 @@ export class VerifyService {
         userId = user.id;
         email = body.email;
       } else if (body.username) {
-        const user = await this.userRepository.getUserByUserName(body.username, ['userAuth'], t);
+        const user = await this.userRepository.getUserByUserName(body.username, ["userAuth"], t);
         if (!user) {
           throw new BadRequestException("User with this username doesnt exit");
         }
@@ -67,37 +69,37 @@ export class VerifyService {
         username = user.username;
         userId = user.id;
       }
-      let token: string = await this.passwordService.generateRandomString(32);
+      const token: string = await this.passwordService.generateRandomString(32);
       this.logger.log(`Generated token='${token}' to restore user email='${email}'`);
-      await this.verificationRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t)
-      let ipInfo = await this.ipCacheService.getIpString(ip);
-      await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ipInfo)
+      await this.verificationRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t);
+      const ipInfo = await this.ipCacheService.getIpString(ip);
+      await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ipInfo);
     });
   }
 
   public async acceptToken(body: AcceptTokenRequest): Promise<AcceptTokenResponse> {
     return this.sequelize.transaction(async(t) => {
-      let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
+      const verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
       this.doTokenVerification(verificationModel, VerificationType.PASSWORD);
-      let password = await this.passwordService.createPassword(body.password);
-      this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`, 'verify.service');
-      await this.userRepository.updateUserPassword(verificationModel.userId, password, t)
+      const password = await this.passwordService.createPassword(body.password);
+      this.logger.log(`Generated newPassword='${password}' for verification='${verificationModel.id}' for userId=${verificationModel.userId}`, "verify.service");
+      await this.userRepository.updateUserPassword(verificationModel.userId, password, t);
       await this.verificationRepository.markVerificationVerified(verificationModel.id, t);
-      let session = await this.sessionService.createAndSaveSession(verificationModel.userId);
-      let result: AcceptTokenResponse = {
-        session
-      }
+      const session = await this.sessionService.createAndSaveSession(verificationModel.userId);
+      const result: AcceptTokenResponse = {
+        session,
+      };
       return result;
-    })
+    });
   }
 
   public async confirmEmail(body: ConfirmEmailRequest): Promise<void> {
     await this.sequelize.transaction(async(t) => {
-      let verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
+      const verificationModel: VerificationModel = await this.verificationRepository.getVerification(body.token, t);
       this.doTokenVerification(verificationModel, VerificationType.REGISTER);
       await this.verificationRepository.markVerificationVerified(verificationModel.id, t);
       await this.verificationRepository.setUserVerification(verificationModel.userId, verificationModel.id, t);
-    })
+    });
   }
 
   private doTokenVerification(data: VerificationModel, typ: VerificationType): void {
diff --git a/newback/src/modules/api/websocket/interfaces/pubsub.ts b/newback/src/modules/api/websocket/interfaces/pubsub.ts
index e8193e104..f62924d74 100644
--- a/newback/src/modules/api/websocket/interfaces/pubsub.ts
+++ b/newback/src/modules/api/websocket/interfaces/pubsub.ts
@@ -1,15 +1,18 @@
+import type {
+  DefaultWsInMessage,
+  HandlerName,
+} from "@/data/types/frontend";
 import {
   DefaultInMessage,
-  DefaultWsInMessage,
-  HandlerName
-} from '@/data/types/frontend';
-import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
+} from "@/data/types/frontend";
+import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
 
 export interface PubSubMessage<A extends string, H extends HandlerName> {
   body: DefaultWsInMessage<A, H>;
 }
 
-// export interface SendToClientPubSubMessage<A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
-// }
-export interface SendToClientPubSubMessage<DATA extends DefaultWsInMessage<A,H>, A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
-}
+/*
+ * Export interface SendToClientPubSubMessage<A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
+ * }
+ */
+export type SendToClientPubSubMessage<DATA extends DefaultWsInMessage<A, H>, A extends string, H extends HandlerName> = PubSubMessage<A, H>;
diff --git a/newback/src/modules/api/websocket/interfaces/utils.ts b/newback/src/modules/api/websocket/interfaces/utils.ts
index c9ae4596d..89ae7c0a7 100644
--- a/newback/src/modules/api/websocket/interfaces/utils.ts
+++ b/newback/src/modules/api/websocket/interfaces/utils.ts
@@ -1,4 +1,4 @@
-import {WebSocketContextData} from '@/data/types/internal';
+import type {WebSocketContextData} from "@/data/types/internal";
 
 export interface OnWsClose {
   closeConnection(context: WebSocketContextData);
diff --git a/newback/src/modules/api/websocket/transformers/ws.transformer.ts b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
index 5af6241b7..dfaee67fd 100644
--- a/newback/src/modules/api/websocket/transformers/ws.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   AddOnlineUserMessage,
   ChannelDto,
   RoomDto,
@@ -6,20 +6,20 @@ import {
   UserDto,
   UserProfileDto,
   UserSettingsDto,
-  RemoveOnlineUserMessage
-} from '@/data/types/frontend';
-import {UserModel} from '@/data/model/user.model';
-import {
+  RemoveOnlineUserMessage,
+} from "@/data/types/frontend";
+import type {UserModel} from "@/data/model/user.model";
+import type {
   UserOnlineData,
-  WebSocketContextData
-} from '@/data/types/internal';
-import {ChannelModel} from '@/data/model/channel.model';
-import {RoomUsersModel} from '@/data/model/room.users.model';
-import {GetRoomsForUser} from '@/modules/rest/database/repository/room.repository';
+  WebSocketContextData,
+} from "@/data/types/internal";
+import type {ChannelModel} from "@/data/model/channel.model";
+import type {RoomUsersModel} from "@/data/model/room.users.model";
+import type {GetRoomsForUser} from "@/modules/rest/database/repository/room.repository";
 
 export interface TransformSetWsIdDataParams {
   myRooms: GetRoomsForUser[];
-  allUsersInTheseRooms: Pick<RoomUsersModel, 'roomId' | 'userId'>[];
+  allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[];
   channels: ChannelModel[];
   users: UserModel[];
   online: UserOnlineData;
@@ -28,12 +28,14 @@ export interface TransformSetWsIdDataParams {
   user: UserModel;
 }
 
-// function transformUserSettings(db: UserSettingsModel): UserSettingsDto {
-//   return Object.keys(convert<UserSettingsDto>()).reduce((previousValue, currentValue) => {
-//     previousValue[currentValue] = db[currentValue];
-//     return previousValue;
-//   }, {} as UserSettingsDto)
-// }
+/*
+ * Function transformUserSettings(db: UserSettingsModel): UserSettingsDto {
+ *   return Object.keys(convert<UserSettingsDto>()).reduce((previousValue, currentValue) => {
+ *     previousValue[currentValue] = db[currentValue];
+ *     return previousValue;
+ *   }, {} as UserSettingsDto)
+ * }
+ */
 
 function transformProfile(user: UserModel): UserProfileDto {
   return {
@@ -46,21 +48,21 @@ function transformProfile(user: UserModel): UserProfileDto {
     birthday: user.userProfile.birthday,
     contacts: user.userProfile.contacts,
     surname: user.userProfile.surname,
-    thumbnail: user.thumbnail
+    thumbnail: user.thumbnail,
   };
 }
 
 function transformSettings(user: UserModel): UserSettingsDto {
   return {
-    embeddedYoutube: !!user.userSettings.embeddedYoutube,
-    highlightCode: !!user.userSettings.highlightCode,
-    incomingFileCallSound: !!user.userSettings.incomingFileCallSound,
-    messageSound: !!user.userSettings.messageSound,
-    onlineChangeSound: !!user.userSettings.onlineChangeSound,
-    showWhenITyping: !!user.userSettings.showWhenITyping,
-    suggestions: !!user.userSettings.suggestions,
+    embeddedYoutube: Boolean(user.userSettings.embeddedYoutube),
+    highlightCode: Boolean(user.userSettings.highlightCode),
+    incomingFileCallSound: Boolean(user.userSettings.incomingFileCallSound),
+    messageSound: Boolean(user.userSettings.messageSound),
+    onlineChangeSound: Boolean(user.userSettings.onlineChangeSound),
+    showWhenITyping: Boolean(user.userSettings.showWhenITyping),
+    suggestions: Boolean(user.userSettings.suggestions),
     theme: user.userSettings.theme,
-    logs: user.userSettings.logs
+    logs: user.userSettings.logs,
   };
 }
 
@@ -70,7 +72,7 @@ function transformUserDto(u: UserModel): UserDto {
     id: u.id,
     thumbnail: u.thumbnail,
     sex: u.sex,
-    lastTimeOnline: u.lastTimeOnline
+    lastTimeOnline: u.lastTimeOnline,
   };
 }
 
@@ -78,31 +80,29 @@ function transformChannelsDto(c: ChannelModel): ChannelDto {
   return {
     name: c.name,
     id: c.id,
-    creatorId: c.creatorId
+    creatorId: c.creatorId,
   };
 }
 
-function getTransformRoomFn(allUsersInTheseRooms: Pick<RoomUsersModel, 'roomId' | 'userId'>[]): (r: GetRoomsForUser) => RoomDto {
-  let roomUsersIdInfoDict: Record<string, number[]> = allUsersInTheseRooms.reduce((previousValue, currentValue) => {
+function getTransformRoomFn(allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[]): (r: GetRoomsForUser) => RoomDto {
+  const roomUsersIdInfoDict: Record<string, number[]> = allUsersInTheseRooms.reduce<Record<string, number[]>>((previousValue, currentValue) => {
     if (!previousValue[currentValue.roomId]) {
-      previousValue[currentValue.roomId] = []
+      previousValue[currentValue.roomId] = [];
     }
     previousValue[currentValue.roomId].push(currentValue.userId);
     return previousValue;
-  }, {} as Record<string, number[]>);
-  return (room: GetRoomsForUser) => {
-    return {
-      name: room.name,
-      id: room.id,
-      channelId: room.channelId,
-      p2p: !!room.p2p,
-      notifications: !!room.roomUsers.notifications,
-      users: roomUsersIdInfoDict[room.id],
-      isMainInChannel: !!room.isMainInChannel,
-      creatorId: room.creatorId,
-      volume: room.roomUsers.volume,
-    };
-  }
+  }, {});
+  return (room: GetRoomsForUser) => ({
+    name: room.name,
+    id: room.id,
+    channelId: room.channelId,
+    p2p: Boolean(room.p2p),
+    notifications: Boolean(room.roomUsers.notifications),
+    users: roomUsersIdInfoDict[room.id],
+    isMainInChannel: Boolean(room.isMainInChannel),
+    creatorId: room.creatorId,
+    volume: room.roomUsers.volume,
+  });
 }
 
 
@@ -115,8 +115,9 @@ export function transformSetWsId(
     online,
     id,
     user,
-    time
-  }: TransformSetWsIdDataParams): SetWsIdMessage {
+    time,
+  }: TransformSetWsIdDataParams
+): SetWsIdMessage {
   return {
     action: "setWsId",
     channels: channels.map(transformChannelsDto),
@@ -124,14 +125,14 @@ export function transformSetWsId(
     handler: "ws",
     time,
     users: users.map(transformUserDto),
-    online: online,
+    online,
     opponentWsId: id,
     profile: transformProfile(user),
     settings: transformSettings(user),
-  }
+  };
 }
 
-export function transformAddUserOnline(online:  Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
+export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
   return {
     action: "addOnlineUser",
     handler: "room",
@@ -139,18 +140,18 @@ export function transformAddUserOnline(online:  Record<number, string[]>, user:
     userId: user.id,
     lastTimeOnline: user.lastTimeOnline,
     time: Date.now(),
-    opponentWsId
+    opponentWsId,
   };
 }
 
 
-export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage  {
+export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage {
   return {
-    online: online,
-    action: 'removeOnlineUser',
+    online,
+    action: "removeOnlineUser",
     lastTimeOnline,
     time,
-    handler: 'room',
+    handler: "room",
     userId: context.userId,
   };
 }
diff --git a/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts b/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
index 330580182..490c19f0a 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
@@ -1,27 +1,28 @@
+import type {
+  TestingModule,
+} from "@nestjs/testing";
 import {
   Test,
-  TestingModule
-} from '@nestjs/testing';
-import {IpService} from '@/modules/rest/ip/ip.service';
-import {HttpModule} from '@/modules/rest/http/http.module';
-import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
-import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {SessionService} from '@/modules/rest/session/session.service';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {RedisModule} from '@nestjs-modules/ioredis';
-import {config} from 'node-ts-config';
-import {ConsoleLogger} from '@nestjs/common';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {AuthModule} from '@/modules/api/auth/auth.module';
-import {AuthService} from '@/modules/api/auth/auth.service';
-import {ConfigModule} from '@/modules/rest/config/config.module';
+} from "@nestjs/testing";
+import {IpService} from "@/modules/rest/ip/ip.service";
+import {HttpModule} from "@/modules/rest/http/http.module";
+import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {SessionService} from "@/modules/rest/session/session.service";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {RedisModule} from "@nestjs-modules/ioredis";
+import {config} from "node-ts-config";
+import {ConsoleLogger} from "@nestjs/common";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {AuthModule} from "@/modules/api/auth/auth.module";
+import {AuthService} from "@/modules/api/auth/auth.service";
+import {ConfigModule} from "@/modules/rest/config/config.module";
 
 
-describe('WebsocketGateway', () => {
-
+describe("WebsocketGateway", () => {
   let gateway: WebsocketGateway;
   let moduleFixture: TestingModule;
   beforeAll(
@@ -41,7 +42,7 @@ describe('WebsocketGateway', () => {
                   host: config.redis.host,
                   port: config.redis.port,
                   db: config.redis.database,
-                }
+                },
               }),
             ],
             providers: [
@@ -50,50 +51,50 @@ describe('WebsocketGateway', () => {
               IpCacheService,
               SessionService,
               IpService,
-            ]
+            ],
           },
 
         ],
-      }).setLogger(new ConsoleLogger()).compile();
+      }).setLogger(new ConsoleLogger()).
+        compile();
 
       gateway = moduleFixture.get(WebsocketGateway);
-    })
+    }
+  );
 
   afterAll(async() => {
-    await moduleFixture.close()
-  })
+    await moduleFixture.close();
+  });
 
   beforeAll(() => {
     jest.clearAllMocks();
-  })
-
-  describe('handleConnection', () => {
-    it('should not throw an error', async() => {
-        let authService = moduleFixture.get(AuthService);
-        let userRepository = moduleFixture.get(UserRepository);
-        let user = await userRepository.getUserByUserName('test');
-        let userId;
-        if (user) {
-          userId = user.id;
-        } else {
-          userId = await authService.createUser({
-            password: 'test',
-            username: 'test',
-          })
-        }
+  });
 
-        let sessionService = moduleFixture.get(SessionService);
-        let session = await sessionService.createAndSaveSession(userId)
-        let a = await gateway.handleConnection({
-          _socket: {
-            remoteAddress: '192.168.1.1'
-          }
-        } as any, {url: `/ws?id=&sessionId=${session}`} as any, {} as any)
+  describe("handleConnection", () => {
+    it("should not throw an error", async() => {
+      const authService = moduleFixture.get(AuthService);
+      const userRepository = moduleFixture.get(UserRepository);
+      const user = await userRepository.getUserByUserName("test");
+      let userId;
+      if (user) {
+        userId = user.id;
+      } else {
+        userId = await authService.createUser({
+          password: "test",
+          username: "test",
+        });
+      }
 
+      const sessionService = moduleFixture.get(SessionService);
+      const session = await sessionService.createAndSaveSession(userId);
+      const a = await gateway.handleConnection({
+        _socket: {
+          remoteAddress: "192.168.1.1",
+        },
+      } as any, {url: `/ws?id=&sessionId=${session}`} as any, {} as any);
 
-        expect(1 + 1).toEqual(2)
-      }
-    )
 
+      expect(1 + 1).toEqual(2);
+    });
   });
 });
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 6cee1ae7b..85b571fc8 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -1,45 +1,44 @@
+import type {OnGatewayConnection} from "@nestjs/websockets";
 import {
   MessageBody,
-  OnGatewayConnection,
   SubscribeMessage,
   WebSocketGateway,
   WebSocketServer,
-} from '@nestjs/websockets';
-import {IncomingMessage} from 'http';
+} from "@nestjs/websockets";
+import {IncomingMessage} from "http";
 import {
   CatchWsErrors,
-  WsContext
-} from '@/utils/decorators';
+  WsContext,
+} from "@/utils/decorators";
 import {
   Server,
-  WebSocket
-} from 'ws';
-import {WebSocketContextData} from '@/data/types/internal';
+  WebSocket,
+} from "ws";
+import {WebSocketContextData} from "@/data/types/internal";
 import {
   Logger,
-  UseFilters
-} from '@nestjs/common';
+  UseFilters,
+} from "@nestjs/common";
+import type {GetCountryCodeWsInMessage} from "@/data/types/frontend";
 import {
   GetCountryCodeWsOutMessage,
-  GetCountryCodeWsInMessage,
   ShowITypeWsInMessage,
   ShowITypeWsOutMessage,
-  SyncHistoryOutMessage
-} from '@/data/types/frontend';
-import {SubscribePuBSub} from '@/modules/rest/pubsub/pubsub.service';
-import {SendToClientPubSubMessage} from '@/modules/api/websocket/interfaces/pubsub';
-import {WebsocketService} from '@/modules/api/websocket/websocket.service';
-import {OnWsClose} from '@/modules/api/websocket/interfaces/utils';
-import {WsDataService} from '@/modules/api/websocket/ws.data.service';
-import {WsExceptionFilter} from '@/modules/api/websocket/ws.exception.filter';
-import {MessageService} from '@/modules/api/websocket/message.service';
+  SyncHistoryOutMessage,
+} from "@/data/types/frontend";
+import {SubscribePuBSub} from "@/modules/rest/pubsub/pubsub.service";
+import {SendToClientPubSubMessage} from "@/modules/api/websocket/interfaces/pubsub";
+import {WebsocketService} from "@/modules/api/websocket/websocket.service";
+import type {OnWsClose} from "@/modules/api/websocket/interfaces/utils";
+import {WsDataService} from "@/modules/api/websocket/ws.data.service";
+import {WsExceptionFilter} from "@/modules/api/websocket/ws.exception.filter";
+import {MessageService} from "@/modules/api/websocket/message.service";
 
 @WebSocketGateway({
-  path: '/ws'
+  path: "/ws",
 })
 @UseFilters(new WsExceptionFilter())
 export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
-
   @WebSocketServer()
   public readonly server!: Server;
 
@@ -51,39 +50,38 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
   ) {
   }
 
-  @SubscribeMessage('closeConnection')
+  @SubscribeMessage("closeConnection")
   public async closeConnection(@WsContext() context: WebSocketContextData) {
-    await this.websocketService.closeConnection(context)
+    await this.websocketService.closeConnection(context);
   }
 
   @CatchWsErrors
   async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) {
-    await this.websocketService.handleConnection(message.url, context, (socket as any)._socket.remoteAddress)
+    await this.websocketService.handleConnection(message.url, context, (socket as any)._socket.remoteAddress);
   }
 
-  @SubscribePuBSub('sendToClient')
+  @SubscribePuBSub("sendToClient")
   public sendToClient(ctx: WebSocketContextData, data: SendToClientPubSubMessage<any, any, any>) {
     ctx.sendToClient(data.body);
   }
 
-  @SubscribeMessage('syncHistory')
- public async  syncHistory(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context: WebSocketContextData): Promise<any> {
+  @SubscribeMessage("syncHistory")
+  public async syncHistory(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context: WebSocketContextData): Promise<any> {
     await this.messageService.syncHistory(data, context);
   }
 
-  @SubscribeMessage('printMessage')
-  public async  printMessage(@MessageBody() data: SyncHistoryOutMessage, @WsContext()  context: WebSocketContextData): Promise<any> {
+  @SubscribeMessage("printMessage")
+  public async printMessage(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context: WebSocketContextData): Promise<any> {
   }
 
-  @SubscribeMessage('showIType')
-  public async showIType(@MessageBody() data: ShowITypeWsOutMessage, @WsContext()  context: WebSocketContextData): Promise<void> {
+  @SubscribeMessage("showIType")
+  public async showIType(@MessageBody() data: ShowITypeWsOutMessage, @WsContext() context: WebSocketContextData): Promise<void> {
     await this.messageService.showIType(data, context);
   }
 
 
-  @SubscribeMessage('getCountryCode')
-  async getCountryCode(@MessageBody() data: GetCountryCodeWsOutMessage, @WsContext()  context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, 'handler'|'action'>> {
+  @SubscribeMessage("getCountryCode")
+  async getCountryCode(@MessageBody() data: GetCountryCodeWsOutMessage, @WsContext() context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, "action" | "handler">> {
     return this.wsDataService.getCountryCodes(context);
   }
-
 }
diff --git a/newback/src/modules/api/websocket/websocket.module.ts b/newback/src/modules/api/websocket/websocket.module.ts
index 7fee905fd..797e42191 100644
--- a/newback/src/modules/api/websocket/websocket.module.ts
+++ b/newback/src/modules/api/websocket/websocket.module.ts
@@ -3,21 +3,20 @@ import {
   Catch,
   ExceptionFilter,
   HttpException,
-  Module
-} from '@nestjs/common';
-import {RedisModule} from '@nestjs-modules/ioredis';
-import {config} from 'node-ts-config';
-import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {SessionService} from '@/modules/rest/session/session.service';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
-import {WebsocketService} from '@/modules/api/websocket/websocket.service';
-import {WsDataService} from '@/modules/api/websocket/ws.data.service';
-import {APP_FILTER} from '@nestjs/core';
-import {MessageService} from '@/modules/api/websocket/message.service';
-
+  Module,
+} from "@nestjs/common";
+import {RedisModule} from "@nestjs-modules/ioredis";
+import {config} from "node-ts-config";
+import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {SessionService} from "@/modules/rest/session/session.service";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {WebsocketService} from "@/modules/api/websocket/websocket.service";
+import {WsDataService} from "@/modules/api/websocket/ws.data.service";
+import {APP_FILTER} from "@nestjs/core";
+import {MessageService} from "@/modules/api/websocket/message.service";
 
 
 @Module({
@@ -33,15 +32,16 @@ import {MessageService} from '@/modules/api/websocket/message.service';
         SessionService,
         WsDataService,
         PasswordService,
-      ]
+      ],
     },
     RedisModule.forRoot({
       config: {
         host: config.redis.host,
         port: config.redis.port,
         db: config.redis.database,
-      }
-    })],
+      },
+    }),
+  ],
 })
 export class WebsocketModule {
 }
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index d14a5d494..9f8d65b71 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -1,27 +1,26 @@
 import {
   Injectable,
-  Logger
-} from '@nestjs/common';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {AddOnlineUserMessage} from '@/data/types/frontend';
-import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {SessionService} from '@/modules/rest/session/session.service';
-import {UserModel} from '@/data/model/user.model';
+  Logger,
+} from "@nestjs/common";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import type {AddOnlineUserMessage} from "@/data/types/frontend";
+import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {SessionService} from "@/modules/rest/session/session.service";
+import type {UserModel} from "@/data/model/user.model";
 import {
   getLogoutMessage,
   transformAddUserOnline,
-  transformSetWsId
-} from '@/modules/api/websocket/transformers/ws.transformer';
-import {WebSocketContextData} from '@/data/types/internal';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
+  transformSetWsId,
+} from "@/modules/api/websocket/transformers/ws.transformer";
+import type {WebSocketContextData} from "@/data/types/internal";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 
 
 @Injectable()
 export class WebsocketService {
-
   constructor(
     public readonly logger: Logger,
     private readonly sessionService: SessionService,
@@ -35,22 +34,22 @@ export class WebsocketService {
   }
 
   public async handleConnection(urlString: string, context: WebSocketContextData, ip: any) {
-    let url = new URLSearchParams(urlString);
-    let user: UserModel = await this.sessionService.getUserById(url.get('sessionId'));
-    let id = await this.passwordService.createWsId(user.id, url.get('id'));
+    const url = new URLSearchParams(urlString);
+    const user: UserModel = await this.sessionService.getUserById(url.get("sessionId"));
+    const id = await this.passwordService.createWsId(user.id, url.get("id"));
     context.userId = user.id;
     context.id = id;
     await this.ipCacheService.saveIp(user.id, ip);
-    await this.redisService.addOnline(id)
-    let online = await this.redisService.getOnline();
+    await this.redisService.addOnline(id);
+    const online = await this.redisService.getOnline();
 
-    let myRooms = await this.roomRepository.getRoomsForUser(user.id);
-    let channelIds = myRooms.map(r => r.channelId).filter(c => c)
-    let allUsersInTheseRooms = await this.roomRepository.getRoomUsers(myRooms.map(r => r.id));
-    let userIds: number[] = [...new Set(allUsersInTheseRooms.map(r => r.userId))];
-    let channels = await this.roomRepository.getAllChannels(channelIds);
-    let users: UserModel[] = await this.userRepository.getUsersById(userIds);
-    let response = transformSetWsId(
+    const myRooms = await this.roomRepository.getRoomsForUser(user.id);
+    const channelIds = myRooms.map((r) => r.channelId).filter((c) => c);
+    const allUsersInTheseRooms = await this.roomRepository.getRoomUsers(myRooms.map((r) => r.id));
+    const userIds: number[] = [...new Set(allUsersInTheseRooms.map((r) => r.userId))];
+    const channels = await this.roomRepository.getAllChannels(channelIds);
+    const users: UserModel[] = await this.userRepository.getUsersById(userIds);
+    const response = transformSetWsId(
       {
         id,
         allUsersInTheseRooms,
@@ -59,40 +58,40 @@ export class WebsocketService {
         users,
         user,
         channels,
-        time: Date.now()
+        time: Date.now(),
       }
-    )
+    );
 
-    let channelsToListen = [...myRooms.map(r => String(r.id)), id, `u${user.id}`, '*'];
-    this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`, 'ws');
-    context.sendToClient(response)
+    const channelsToListen = [...myRooms.map((r) => String(r.id)), id, `u${user.id}`, "*"];
+    this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`, "ws");
+    context.sendToClient(response);
     this.pubsubService.subscribe(context, ...channelsToListen);
-    let data: AddOnlineUserMessage = transformAddUserOnline(response.online, user, id);
+    const data: AddOnlineUserMessage = transformAddUserOnline(response.online, user, id);
     this.pubsubService.emit(
-      'sendToClient',
+      "sendToClient",
       {
         body: data,
       },
-      '*'
-    )
+      "*"
+    );
   }
 
   public async closeConnection(context: WebSocketContextData) {
     this.pubsubService.unsubscribe(context);
     if (context.id) {
-      await this.redisService.removeOnline(context.id)
+      await this.redisService.removeOnline(context.id);
     }
-    let online = await this.redisService.getOnline();
+    const online = await this.redisService.getOnline();
     if (context.userId && !online[context.userId]) {
-      let lastTimeOnline: number = Date.now();
+      const lastTimeOnline: number = Date.now();
       await this.userRepository.setLastTimeOnline(context.userId, lastTimeOnline);
       this.pubsubService.emit(
-        'sendToClient',
+        "sendToClient",
         {
           body: getLogoutMessage(online, lastTimeOnline, context, lastTimeOnline),
         },
-        '*'
-      )
+        "*"
+      );
     }
   }
 }
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index 59566d8d7..47c731f46 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -1,27 +1,26 @@
 import {
   Injectable,
-  Logger
-} from '@nestjs/common';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {
+  Logger,
+} from "@nestjs/common";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import type {
   GetCountryCodeWsInMessage,
-  LocationDto
-} from '@/data/types/frontend';
-import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {WebSocketContextData} from '@/data/types/internal';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
-import {ConfigService} from '@/modules/rest/config/config.service';
-import {ValidationException} from '@/data/exceptions/validation.exception';
-import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
-import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
+  LocationDto,
+} from "@/data/types/frontend";
+import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import type {WebSocketContextData} from "@/data/types/internal";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {ConfigService} from "@/modules/rest/config/config.service";
+import {ValidationException} from "@/data/exceptions/validation.exception";
+import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
+import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 
 
 @Injectable()
 export class WsDataService {
-
   constructor(
     public readonly logger: Logger,
     private readonly configService: ConfigService,
@@ -35,27 +34,26 @@ export class WsDataService {
   ) {
   }
 
-  public async getCountryCodes(context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, 'handler'| 'action'>> {
+  public async getCountryCodes(context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, "action" | "handler">> {
     if (!this.configService.getConfig().settings.flags) {
-      throw new ValidationException('Flags api is not enabled');
+      throw new ValidationException("Flags api is not enabled");
     }
-    let usersId: number[] = await this.roomRepository.usersForUser(context.userId);
-    let userInfo: UserJoinedInfoModel[] = await this.ipRepository.getIpInfosForUsers(usersId);
-    let content: GetCountryCodeWsInMessage['content'] =userInfo.reduce((previousValue, currentValue) => {
+    const usersId: number[] = await this.roomRepository.usersForUser(context.userId);
+    const userInfo: UserJoinedInfoModel[] = await this.ipRepository.getIpInfosForUsers(usersId);
+    const content: GetCountryCodeWsInMessage["content"] = userInfo.reduce((previousValue, currentValue) => {
       if (currentValue.ip) {
-        let value: LocationDto = {
+        const value: LocationDto = {
           country: currentValue.ip.country,
           region: currentValue.ip.region,
           city: currentValue.ip.city,
-          countryCode: currentValue.ip.countryCode
-        }
+          countryCode: currentValue.ip.countryCode,
+        };
         previousValue[currentValue.userId] = value;
       }
       return previousValue;
-    }, {})
+    }, {});
     return {
       content,
-    }
+    };
   }
-
 }
diff --git a/newback/src/modules/api/websocket/ws.exception.filter.ts b/newback/src/modules/api/websocket/ws.exception.filter.ts
index 327589d5f..2c91666b6 100644
--- a/newback/src/modules/api/websocket/ws.exception.filter.ts
+++ b/newback/src/modules/api/websocket/ws.exception.filter.ts
@@ -1,25 +1,27 @@
-import {
+import type {
   ArgumentsHost,
-  Catch,
   ExceptionFilter,
-  HttpException
-} from '@nestjs/common';
-import {WebSocket} from 'ws';
-import {GrowlMessage} from '@/data/types/frontend';
+  HttpException,
+} from "@nestjs/common";
+import {
+  Catch,
+} from "@nestjs/common";
+import type {WebSocket} from "ws";
+import type {GrowlMessage} from "@/data/types/frontend";
 
-@Catch(Error)  // if we provide it on module Websocket it will also affect http,so fuck it
-// since we can't decouple this from WebSocketGateway, it should be in this file
+@Catch(Error) // If we provide it on module Websocket it will also affect http,so fuck it
+// Since we can't decouple this from WebSocketGateway, it should be in this file
 export class WsExceptionFilter implements ExceptionFilter {
   catch(exception: HttpException, host: ArgumentsHost) {
-    let cbId = host.getArgByIndex(1)?.cbId;
+    const cbId = host.getArgByIndex(1)?.cbId;
     if (cbId) {
-      let response: GrowlMessage = {
-          cbId: cbId,
-          action: 'growlError',
-          content: exception.message,
-          handler: 'void',
-        }
-      let websocket: WebSocket = host.getArgByIndex(0);
+      const response: GrowlMessage = {
+        cbId,
+        action: "growlError",
+        content: exception.message,
+        handler: "void",
+      };
+      const websocket: WebSocket = host.getArgByIndex(0);
       websocket.send(response);
     } else {
       throw exception;
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 9155dd3e9..4a3ab8545 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -1,30 +1,31 @@
-import {Module} from '@nestjs/common';
-import {AuthModule} from '@/modules/api/auth/auth.module';
-import {LoggingInterceptor} from '@/modules/app/interceptors/logging.interceptor';
-import {APP_INTERCEPTOR} from '@nestjs/core';
-import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {RedisModule} from '@nestjs-modules/ioredis';
-import {config} from 'node-ts-config';
-import {ConfigModule} from '@/modules/rest/config/config.module';
-import {VerifyModule} from '@/modules/api/verify/verify.module';
-import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {WebsocketModule} from '@/modules/api/websocket/websocket.module';
+import {Module} from "@nestjs/common";
+import {AuthModule} from "@/modules/api/auth/auth.module";
+import {LoggingInterceptor} from "@/modules/app/interceptors/logging.interceptor";
+import {APP_INTERCEPTOR} from "@nestjs/core";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {RedisModule} from "@nestjs-modules/ioredis";
+import {config} from "node-ts-config";
+import {ConfigModule} from "@/modules/rest/config/config.module";
+import {VerifyModule} from "@/modules/api/verify/verify.module";
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {WebsocketModule} from "@/modules/api/websocket/websocket.module";
 
 
-// import {
-//   ArgumentsHost,
-//   Catch,
-//   ExceptionFilter,
-//   HttpException
-// } from '@nestjs/common';
-//
-// @Catch(Error)
-// export class HttpExceptionFilter implements ExceptionFilter {
-//   catch(exception: HttpException, host: ArgumentsHost) {
-//     throw  exception;
-//   }
-// }
-
+/*
+ * Import {
+ *   ArgumentsHost,
+ *   Catch,
+ *   ExceptionFilter,
+ *   HttpException
+ * } from '@nestjs/common';
+ *
+ * @Catch(Error)
+ * export class HttpExceptionFilter implements ExceptionFilter {
+ *   catch(exception: HttpException, host: ArgumentsHost) {
+ *     throw  exception;
+ *   }
+ * }
+ */
 
 
 @Module({
@@ -40,8 +41,9 @@ import {WebsocketModule} from '@/modules/api/websocket/websocket.module';
         host: config.redis.host,
         port: config.redis.port,
         db: config.redis.database,
-      }
-    })],
+      },
+    }),
+  ],
   providers: [
     {
       provide: APP_INTERCEPTOR,
diff --git a/newback/src/modules/app/guards/captcha.guard.ts b/newback/src/modules/app/guards/captcha.guard.ts
index 428e77443..ece98eb35 100644
--- a/newback/src/modules/app/guards/captcha.guard.ts
+++ b/newback/src/modules/app/guards/captcha.guard.ts
@@ -1,14 +1,14 @@
+import type {CanActivate,
+  ExecutionContext} from "@nestjs/common";
 import {
   BadRequestException,
-  CanActivate,
-  ExecutionContext,
   Injectable,
   Logger,
   UnauthorizedException,
-} from '@nestjs/common';
+} from "@nestjs/common";
 
-import {ConfigService} from '@/modules/rest/config/config.service';
-import {HttpService} from '@/modules/rest/http/http.service';
+import {ConfigService} from "@/modules/rest/config/config.service";
+import {HttpService} from "@/modules/rest/http/http.service";
 
 @Injectable()
 export class CaptchaGuard implements CanActivate {
@@ -25,19 +25,19 @@ export class CaptchaGuard implements CanActivate {
     if (!this.configService.getConfig().recaptcha) {
       return true;
     }
-    let captcha = context.switchToHttp().getRequest()?.body?.captcha;
-    let ip = context.switchToHttp().getRequest()?.ip
+    const captcha = context.switchToHttp().getRequest()?.body?.captcha;
+    const ip = context.switchToHttp().getRequest()?.ip;
     if (!captcha) {
       throw new BadRequestException("Captcha is missing");
     }
 
-    let response = await this.httpService.postUrlEncoded("https://www.google.com/recaptcha/api/siteverify", {
+    const response = await this.httpService.postUrlEncoded("https://www.google.com/recaptcha/api/siteverify", {
       secret: this.configService.getConfig().recaptcha.privateKey,
       response: captcha,
-      remoteip: ip
+      remoteip: ip,
     });
     if (!response.success) {
-      throw new UnauthorizedException(response && response['error-codes'] ? `Captcha error: ${response['error-codes'][0]}` : 'Unable to validate captcha');
+      throw new UnauthorizedException(response && response["error-codes"] ? `Captcha error: ${response["error-codes"][0]}` : "Unable to validate captcha");
     }
     return true;
   }
diff --git a/newback/src/modules/app/interceptors/logging.interceptor.ts b/newback/src/modules/app/interceptors/logging.interceptor.ts
index c6219357a..62d89a8bd 100644
--- a/newback/src/modules/app/interceptors/logging.interceptor.ts
+++ b/newback/src/modules/app/interceptors/logging.interceptor.ts
@@ -1,20 +1,21 @@
-import {
+import type {
   CallHandler,
   ExecutionContext,
+  NestInterceptor,
+} from "@nestjs/common";
+import {
   Injectable,
   Logger,
-  NestInterceptor
-} from '@nestjs/common';
+} from "@nestjs/common";
+import type {Observable} from "rxjs";
 import {
-  Observable,
   tap,
-  throwError
-} from 'rxjs';
-import {catchError} from 'rxjs/operators';
+  throwError,
+} from "rxjs";
+import {catchError} from "rxjs/operators";
 
 @Injectable()
 export class LoggingInterceptor implements NestInterceptor {
-
   private id: number = 0;
 
   constructor(private readonly logger: Logger) {
@@ -22,17 +23,17 @@ export class LoggingInterceptor implements NestInterceptor {
   }
 
   public intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
-    let request = context.switchToHttp().getRequest();
-    let thisId = this.id++;
+    const request = context.switchToHttp().getRequest();
+    const thisId = this.id++;
     if (request.body) {
-      this.logger.debug(`Request[${thisId}]: body=${JSON.stringify(request.body)}, headers=${JSON.stringify(request.headers)}`, 'http');
+      this.logger.debug(`Request[${thisId}]: body=${JSON.stringify(request.body)}, headers=${JSON.stringify(request.headers)}`, "http");
     }
     return next.handle().pipe(tap((responseBody) => {
-      this.logger.debug(`Response[${thisId}]: body=${JSON.stringify(responseBody)}`, 'Http')
-    })).pipe(catchError(err => {
-      this.logger.error(`Response[${thisId}]]: err='${err.message}', body=${JSON.stringify(err.response)}`, err.stack, 'http');
-      return throwError(err)
-    }));
+      this.logger.debug(`Response[${thisId}]: body=${JSON.stringify(responseBody)}`, "Http");
+    })).
+      pipe(catchError((err) => {
+        this.logger.error(`Response[${thisId}]]: err='${err.message}', body=${JSON.stringify(err.response)}`, err.stack, "http");
+        return throwError(err);
+      }));
   }
-
 }
diff --git a/newback/src/modules/rest/config/config.module.ts b/newback/src/modules/rest/config/config.module.ts
index 0a3a6e7e3..eb1e8a649 100644
--- a/newback/src/modules/rest/config/config.module.ts
+++ b/newback/src/modules/rest/config/config.module.ts
@@ -1,17 +1,19 @@
 import {
   Global,
-  Module
-} from '@nestjs/common';
-import {ConfigService} from '@/modules/rest/config/config.service';
-import {config} from 'node-ts-config';
+  Module,
+} from "@nestjs/common";
+import {ConfigService} from "@/modules/rest/config/config.service";
+import {config} from "node-ts-config";
 
 @Global()
 @Module({
-  providers: [{
-    provide: ConfigService,
-    useFactory: () => new ConfigService(config)
-  }],
-  exports: [ConfigService]
+  providers: [
+    {
+      provide: ConfigService,
+      useFactory: () => new ConfigService(config),
+    },
+  ],
+  exports: [ConfigService],
 })
 export class ConfigModule {
 }
diff --git a/newback/src/modules/rest/config/config.service.ts b/newback/src/modules/rest/config/config.service.ts
index ff95e278c..7cf20b197 100644
--- a/newback/src/modules/rest/config/config.service.ts
+++ b/newback/src/modules/rest/config/config.service.ts
@@ -1,14 +1,12 @@
-import {Injectable} from '@nestjs/common';
-import type {config as Blah} from 'node-ts-config';
+import {Injectable} from "@nestjs/common";
+import type {config as Blah} from "node-ts-config";
 
 @Injectable()
 export class ConfigService {
-
   constructor(private readonly config: typeof Blah) {
   }
 
   public getConfig(): typeof Blah {
     return this.config;
   }
-
 }
diff --git a/newback/src/modules/rest/database/database.module.ts b/newback/src/modules/rest/database/database.module.ts
index 894e9cb12..e05ba2897 100644
--- a/newback/src/modules/rest/database/database.module.ts
+++ b/newback/src/modules/rest/database/database.module.ts
@@ -1,30 +1,30 @@
-import {Module} from '@nestjs/common';
-import {SequelizeModule} from '@nestjs/sequelize';
+import {Module} from "@nestjs/common";
+import {SequelizeModule} from "@nestjs/sequelize";
 
-import {generateOrmConfig} from '@/utils/helpers';
-import {ChannelModel} from '@/data/model/channel.model';
-import {ImageModel} from '@/data/model/image.model';
-import {IpAddressModel} from '@/data/model/ip.address.model';
-import {MessageHistoryModel} from '@/data/model/message.history.model';
-import {MessageModel} from '@/data/model/message.model';
-import {RoomModel} from '@/data/model/room.model';
-import {RoomUsersModel} from '@/data/model/room.users.model';
-import {MessageMentionModel} from '@/data/model/message.mention.model';
-import {SubscriptionMessageModel} from '@/data/model/subscription.message.model';
-import {SubscriptionModel} from '@/data/model/subscription.model';
-import {UploadedFileModel} from '@/data/model/uploaded.file.model';
-import {UserAuthModel} from '@/data/model/user.auth.model';
-import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
-import {UserModel} from '@/data/model/user.model';
-import {UserProfileModel} from '@/data/model/user.profile.model';
-import {UserSettingsModel} from '@/data/model/user.settings.model';
-import {VerificationModel} from '@/data/model/verification.model';
-import {Logger} from '@nestjs/common/services/logger.service';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {RoomRepository} from '@/modules/rest/database/repository/room.repository';
-import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
-import {VerificationRepository} from '@/modules/rest/database/repository/verification.repository';
-import {MessageRepository} from '@/modules/rest/database/repository/messages.repository';
+import {generateOrmConfig} from "@/utils/helpers";
+import {ChannelModel} from "@/data/model/channel.model";
+import {ImageModel} from "@/data/model/image.model";
+import {IpAddressModel} from "@/data/model/ip.address.model";
+import {MessageHistoryModel} from "@/data/model/message.history.model";
+import {MessageModel} from "@/data/model/message.model";
+import {RoomModel} from "@/data/model/room.model";
+import {RoomUsersModel} from "@/data/model/room.users.model";
+import {MessageMentionModel} from "@/data/model/message.mention.model";
+import {SubscriptionMessageModel} from "@/data/model/subscription.message.model";
+import {SubscriptionModel} from "@/data/model/subscription.model";
+import {UploadedFileModel} from "@/data/model/uploaded.file.model";
+import {UserAuthModel} from "@/data/model/user.auth.model";
+import {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
+import {UserModel} from "@/data/model/user.model";
+import {UserProfileModel} from "@/data/model/user.profile.model";
+import {UserSettingsModel} from "@/data/model/user.settings.model";
+import {VerificationModel} from "@/data/model/verification.model";
+import {Logger} from "@nestjs/common/services/logger.service";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
+import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
+import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
+import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
 
 const repositories = [
   UserRepository,
@@ -38,7 +38,9 @@ const repositories = [
   imports: [
     SequelizeModule.forRootAsync({
       inject: [Logger],
-      useFactory: (logger: Logger) => generateOrmConfig((sql) => sql.length > 2000 ? logger.verbose(sql, 'sql'): logger.debug(sql, 'sql')),
+      useFactory: (logger: Logger) => generateOrmConfig((sql) => {
+        sql.length > 2000 ? logger.verbose(sql, "sql") : logger.debug(sql, "sql");
+      }),
     }),
     SequelizeModule.forFeature([
       ChannelModel,
diff --git a/newback/src/modules/rest/database/repository/ip.repository.ts b/newback/src/modules/rest/database/repository/ip.repository.ts
index a5f253396..eecd03d67 100644
--- a/newback/src/modules/rest/database/repository/ip.repository.ts
+++ b/newback/src/modules/rest/database/repository/ip.repository.ts
@@ -1,8 +1,8 @@
-import {Injectable} from '@nestjs/common';
-import {InjectModel} from '@nestjs/sequelize';
-import {IpAddressModel} from '@/data/model/ip.address.model';
-import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
-import {Op} from 'sequelize';
+import {Injectable} from "@nestjs/common";
+import {InjectModel} from "@nestjs/sequelize";
+import {IpAddressModel} from "@/data/model/ip.address.model";
+import {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
+import {Op} from "sequelize";
 
 
 @Injectable()
@@ -14,7 +14,8 @@ export class IpRepository {
   }
 
   public async saveIpToUser(userId: number, ipId: number) {
-    await this.userJoinedInfoModel.upsert({userId, ipId},);
+    await this.userJoinedInfoModel.upsert({userId,
+      ipId},);
   }
 
   public async saveIP(model: Partial<IpAddressModel>) {
@@ -24,21 +25,21 @@ export class IpRepository {
   public async getIp(ip: string): Promise<IpAddressModel> {
     return this.ipAddressModel.findOne({
       where: {
-        ip
+        ip,
       },
-      raw: true
+      raw: true,
     });
   }
 
   public async getIpInfosForUsers(userIds: number[]): Promise<UserJoinedInfoModel[]> {
-     return this.userJoinedInfoModel.findAll({
-        where: {
-          userId: {
-            [Op.in]: userIds,
-          }
+    return this.userJoinedInfoModel.findAll({
+      where: {
+        userId: {
+          [Op.in]: userIds,
         },
-        raw: true,
-        include: ['ip']
-      })
+      },
+      raw: true,
+      include: ["ip"],
+    });
   }
 }
diff --git a/newback/src/modules/rest/database/repository/room.repository.ts b/newback/src/modules/rest/database/repository/room.repository.ts
index 4f941946c..3afe37b2d 100644
--- a/newback/src/modules/rest/database/repository/room.repository.ts
+++ b/newback/src/modules/rest/database/repository/room.repository.ts
@@ -1,14 +1,16 @@
-import {Injectable} from '@nestjs/common';
-import {InjectModel} from '@nestjs/sequelize';
-import {RoomModel} from '@/data/model/room.model';
-import {RoomUsersModel} from '@/data/model/room.users.model';
+import {Injectable} from "@nestjs/common";
+import {InjectModel} from "@nestjs/sequelize";
+import {RoomModel} from "@/data/model/room.model";
+import {RoomUsersModel} from "@/data/model/room.users.model";
+import type {
+  Transaction,
+} from "sequelize";
 import {
   Op,
-  Transaction
-} from 'sequelize';
-import {ChannelModel} from '@/data/model/channel.model';
+} from "sequelize";
+import {ChannelModel} from "@/data/model/channel.model";
 
-type RoomSingleRoomUser = Omit<RoomModel, 'roomUsers'>;
+type RoomSingleRoomUser = Omit<RoomModel, "roomUsers">;
 
 export interface GetRoomsForUser extends RoomSingleRoomUser {
   roomUsers: RoomUsersModel;
@@ -28,65 +30,71 @@ export class RoomRepository {
       roomId,
       userId,
       notifications: false,
-    }, {transaction, raw: true})
+    }, {transaction,
+      raw: true});
   }
 
   public async getAllChannels(ids: number[]): Promise<ChannelModel[]> {
-    return await this.channelsModel.findAll({
+    return this.channelsModel.findAll({
       where: {
         id: {
           [Op.in]: ids,
-        }
-      }
+        },
+      },
     });
   }
 
   public async usersForUser(userId: number): Promise<number[]> {
-    let myRoomIds = await this.roomUsersModel.findAll({
+    const myRoomIds = await this.roomUsersModel.findAll({
       where: {
-        userId
+        userId,
       },
-      attributes: ['roomId']
+      attributes: ["roomId"],
     });
-    let ru = await this.roomUsersModel.findAll({
+    const ru = await this.roomUsersModel.findAll({
       where: {
         roomId: {
-          [Op.in]: myRoomIds.map(r => r.roomId)
-        }
+          [Op.in]: myRoomIds.map((r) => r.roomId),
+        },
       },
-      attributes: ['userId']
+      attributes: ["userId"],
     });
-    return ru.map(ru => ru.userId);
+    return ru.map((ru) => ru.userId);
   }
 
-  public async getRoomUsers(roomIds: number[]): Promise<Pick<RoomUsersModel, 'roomId' | 'userId'>[]> {
-    // we should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
+  public async getRoomUsers(roomIds: number[]): Promise<Pick<RoomUsersModel, "roomId" | "userId">[]> {
+    // We should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
     return this.roomUsersModel.findAll({
       where: {
         roomId: {
           [Op.in]: roomIds,
-        }
+        },
       },
       raw: true,
-      attributes: ['userId', 'roomId']
+      attributes: ["userId", "roomId"],
     });
   }
 
 
   public async getRoomsForUser(userId: number): Promise<GetRoomsForUser[]> {
-    // we should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
+    // We should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
     return await this.roomModel.findAll({
       raw: true,
-      include: [{
-        association: 'roomUsers',
-        where: {
-          userId: userId
-        }
-      }],
+      include: [
+        {
+          association: "roomUsers",
+          where: {
+            userId,
+          },
+        },
+      ],
     }) as any as GetRoomsForUser[];
-    //     FROM `room` AS `RoomModel`
-    //          INNER JOIN `room_user` AS `roomUsers` ON `RoomModel`.`id` = `roomUsers`.`room_id` AND
-    //                                                   (`roomUsers`.`deleted_at` IS NULL AND `roomUsers`.`user_id` = 2)
-    // WHERE (`RoomModel`.`deleted_at` IS NULL);
+
+    /*
+     *     FROM `room` AS `RoomModel`
+     *          INNER JOIN `room_user` AS `roomUsers` ON `RoomModel`.`id` = `roomUsers`.`room_id` AND
+     *                                                   (`roomUsers`.`deleted_at` IS NULL AND `roomUsers`.`user_id` = 2)
+     * WHERE (`RoomModel`.`deleted_at` IS NULL);
+     */
   }
 }
diff --git a/newback/src/modules/rest/database/repository/user.repository.ts b/newback/src/modules/rest/database/repository/user.repository.ts
index 4d090bff6..5dd96030a 100644
--- a/newback/src/modules/rest/database/repository/user.repository.ts
+++ b/newback/src/modules/rest/database/repository/user.repository.ts
@@ -1,14 +1,16 @@
-import {Injectable} from '@nestjs/common';
-import {InjectModel} from '@nestjs/sequelize';
-import {UserModel} from '@/data/model/user.model';
-import {UserAuthModel} from '@/data/model/user.auth.model';
-import {Gender} from '@/data/types/frontend';
-import {UserProfileModel} from '@/data/model/user.profile.model';
-import {UserSettingsModel} from '@/data/model/user.settings.model';
+import {Injectable} from "@nestjs/common";
+import {InjectModel} from "@nestjs/sequelize";
+import {UserModel} from "@/data/model/user.model";
+import {UserAuthModel} from "@/data/model/user.auth.model";
+import type {Gender} from "@/data/types/frontend";
+import {UserProfileModel} from "@/data/model/user.profile.model";
+import {UserSettingsModel} from "@/data/model/user.settings.model";
+import type {
+  Transaction,
+} from "sequelize";
 import {
   Op,
-  Transaction
-} from 'sequelize';
+} from "sequelize";
 
 
 @Injectable()
@@ -25,7 +27,7 @@ export class UserRepository {
     await this.userAuthModel.update({password}, {
       where: {id: userId},
       transaction,
-    })
+    });
   }
 
   public async createUser(data: {
@@ -39,63 +41,67 @@ export class UserRepository {
     googleId?: string;
     facebookId?: string;
   }, transaction: Transaction): Promise<number> {
-    let userModel = await this.userModel.create({
+    const userModel = await this.userModel.create({
       username: data.username,
       lastTimeOnline: Date.now(),
       sex: data.sex,
-      thumbnail: data.thumbnail
-    }, {transaction, raw: true,})
+      thumbnail: data.thumbnail,
+    }, {transaction,
+      raw: true});
     await Promise.all([
       this.userProfileModel.create({
         id: userModel.id,
-      }, {transaction, raw: true,}),
+      }, {transaction,
+        raw: true}),
       this.userAuthModel.create({
         password: data.password,
         email: data.email,
         id: userModel.id,
         googleId: data.googleId,
         facebookId: data.facebookId,
-      }, {transaction, raw: true,}),
+      }, {transaction,
+        raw: true}),
       this.userSettingsModel.create({
-        id: userModel.id
-      }, {transaction, raw: true,})
-    ])
+        id: userModel.id,
+      }, {transaction,
+        raw: true}),
+    ]);
     return userModel.id;
   }
 
   public async getUserMyAuthGoogle(googleId: string, transaction: Transaction): Promise<UserAuthModel> {
     return this.userAuthModel.findOne({
       where: {
-        googleId
+        googleId,
       },
       raw: true,
-      transaction
-    })
+      transaction,
+    });
   }
 
   public async getUserMyAuthFacebook(facebookId: string, transaction: Transaction): Promise<UserAuthModel> {
     return this.userAuthModel.findOne({
       where: {
-        facebookId
+        facebookId,
       },
       raw: true,
-      transaction
-    })
+      transaction,
+    });
   }
 
   public async checkUserExistByUserName(username: string, transaction?: Transaction): Promise<boolean> {
     return await this.userModel.findOne({
       where: {username},
       raw: true,
-      transaction
-    }) != null
+      transaction,
+    }) != null;
   }
 
   public async checkUserExistByEmail(email: string): Promise<boolean> {
     return await this.userAuthModel.findOne({
       where: {email},
       raw: true,
-    }) != null
+    }) != null;
   }
 
   public async getUserByEmail(email: string, transaction?: Transaction): Promise<UserAuthModel | null> {
@@ -103,31 +109,30 @@ export class UserRepository {
       where: {email},
       raw: true,
       transaction,
-      include: [
-        'user', // LEFT OUTER JOIN "id" = "user"."id"
+      include: ["user", // LEFT OUTER JOIN "id" = "user"."id"
       ],
-    })
+    });
   }
 
-  public async getUserByUserName(username: string, includeFields: ('userAuth' | 'userProfile')[] = [], transaction?: Transaction): Promise<UserModel | null> {
+  public async getUserByUserName(username: string, includeFields: ("userAuth" | "userProfile")[] = [], transaction?: Transaction): Promise<UserModel | null> {
     return this.userModel.findOne({
       where: {username},
       transaction,
       raw: true,
       include: includeFields,
-    })
+    });
   }
 
-  public async getById(id: number, includeFields: ('userAuth' | 'userProfile'| 'userSettings')[] = [], transaction?: Transaction): Promise<UserModel | null> {
+  public async getById(id: number, includeFields: ("userAuth" | "userProfile" | "userSettings")[] = [], transaction?: Transaction): Promise<UserModel | null> {
     return this.userModel.findOne({
       where: {id},
       transaction,
       raw: true,
       include: includeFields,
-    })
+    });
   }
 
-  public async getUsersById(ids: number[], includeFields: ('userAuth' | 'userProfile' | 'userSettings')[] = []) {
+  public async getUsersById(ids: number[], includeFields: ("userAuth" | "userProfile" | "userSettings")[] = []) {
     return this.userModel.findAll({
       where: {
         id: {
@@ -136,16 +141,16 @@ export class UserRepository {
       },
       raw: true,
       include: includeFields,
-    })
+    });
   }
 
   public async setLastTimeOnline(userId: number, lastTimeOnline: number) {
     await this.userModel.update({
-      lastTimeOnline
+      lastTimeOnline,
     }, {
       where: {
-        id: userId
-      }
-    })
+        id: userId,
+      },
+    });
   }
 }
diff --git a/newback/src/modules/rest/database/repository/verification.repository.ts b/newback/src/modules/rest/database/repository/verification.repository.ts
index 3b3703359..bd44198fd 100644
--- a/newback/src/modules/rest/database/repository/verification.repository.ts
+++ b/newback/src/modules/rest/database/repository/verification.repository.ts
@@ -1,9 +1,9 @@
-import {Injectable} from '@nestjs/common';
-import {InjectModel} from '@nestjs/sequelize';
-import {UserAuthModel} from '@/data/model/user.auth.model';
-import {VerificationType} from '@/data/types/frontend';
-import {VerificationModel} from '@/data/model/verification.model';
-import {Transaction} from 'sequelize';
+import {Injectable} from "@nestjs/common";
+import {InjectModel} from "@nestjs/sequelize";
+import {UserAuthModel} from "@/data/model/user.auth.model";
+import type {VerificationType} from "@/data/types/frontend";
+import {VerificationModel} from "@/data/model/verification.model";
+import type {Transaction} from "sequelize";
 
 
 @Injectable()
@@ -17,36 +17,36 @@ export class VerificationRepository {
   public async markVerificationVerified(id: number, transaction: Transaction) {
     await this.verificationModel.update({verified: true}, {
       where: {id},
-      transaction
-    })
+      transaction,
+    });
   }
 
   public async setUserVerification(userId: number, emailVerificationId: number, transaction: Transaction) {
     await this.userAuthModel.update({emailVerificationId}, {
       where: {id: userId},
-      transaction
-    })
+      transaction,
+    });
   }
 
 
   public async getVerification(token: string, transaction?: Transaction): Promise<VerificationModel> {
-    return await this.verificationModel.findOne({
+    return this.verificationModel.findOne({
       where: {token},
-      include: ['user'],
+      include: ["user"],
       raw: true,
-      transaction
+      transaction,
     });
   }
 
   public async createVerification(email: string, userId: number, token: string, type: VerificationType, transaction: Transaction): Promise<void> {
-    let verification = await this.verificationModel.create({
+    const verification = await this.verificationModel.create({
       type,
       email,
       userId,
       token,
     }, {
       raw: true,
-      transaction
+      transaction,
     });
     await this.userAuthModel.update({
       emailVerificationId: verification.id,
@@ -54,8 +54,7 @@ export class VerificationRepository {
       where: {
         id: userId,
       },
-      transaction
-    })
+      transaction,
+    });
   }
-
 }
diff --git a/newback/src/modules/rest/email/email.module.ts b/newback/src/modules/rest/email/email.module.ts
index c70a51f84..650d0934f 100644
--- a/newback/src/modules/rest/email/email.module.ts
+++ b/newback/src/modules/rest/email/email.module.ts
@@ -1,30 +1,32 @@
-import {Module} from '@nestjs/common';
+import {Module} from "@nestjs/common";
 import {
   MailerModule,
-  MailerService
-} from '@nestjs-modules/mailer';
-import {config} from 'node-ts-config';
-import {EmailService} from '@/modules/rest/email/email.service';
-import {HtmlService} from '@/modules/rest/html/html.service';
+  MailerService,
+} from "@nestjs-modules/mailer";
+import {config} from "node-ts-config";
+import {EmailService} from "@/modules/rest/email/email.service";
+import {HtmlService} from "@/modules/rest/html/html.service";
 
 
 @Module({
   imports: [
-    ...(config.email ? [MailerModule.forRoot({
-      transport: config.email as any
-    })] : [])
+    ...config.email ? [
+      MailerModule.forRoot({
+        transport: config.email as any,
+      }),
+    ] : [],
   ],
   providers: [
-    ...(!config.email ? [{
-      provide: MailerService,
-      useValue: null
-    }]: []),
+    ...!config.email ? [
+      {
+        provide: MailerService,
+        useValue: null,
+      },
+    ] : [],
     EmailService,
-    HtmlService
+    HtmlService,
   ],
-  exports: [
-    EmailService
-  ]
+  exports: [EmailService],
 })
 export class EmailModule {
 }
diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
index 54488f701..6221ffedc 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -1,92 +1,94 @@
-import {HtmlService} from '@/modules/rest/html/html.service';
-import {EmailService} from '@/modules/rest/email/email.service';
+import {HtmlService} from "@/modules/rest/html/html.service";
+import {EmailService} from "@/modules/rest/email/email.service";
+import type {
+  TestingModule,
+} from "@nestjs/testing";
 import {
   Test,
-  TestingModule
-} from '@nestjs/testing';
-import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {MailerService} from '@nestjs-modules/mailer';
+} from "@nestjs/testing";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {MailerService} from "@nestjs-modules/mailer";
 
-import {promisify} from 'util';
-import {readFile} from 'fs';
-import {resolve} from 'path';
-import {ConsoleLogger} from '@nestjs/common';
-import {ConfigService} from '@/modules/rest/config/config.service';
-import {config} from 'node-ts-config';
-
-describe('EmailSenderService', () => {
+import {promisify} from "util";
+import {readFile} from "fs";
+import {resolve} from "path";
+import {ConsoleLogger} from "@nestjs/common";
+import {ConfigService} from "@/modules/rest/config/config.service";
+import {config} from "node-ts-config";
 
+describe("EmailSenderService", () => {
   let sender: EmailService;
   let moduleFixture: TestingModule;
   let mailer: MailerService;
-  let configService: ConfigService = {} as ConfigService;
+  const configService: ConfigService = {} as ConfigService;
   beforeAll(
     async() => {
-
       moduleFixture = await Test.createTestingModule({
-        imports: [
-          LoggerModule,
-        ],
+        imports: [LoggerModule],
         providers: [
-           {
-          provide: ConfigService,
-          useValue: configService,
-        },
+          {
+            provide: ConfigService,
+            useValue: configService,
+          },
           {
             provide: MailerService,
-            useValue: {sendMail: () => jest.fn().mockResolvedValue(undefined)}
+            useValue: {sendMail: () => jest.fn().mockResolvedValue(undefined)},
           },
           HtmlService,
           EmailService,
-        ]
-      }).setLogger(new ConsoleLogger())
-        .compile();
+        ],
+      }).setLogger(new ConsoleLogger()).
+        compile();
       sender = moduleFixture.get(EmailService);
       mailer = moduleFixture.get(MailerService);
-    })
+    }
+  );
   afterAll(async() => {
-    await moduleFixture.close()
-  })
+    await moduleFixture.close();
+  });
 
   beforeAll(() => {
-    configService.getConfig = jest.fn().mockReturnValue(config)
+    configService.getConfig = jest.fn().mockReturnValue(config);
     jest.clearAllMocks();
-  })
+  });
 
-  describe('sendRestorePasswordEmail', () => {
-    it('time should always be UTC', () => { // https://stackoverflow.com/a/56482581/3872976
-      // test below depends on new date to return specific time
-      // we mock it with jest, but it still depends on machine timezone so we need to ensure tz is same
-      // jest.setup.js fixes it
+  describe("sendRestorePasswordEmail", () => {
+    it("time should always be UTC", () => { // https://stackoverflow.com/a/56482581/3872976
+      /*
+       * Test below depends on new date to return specific time
+       * we mock it with jest, but it still depends on machine timezone so we need to ensure tz is same
+       * jest.setup.js fixes it
+       */
       expect(new Date().getTimezoneOffset()).toBe(0);
     });
-    it('should render an email', async() => {
-       configService.getConfig = jest.fn().mockReturnValue({...config, email: {}})
-      let spy = jest.spyOn(mailer, 'sendMail');
-      jest.useFakeTimers('modern');
+    it("should render an email", async() => {
+      configService.getConfig = jest.fn().mockReturnValue({...config,
+        email: {}});
+      const spy = jest.spyOn(mailer, "sendMail");
+      jest.useFakeTimers("modern");
       jest.setSystemTime(new Date(2020, 3, 1));
-      await sender.sendRestorePasswordEmail('a', 3, 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
-      const content = await promisify(readFile)(resolve(__dirname, '..', '..', '..', 'fixtures', 'rendered.send.restore.password.html'), 'utf-8');
+      await sender.sendRestorePasswordEmail("a", 3, "a@a", "sfsd", "192.168.1.1", "Chernihiv");
+      const content = await promisify(readFile)(resolve(__dirname, "..", "..", "..", "fixtures", "rendered.send.restore.password.html"), "utf-8");
       expect(spy).toHaveBeenCalledWith(expect.objectContaining({
         html: content,
-        "subject": "Reset pychat password",
-        "text": expect.any(String)
-      }))
+        subject: "Reset pychat password",
+        text: expect.any(String),
+      }));
     });
   });
 
-  describe('sendSignUpEmail', () => {
-    it('should render', async() => {
-      let spy = jest.spyOn(mailer, 'sendMail');
-      jest.useFakeTimers('modern');
+  describe("sendSignUpEmail", () => {
+    it("should render", async() => {
+      const spy = jest.spyOn(mailer, "sendMail");
+      jest.useFakeTimers("modern");
       jest.setSystemTime(new Date(2020, 3, 1));
-      await sender.sendSignUpEmail('a', 3, 'a@a', 'sfsd', '192.168.1.1', 'Chernihiv');
-      const content = await promisify(readFile)(resolve(__dirname, '..', '..', '..', 'fixtures', 'send.sign.up.email.html'), 'utf-8');
+      await sender.sendSignUpEmail("a", 3, "a@a", "sfsd", "192.168.1.1", "Chernihiv");
+      const content = await promisify(readFile)(resolve(__dirname, "..", "..", "..", "fixtures", "send.sign.up.email.html"), "utf-8");
       expect(spy).toHaveBeenCalledWith(expect.objectContaining({
         html: content,
-        "subject": "Confirm Pychat registration",
-        "text": expect.any(String)
-      }))
+        subject: "Confirm Pychat registration",
+        text: expect.any(String),
+      }));
     });
   });
 });
diff --git a/newback/src/modules/rest/email/email.service.ts b/newback/src/modules/rest/email/email.service.ts
index fd1759ee7..2596bf897 100644
--- a/newback/src/modules/rest/email/email.service.ts
+++ b/newback/src/modules/rest/email/email.service.ts
@@ -1,10 +1,10 @@
 import {
   Injectable,
-  Logger
-} from '@nestjs/common';
-import {HtmlService} from '@/modules/rest/html/html.service';
-import {MailerService} from '@nestjs-modules/mailer';
-import {ConfigService} from '@/modules/rest/config/config.service';
+  Logger,
+} from "@nestjs/common";
+import {HtmlService} from "@/modules/rest/html/html.service";
+import {MailerService} from "@nestjs-modules/mailer";
+import {ConfigService} from "@/modules/rest/config/config.service";
 
 @Injectable()
 export class EmailService {
@@ -17,43 +17,42 @@ export class EmailService {
   }
 
   public async sendRestorePasswordEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
-    let context = {
+    const context = {
       username,
       timeCreated: (new Date() as any).toGMTString(),
       magicLink: `${this.configService.getConfig().frontend.address}/#/auth/proceed-reset-password?token=${token}`,
       ip,
       site: this.configService.getConfig().frontend.address,
-      ipInfo
+      ipInfo,
     };
-    await this.sendEmail('change.password.start', userId, email, 'Reset pychat password', context);
+    await this.sendEmail("change.password.start", userId, email, "Reset pychat password", context);
   }
 
   public async sendSignUpEmail(username: string, userId: number, email: string, token, ip: string, ipInfo: string) {
-    let context: Record<string, string> = {
+    const context: Record<string, string> = {
       issueReportLink: this.configService.getConfig().frontend.issueReportLink,
       magicLink: `${this.configService.getConfig().frontend.address}/#/confirm-email?token=${token}`,
       username,
       ip,
       timeCreated: (new Date() as any).toGMTString(),
-      ipInfo
+      ipInfo,
     };
-    await this.sendEmail('sign.up.email', userId, email, 'Confirm Pychat registration', context);
+    await this.sendEmail("sign.up.email", userId, email, "Confirm Pychat registration", context);
   }
 
   private async sendEmail(templateName: string, userId, email, subject: string, context: Record<string, string>) {
     if (!this.configService.getConfig().email) {
       this.loggerService.warn(`Email to userId ${userId} ${email} won't be sent since email settings is not set in config`);
-      return
+      return;
     }
-    let html = await this.htmlService.renderTemplate(`${templateName}.html`, context);
-    let text = await this.htmlService.renderTemplate(`${templateName}.txt`, context);
-    this.loggerService.log(`Sending email to userId ${userId} ${email}`)
+    const html = await this.htmlService.renderTemplate(`${templateName}.html`, context);
+    const text = await this.htmlService.renderTemplate(`${templateName}.txt`, context);
+    this.loggerService.log(`Sending email to userId ${userId} ${email}`);
     await this.mailerService.sendMail({
       to: email,
       html,
       text,
-      subject
-    })
+      subject,
+    });
   }
-
 }
diff --git a/newback/src/modules/rest/html/html.service.spec.ts b/newback/src/modules/rest/html/html.service.spec.ts
index 92d322ab6..e626ebf14 100644
--- a/newback/src/modules/rest/html/html.service.spec.ts
+++ b/newback/src/modules/rest/html/html.service.spec.ts
@@ -1,29 +1,29 @@
-import {HtmlService} from '@/modules/rest/html/html.service';
+import {HtmlService} from "@/modules/rest/html/html.service";
 
-describe('HtmlService', () => {
-
-  describe('replaceTemplate', () => {
-    it('should replace single param', () => {
-      let service = new HtmlService();
-      let result = service.replaceTemplate('aa {{ blah }} bbbb', {blah: 3})
-      expect(result).toEqual('aa 3 bbbb');
+describe("HtmlService", () => {
+  describe("replaceTemplate", () => {
+    it("should replace single param", () => {
+      const service = new HtmlService();
+      const result = service.replaceTemplate("aa {{ blah }} bbbb", {blah: 3});
+      expect(result).toEqual("aa 3 bbbb");
     });
 
-    it('should replace multiple params', () => {
-      let service = new HtmlService();
-      let result = service.replaceTemplate('aa {{ blah }} {{koko}}', {blah: 3, koko: 4})
-      expect(result).toEqual('aa 3 4');
+    it("should replace multiple params", () => {
+      const service = new HtmlService();
+      const result = service.replaceTemplate("aa {{ blah }} {{koko}}", {blah: 3,
+        koko: 4});
+      expect(result).toEqual("aa 3 4");
     });
 
-    it('should not fail when empty', () => {
-      let service = new HtmlService();
-      let result = service.replaceTemplate('aa', {})
-      expect(result).toEqual('aa');
+    it("should not fail when empty", () => {
+      const service = new HtmlService();
+      const result = service.replaceTemplate("aa", {});
+      expect(result).toEqual("aa");
     });
 
-    it('should throw an exception when param is missing', () => {
-      let service = new HtmlService();
-      expect(() => service.replaceTemplate('aa {{ adas }}', {blah: 4})).toThrow(Error("Unable to render template. 'adas' is missing in {\"blah\":4}"))
+    it("should throw an exception when param is missing", () => {
+      const service = new HtmlService();
+      expect(() => service.replaceTemplate("aa {{ adas }}", {blah: 4})).toThrow(Error("Unable to render template. 'adas' is missing in {\"blah\":4}"));
     });
   });
 });
diff --git a/newback/src/modules/rest/html/html.service.ts b/newback/src/modules/rest/html/html.service.ts
index 27aaa44f0..076d51654 100644
--- a/newback/src/modules/rest/html/html.service.ts
+++ b/newback/src/modules/rest/html/html.service.ts
@@ -1,25 +1,23 @@
-import {Injectable} from '@nestjs/common';
-import {readFile} from 'fs';
-import {promisify} from 'util';
+import {Injectable} from "@nestjs/common";
+import {readFile} from "fs";
+import {promisify} from "util";
 import {sep} from "path";
 
 @Injectable()
 export class HtmlService {
-
-  public replaceTemplate(content: string, params: Record<string, string | number>): string {
+  public replaceTemplate(content: string, params: Record<string, number | string>): string {
     const replaceHtmlRegex = /\{\{\s?(\w+)\s?\}\}/g;
-    const html = content.replace(replaceHtmlRegex, (_, v) => {
+    return content.replace(replaceHtmlRegex, (_, v) => {
       if (!params[v]) {
-        throw Error(`Unable to render template. '${v}' is missing in ${JSON.stringify(params)}`)
+        throw Error(`Unable to render template. '${v}' is missing in ${JSON.stringify(params)}`);
       }
-      return params[v] as string
+      return params[v] as string;
     });
-    return html;
   }
 
-  public async renderTemplate(template: string, params: Record<string, string | number>) {
-    let filePath = ['src', 'templates', `${template}`].join(sep);
-    const content = await promisify(readFile)(filePath, 'utf-8');
+  public async renderTemplate(template: string, params: Record<string, number | string>) {
+    const filePath = ["src", "templates", `${template}`].join(sep);
+    const content = await promisify(readFile)(filePath, "utf-8");
     return this.replaceTemplate(content, params);
   }
 }
diff --git a/newback/src/modules/rest/http/http.module.ts b/newback/src/modules/rest/http/http.module.ts
index 60797b738..ba6e8c1c2 100644
--- a/newback/src/modules/rest/http/http.module.ts
+++ b/newback/src/modules/rest/http/http.module.ts
@@ -1,19 +1,21 @@
 import {
   Global,
   Logger,
-  Module
-} from '@nestjs/common';
-import {HttpService} from '@/modules/rest/http/http.service';
-import fetch from 'node-fetch';
+  Module,
+} from "@nestjs/common";
+import {HttpService} from "@/modules/rest/http/http.service";
+import fetch from "node-fetch";
 
 @Global()
 @Module({
-  providers: [{
-    provide: HttpService,
-    useFactory: (logger) => new HttpService(logger, fetch),
-    inject: [Logger]
-  }],
-  exports: [HttpService]
+  providers: [
+    {
+      provide: HttpService,
+      useFactory: (logger) => new HttpService(logger, fetch),
+      inject: [Logger],
+    },
+  ],
+  exports: [HttpService],
 })
 export class HttpModule {
 }
diff --git a/newback/src/modules/rest/http/http.service.ts b/newback/src/modules/rest/http/http.service.ts
index 081e9a6e4..293d64c70 100644
--- a/newback/src/modules/rest/http/http.service.ts
+++ b/newback/src/modules/rest/http/http.service.ts
@@ -1,9 +1,9 @@
 import {
   Injectable,
-  Logger
-} from '@nestjs/common';
+  Logger,
+} from "@nestjs/common";
 
-import type fetch from 'node-fetch';
+import type fetch from "node-fetch";
 
 @Injectable()
 export class HttpService {
@@ -19,47 +19,46 @@ export class HttpService {
     const body = new URLSearchParams();
     Object.entries(data).forEach(([k, v]) => {
       body.append(k, v);
-    })
-    return this.post<T>(url, body, {})
+    });
+    return this.post<T>(url, body, {});
   }
 
   public async getUrlEncoded<T = Record<string, any>>(url: string, data: Record<string, any> = {}): Promise<T> {
     const params = new URLSearchParams();
     Object.entries(data).forEach(([k, v]) => {
       params.append(k, v);
-    })
-    return this.get<T>(`${url}?${params.toString()}`, {})
+    });
+    return this.get<T>(`${url}?${params.toString()}`, {});
   }
 
   public async postData<T = Record<string, any>>(url: string, data: Record<string, any>): Promise<T> {
-    let body = JSON.stringify(data);
-    let headers = {'Content-Type': 'application/json'};
+    const body = JSON.stringify(data);
+    const headers = {"Content-Type": "application/json"};
     return this.post<T>(url, body, headers);
   }
 
   private async post<T = Record<string, any>>(url, body: any, headers: Record<string, string>): Promise<T> {
-    let requestId = ++this.requestId;
-    this.logger.debug(`POST[${requestId}]: url='${url}'; data=${body}; headers=${JSON.stringify(headers)}`, 'api')
+    const requestId = ++this.requestId;
+    this.logger.debug(`POST[${requestId}]: url='${url}'; data=${body}; headers=${JSON.stringify(headers)}`, "api");
     const response = await this.nodeFetch(url, {
-      method: 'post',
+      method: "post",
       body,
-      headers
+      headers,
     });
     const responseBody = await response.json();
-    this.logger.debug(`POST[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`, 'api')
+    this.logger.debug(`POST[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`, "api");
     return responseBody;
   }
 
   private async get<T = Record<string, any>>(url, headers: Record<string, string>): Promise<T> {
-    let requestId = ++this.requestId;
-    this.logger.debug(`GET[${requestId}]: url='${url}'; headers=${JSON.stringify(headers)}`, 'api')
+    const requestId = ++this.requestId;
+    this.logger.debug(`GET[${requestId}]: url='${url}'; headers=${JSON.stringify(headers)}`, "api");
     const response = await this.nodeFetch(url, {
-      method: 'get',
-      headers
+      method: "get",
+      headers,
     });
     const responseBody = await response.json();
-    this.logger.debug(`GET[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`, 'api')
+    this.logger.debug(`GET[${requestId}]: url='${url}'; status='${response.status}' data=${JSON.stringify(responseBody)};`, "api");
     return responseBody;
   }
-
 }
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/rest/ip/ip.cache.service.ts
index 68c1c2627..375688bf0 100644
--- a/newback/src/modules/rest/ip/ip.cache.service.ts
+++ b/newback/src/modules/rest/ip/ip.cache.service.ts
@@ -1,13 +1,13 @@
 import {
   Injectable,
-  Logger
-} from '@nestjs/common';
-import {IpRepository} from '@/modules/rest/database/repository/ip.repository';
-import {IpService} from '@/modules/rest/ip/ip.service';
-import {IpAddressModel} from '@/data/model/ip.address.model';
+  Logger,
+} from "@nestjs/common";
+import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
+import {IpService} from "@/modules/rest/ip/ip.service";
+import type {IpAddressModel} from "@/data/model/ip.address.model";
 
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {InvalidIpException} from '@/data/exceptions/invalid.ip.exception';
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import type {InvalidIpException} from "@/data/exceptions/invalid.ip.exception";
 
 @Injectable()
 export class IpCacheService {
@@ -19,30 +19,29 @@ export class IpCacheService {
   }
 
   public async getIpString(ip: string): Promise<string> {
-    let data = await this.getIpInfo(ip);
+    const data = await this.getIpInfo(ip);
     if (!data) {
       return "Unknown";
-    } else {
-      return `${data.country} ${data.city} ${data.isp}`;
     }
+    return `${data.country} ${data.city} ${data.isp}`;
   }
 
   public async saveIp(userId: number, ip: string) {
-    let ipModel = await this.getIpInfo(ip);
+    const ipModel = await this.getIpInfo(ip);
     if (ipModel) {
-      await this.ipRepository.saveIpToUser(userId, ipModel.id)
+      await this.ipRepository.saveIpToUser(userId, ipModel.id);
     }
   }
 
   public async getIpInfo(ip: string): Promise<Partial<IpAddressModel>> {
-    let response = await this.ipRepository.getIp(ip);
+    const response = await this.ipRepository.getIp(ip);
     if (response && !response.status) {
       return null;
     }
     try {
-      let ipInfo = await this.ipService.getIpInfo(ip)
-      let model: Partial<IpAddressModel> = {
-        ip: ip,
+      const ipInfo = await this.ipService.getIpInfo(ip);
+      const model: Partial<IpAddressModel> = {
+        ip,
         status: true,
         isp: ipInfo.isp,
         country: ipInfo.country,
@@ -51,18 +50,18 @@ export class IpCacheService {
         lat: ipInfo.lat,
         lon: ipInfo.lon,
         zip: ipInfo.zip,
-        timezone: ipInfo.timezone
+        timezone: ipInfo.timezone,
       };
-      await this.ipRepository.saveIP(model)
+      await this.ipRepository.saveIP(model);
       return model;
     } catch (e: any) {
-      this.logger.error(`Unable to get Ip Address Info ${ip} ${e.error}`, e.stack, 'ip.cache.service')
+      this.logger.error(`Unable to get Ip Address Info ${ip} ${e.error}`, e.stack, "ip.cache.service");
       if (!(e as InvalidIpException).networkError) {
-        await this.ipRepository.saveIP({ip, status: false})
+        await this.ipRepository.saveIP({ip,
+          status: false});
         return null;
       }
       return null;
     }
   }
-
 }
diff --git a/newback/src/modules/rest/ip/ip.module.ts b/newback/src/modules/rest/ip/ip.module.ts
index 8872c43b7..6e57be063 100644
--- a/newback/src/modules/rest/ip/ip.module.ts
+++ b/newback/src/modules/rest/ip/ip.module.ts
@@ -1,16 +1,16 @@
 import {
   Global,
-  Module
-} from '@nestjs/common';
-import {IpService} from '@/modules/rest/ip/ip.service';
-import {IpCacheService} from '@/modules/rest/ip/ip.cache.service';
-import {DatabaseModule} from '@/modules/rest/database/database.module';
+  Module,
+} from "@nestjs/common";
+import {IpService} from "@/modules/rest/ip/ip.service";
+import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {DatabaseModule} from "@/modules/rest/database/database.module";
 
 @Global()
 @Module({
   imports: [DatabaseModule],
   providers: [IpService, IpCacheService],
-  exports: [IpCacheService]
+  exports: [IpCacheService],
 })
 export class IpModule {
 }
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
index b6a062f73..6bc4803e6 100644
--- a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
+++ b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
@@ -1,49 +1,48 @@
+import type {
+  TestingModule,
+} from "@nestjs/testing";
 import {
   Test,
-  TestingModule
-} from '@nestjs/testing';
-import {IpService} from '@/modules/rest/ip/ip.service';
-import {HttpModule} from '@/modules/rest/http/http.module';
-import * as pychatIpAddressFixture from '@/fixtures/ip.134.249.113.11.json';
-import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {ConsoleLogger} from '@nestjs/common';
-import {InvalidIpException} from '@/data/exceptions/invalid.ip.exception';
-
-describe('IpService', () => {
+} from "@nestjs/testing";
+import {IpService} from "@/modules/rest/ip/ip.service";
+import {HttpModule} from "@/modules/rest/http/http.module";
+import * as pychatIpAddressFixture from "@/fixtures/ip.134.249.113.11.json";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {ConsoleLogger} from "@nestjs/common";
+import {InvalidIpException} from "@/data/exceptions/invalid.ip.exception";
 
+describe("IpService", () => {
   let ipservice: IpService;
   let moduleFixture: TestingModule;
   beforeAll(
     async() => {
-
       moduleFixture = await Test.createTestingModule({
         imports: [
           LoggerModule,
-          HttpModule
+          HttpModule,
         ],
-        providers: [
-          IpService,
-        ]
-      }).setLogger(new ConsoleLogger())
-        .compile();
+        providers: [IpService],
+      }).setLogger(new ConsoleLogger()).
+        compile();
       ipservice = moduleFixture.get(IpService);
-    })
+    }
+  );
 
   afterAll(async() => {
-    await moduleFixture.close()
-  })
+    await moduleFixture.close();
+  });
 
   beforeAll(() => {
     jest.clearAllMocks();
-  })
+  });
 
-  describe('getIpInfo', () => {
-    it('ip 134.249.113.11 should return correct response', async() => {
-      let data = await ipservice.getIpInfo('134.249.113.11');
-      expect(data).toEqual(pychatIpAddressFixture)
+  describe("getIpInfo", () => {
+    it("ip 134.249.113.11 should return correct response", async() => {
+      const data = await ipservice.getIpInfo("134.249.113.11");
+      expect(data).toEqual(pychatIpAddressFixture);
     });
-    it('ip ::ffff:127.0.0.1 should return correct response', async() => {
-      await expect(ipservice.getIpInfo('::ffff:127.0.0.1')).rejects.toMatchObject(expect.any(InvalidIpException))
+    it("ip ::ffff:127.0.0.1 should return correct response", async() => {
+      await expect(ipservice.getIpInfo("::ffff:127.0.0.1")).rejects.toMatchObject(expect.any(InvalidIpException));
     });
   });
 });
diff --git a/newback/src/modules/rest/ip/ip.service.ts b/newback/src/modules/rest/ip/ip.service.ts
index c62bf656a..70b2d0d05 100644
--- a/newback/src/modules/rest/ip/ip.service.ts
+++ b/newback/src/modules/rest/ip/ip.service.ts
@@ -1,10 +1,10 @@
-import {Injectable} from '@nestjs/common';
-import {HttpService} from '@/modules/rest/http/http.service';
-import {
+import {Injectable} from "@nestjs/common";
+import {HttpService} from "@/modules/rest/http/http.service";
+import type {
   IpInfoResponse,
-  IpSuccessInfoResponse
-} from '@/data/types/api';
-import {InvalidIpException} from '@/data/exceptions/invalid.ip.exception';
+  IpSuccessInfoResponse,
+} from "@/data/types/api";
+import {InvalidIpException} from "@/data/exceptions/invalid.ip.exception";
 
 @Injectable()
 export class IpService {
@@ -14,14 +14,13 @@ export class IpService {
   }
 
   public async getIpInfo(ip: string): Promise<IpSuccessInfoResponse> {
-    let response = await this.httpService.getUrlEncoded<IpInfoResponse>(`http://ip-api.com/json/${ip}`);
-    if (response?.status === 'fail') {
+    const response = await this.httpService.getUrlEncoded<IpInfoResponse>(`http://ip-api.com/json/${ip}`);
+    if (response?.status === "fail") {
       throw new InvalidIpException(ip, response.message, false);
     }
-    if (response.status !== 'success') {
-      throw new InvalidIpException(ip, 'Unknown', true);
+    if (response.status !== "success") {
+      throw new InvalidIpException(ip, "Unknown", true);
     }
     return response;
   }
-
 }
diff --git a/newback/src/modules/rest/logger/logger.module.ts b/newback/src/modules/rest/logger/logger.module.ts
index a38534b26..d39a66202 100644
--- a/newback/src/modules/rest/logger/logger.module.ts
+++ b/newback/src/modules/rest/logger/logger.module.ts
@@ -1,13 +1,13 @@
 import {
   Global,
   Logger,
-  Module
-} from '@nestjs/common';
+  Module,
+} from "@nestjs/common";
 
 @Global()
 @Module({
   providers: [Logger],
-  exports: [Logger]
+  exports: [Logger],
 })
 export class LoggerModule {
 }
diff --git a/newback/src/modules/rest/password/password.service.ts b/newback/src/modules/rest/password/password.service.ts
index 6c88df635..494075ac1 100644
--- a/newback/src/modules/rest/password/password.service.ts
+++ b/newback/src/modules/rest/password/password.service.ts
@@ -1,8 +1,8 @@
-import {Injectable} from '@nestjs/common';
+import {Injectable} from "@nestjs/common";
 import {
   compare,
-  hash
-} from 'bcrypt';
+  hash,
+} from "bcrypt";
 
 @Injectable()
 export class PasswordService {
@@ -16,7 +16,7 @@ export class PasswordService {
   public async createWsId(userId: number, oldId: string): Promise<string> {
     let random;
     if (oldId) {
-      let [userId, oldRandom] = oldId.split(':');
+      const [userId, oldRandom] = oldId.split(":");
       if (oldRandom?.length === 4) {
         random = oldRandom;
       }
@@ -24,13 +24,13 @@ export class PasswordService {
     if (!random) {
       random = await this.generateRandomString(4);
     }
-    let userIdString = ('0000' + String(userId)) // make userId be always 4 characters
-    return `${userIdString.substring(userIdString.length - 4, userIdString.length)}:${random}`
+    const userIdString = `0000${String(userId)}`; // Make userId be always 4 characters
+    return `${userIdString.substring(userIdString.length - 4, userIdString.length)}:${random}`;
   }
 
   public async generateRandomString(length: number): Promise<string> {
-    let result = '';
-    const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+    let result = "";
+    const characters = "abcdefghijklmnopqrstuvwxyz0123456789";
     for (let i = 0; i < length; i++) {
       result += characters.charAt(Math.floor(Math.random() *
         characters.length));
diff --git a/newback/src/modules/rest/pubsub/pubsub.service.ts b/newback/src/modules/rest/pubsub/pubsub.service.ts
index 06d290dc2..0117492e3 100644
--- a/newback/src/modules/rest/pubsub/pubsub.service.ts
+++ b/newback/src/modules/rest/pubsub/pubsub.service.ts
@@ -1,11 +1,12 @@
-import {WebsocketGateway} from '@/modules/api/websocket/websocket.gateway';
+import type {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
 import {
   Injectable,
-  Logger
-} from '@nestjs/common';
-import {WebSocketContextData} from '@/data/types/internal';
-import {PubSubMessage} from '@/modules/api/websocket/interfaces/pubsub';
-import {DefaultWsInMessage, HandlerName} from '@/data/types/frontend';
+  Logger,
+} from "@nestjs/common";
+import type {WebSocketContextData} from "@/data/types/internal";
+import type {PubSubMessage} from "@/modules/api/websocket/interfaces/pubsub";
+import type {HandlerName} from "@/data/types/frontend";
+import {DefaultWsInMessage} from "@/data/types/frontend";
 
 
 interface HandlerType {
@@ -14,30 +15,31 @@ interface HandlerType {
   handler: string;
 }
 
-let handlers: HandlerType[] = [];
+const handlers: HandlerType[] = [];
 
 
-// function stateDecoratorFactory<TPT extends VuexModule>(vuexModule: TPT):
-// <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
-// (vueComponent: TCT, fileName: TPN) => void {
-//   return <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
-//   (vueComponent: TCT, fileName: TPN):
-//
+/*
+ * Function stateDecoratorFactory<TPT extends VuexModule>(vuexModule: TPT):
+ * <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
+ * (vueComponent: TCT, fileName: TPN) => void {
+ *   return <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
+ *   (vueComponent: TCT, fileName: TPN):
+ *
+ */
 export function SubscribePuBSub<T extends keyof WebsocketGateway>(handler: T) {
   return (target: WebsocketGateway, memberName: T, propertyDescriptor: PropertyDescriptor) => {
     handlers.push({
       handler,
       memberName,
       target,
-    })
-  }
+    });
+  };
 }
 
-let receivers: Record<string, {ctx: WebSocketContextData}[]> = {};
+const receivers: Record<string, {ctx: WebSocketContextData}[]> = {};
 
 @Injectable()
 export class PubsubService {
-
   constructor(
     private readonly logger: Logger,
   ) {
@@ -45,37 +47,36 @@ export class PubsubService {
 
   // A extends string,H extends HandlerName
 
-  public emit<PS extends PubSubMessage<A,H>, A extends string,H extends HandlerName>(handler: keyof WebsocketGateway, data: PS, ...channel: string[]) {
-    channel.forEach(channel => {
+  public emit<PS extends PubSubMessage<A, H>, A extends string, H extends HandlerName>(handler: keyof WebsocketGateway, data: PS, ...channel: string[]) {
+    channel.forEach((channel) => {
       if (receivers[channel]) {
-        receivers[channel].forEach(receiver => {
-          let proxy = handlers.find(h => h.handler === handler);
+        receivers[channel].forEach((receiver) => {
+          const proxy = handlers.find((h) => h.handler === handler);
           (proxy.target[proxy.memberName] as any)(receiver.ctx, data);
-        })
+        });
       }
-    })
+    });
   }
 
   public subscribe(context: WebSocketContextData, ...channel: string[]) {
-    channel.forEach(channel => {
+    channel.forEach((channel) => {
       if (!receivers[channel]) {
-        receivers[channel] = []
+        receivers[channel] = [];
       }
       receivers[channel].push({
-        ctx: context
-      })
-    })
-
+        ctx: context,
+      });
+    });
   }
 
   public unsubscribe(context: WebSocketContextData, ...channel: string[]) {
-    channel.forEach(channel => {
+    channel.forEach((channel) => {
       if (receivers[channel]) {
-        let index = receivers[channel].findIndex(c => c.ctx = context);
+        const index = receivers[channel].findIndex((c) => c.ctx = context);
         if (index >= 0) {
           receivers[channel].splice(index, 1);
         }
       }
-    })
+    });
   }
 }
diff --git a/newback/src/modules/rest/redis/redis.service.ts b/newback/src/modules/rest/redis/redis.service.ts
index b54fba5eb..46e69a48a 100644
--- a/newback/src/modules/rest/redis/redis.service.ts
+++ b/newback/src/modules/rest/redis/redis.service.ts
@@ -1,19 +1,18 @@
 import {
   Injectable,
-  Logger
-} from '@nestjs/common';
+  Logger,
+} from "@nestjs/common";
 import {
   REDIS_KEYS,
-} from '@/utils/consts';
+} from "@/utils/consts";
 import {
   InjectRedis,
-  Redis
-} from '@nestjs-modules/ioredis';
-import {UserOnlineData} from '@/data/types/internal';
+  Redis,
+} from "@nestjs-modules/ioredis";
+import type {UserOnlineData} from "@/data/types/internal";
 
 @Injectable()
 export class RedisService {
-
   constructor(
     @InjectRedis() private readonly redis: Redis,
     private readonly logger: Logger,
@@ -22,18 +21,18 @@ export class RedisService {
 
 
   public async saveSession(session: string, userId: number): Promise<void> {
-    this.logger.debug(`hset ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]=${userId}` ,'redis')
+    this.logger.debug(`hset ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]=${userId}`, "redis");
     await this.redis.hset(REDIS_KEYS.REDIS_SESSIONS_KEY, session, userId);
   }
 
   public async removeSession(session: string) {
-    this.logger.debug(`hdel ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]` ,'redis')
+    this.logger.debug(`hdel ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]`, "redis");
     await this.redis.hdel(REDIS_KEYS.REDIS_SESSIONS_KEY, session);
   }
 
   public async getSession(session: string): Promise<number | null> {
-    let a = await this.redis.hget(REDIS_KEYS.REDIS_SESSIONS_KEY, session);
-    this.logger.debug(`hget ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]=${a}` ,'redis')
+    const a = await this.redis.hget(REDIS_KEYS.REDIS_SESSIONS_KEY, session);
+    this.logger.debug(`hget ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]=${a}`, "redis");
     if (!a) {
       return null;
     }
@@ -41,42 +40,42 @@ export class RedisService {
   }
 
   public async addOnline(id: string): Promise<void> {
-    this.logger.debug(`sadd ${REDIS_KEYS.REDIS_ONLINE_KEY}=${id}` ,'redis')
-    this.redis.sadd(REDIS_KEYS.REDIS_ONLINE_KEY, id)
+    this.logger.debug(`sadd ${REDIS_KEYS.REDIS_ONLINE_KEY}=${id}`, "redis");
+    this.redis.sadd(REDIS_KEYS.REDIS_ONLINE_KEY, id);
   }
 
-   public async removeOnline(id: string): Promise<void> {
-    this.logger.debug(`srem ${REDIS_KEYS.REDIS_ONLINE_KEY}=${id}` ,'redis')
-    this.redis.srem(REDIS_KEYS.REDIS_ONLINE_KEY, id)
+  public async removeOnline(id: string): Promise<void> {
+    this.logger.debug(`srem ${REDIS_KEYS.REDIS_ONLINE_KEY}=${id}`, "redis");
+    this.redis.srem(REDIS_KEYS.REDIS_ONLINE_KEY, id);
   }
 
   public async getOnline(): Promise<UserOnlineData> {
-    let data = await this.redis.smembers(REDIS_KEYS.REDIS_ONLINE_KEY);
-    this.logger.debug(`smembers ${REDIS_KEYS.REDIS_ONLINE_KEY}=${data}` ,'redis')
+    const data = await this.redis.smembers(REDIS_KEYS.REDIS_ONLINE_KEY);
+    this.logger.debug(`smembers ${REDIS_KEYS.REDIS_ONLINE_KEY}=${data}`, "redis");
     if (!data) {
       return {};
     }
 
-    return data.reduce((set, currentValue) => {
-      let [userId, id] = currentValue.split(':');
-      let normalizedUserId = parseInt(userId);
+    return data.reduce<UserOnlineData>((set, currentValue) => {
+      const [userId, id] = currentValue.split(":");
+      const normalizedUserId = parseInt(userId);
       if (!set[normalizedUserId]) {
-        set[normalizedUserId] = []
+        set[normalizedUserId] = [];
       }
-      set[normalizedUserId].push(id)
+      set[normalizedUserId].push(id);
       return set;
-    }, {} as UserOnlineData);
-
+    }, {});
   }
 
   public async getNewRedisInstance() {
 
   }
-// import  {promisify} from 'util';
-  // public async subscribe(channels: string[]) {
-  //   // @ts-expect-error
-  //   await promisify(this.redis.subscribe)(...channels);
-  // }
-
 
+  /*
+   * Import  {promisify} from 'util';
+   * Public async subscribe(channels: string[]) {
+   *   // @ts-expect-error
+   *   Await promisify(this.redis.subscribe)(...channels);
+   * }
+   */
 }
diff --git a/newback/src/modules/rest/session/session.service.ts b/newback/src/modules/rest/session/session.service.ts
index f510f642d..29ce950ee 100644
--- a/newback/src/modules/rest/session/session.service.ts
+++ b/newback/src/modules/rest/session/session.service.ts
@@ -2,16 +2,15 @@ import {
   Injectable,
   InternalServerErrorException,
   Logger,
-  UnauthorizedException
-} from '@nestjs/common';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {UserRepository} from '@/modules/rest/database/repository/user.repository';
-import {UserModel} from '@/data/model/user.model';
+  UnauthorizedException,
+} from "@nestjs/common";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import type {UserModel} from "@/data/model/user.model";
 
 @Injectable()
 export class SessionService {
-
   constructor(
     private readonly passwordService: PasswordService,
     private readonly redisService: RedisService,
@@ -21,8 +20,8 @@ export class SessionService {
   }
 
   public async createAndSaveSession(userId: number) {
-    let session = await this.passwordService.generateRandomString(32);
-    this.logger.log(`Generated session for userId ${userId}: ${session}`, 'session.service')
+    const session = await this.passwordService.generateRandomString(32);
+    this.logger.log(`Generated session for userId ${userId}: ${session}`, "session.service");
     await this.redisService.saveSession(session, userId);
     return session;
   }
@@ -31,11 +30,11 @@ export class SessionService {
     if (!sessionId) {
       throw new UnauthorizedException("sessionId is missing");
     }
-    let userId = await this.redisService.getSession(sessionId);
+    const userId = await this.redisService.getSession(sessionId);
     if (!userId) {
       throw new UnauthorizedException("Session id expired");
     }
-    let user = await this.userRepository.getById(userId, ['userProfile', 'userAuth', 'userSettings'])
+    const user = await this.userRepository.getById(userId, ["userProfile", "userAuth", "userSettings"]);
     if (!user) {
       await this.redisService.removeSession(sessionId);
       throw new InternalServerErrorException("Database has been cleared this user is removed");
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index 3a31e20eb..c0e23cffa 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -1,35 +1,36 @@
+import type {
+  Logger,
+  WebSocketAdapter,
+} from "@nestjs/common";
 import {
   BadRequestException,
   InternalServerErrorException,
-  Logger,
-  WebSocketAdapter
-} from '@nestjs/common';
-import {BaseWsInstance} from '@nestjs/websockets';
+} from "@nestjs/common";
+import type {BaseWsInstance} from "@nestjs/websockets";
 import {
   CLOSE_EVENT,
   CONNECTION_EVENT,
   DISCONNECT_EVENT,
   ERROR_EVENT,
-  MESSAGE_METADATA
-} from '@nestjs/websockets/constants';
-import {MessageMappingProperties} from '@nestjs/websockets/gateway-metadata-explorer';
-import {isFunction} from '@nestjs/common/utils/shared.utils';
+  MESSAGE_METADATA,
+} from "@nestjs/websockets/constants";
+import type {MessageMappingProperties} from "@nestjs/websockets/gateway-metadata-explorer";
+import {isFunction} from "@nestjs/common/utils/shared.utils";
+import type {Server,
+  ServerOptions} from "ws";
 import {
-  Server,
-  ServerOptions,
   WebSocket,
-  WebSocketServer
+  WebSocketServer,
 } from "ws";
-import {processErrors} from '@/utils/decorators';
+import {processErrors} from "@/utils/decorators";
+import type {DefaultWsInMessage,
+  DefaultWsOutMessage} from "@/data/types/frontend";
 import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  GrowlMessage
-} from '@/data/types/frontend';
+  GrowlMessage,
+} from "@/data/types/frontend";
 
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
-
   private wsServer: WebSocketServer;
 
   constructor(
@@ -41,40 +42,40 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
 
   public bindClientConnect(server: BaseWsInstance, callback: Function) {
     server.on(CONNECTION_EVENT, async(...args) => {
-      let ws: WebSocket = args.find(a => a instanceof WebSocket)
-      let oldSend: WebSocket['send'] = ws.send.bind(ws);
+      const ws: WebSocket = args.find((a) => a instanceof WebSocket);
+      const oldSend: WebSocket["send"] = ws.send.bind(ws);
       (ws as any).context = {
         sendToClient: (data: DefaultWsInMessage<any, any>) => {
           let message;
           try {
-            message = JSON.stringify(data)
+            message = JSON.stringify(data);
           } catch (e) {
-            processErrors(e, ws, this.logger)
-            return
+            processErrors(e, ws, this.logger);
+            return;
           }
           if (message.length > 2000) {
-            this.logger.verbose(`WS:OUT ${message}`, 'ws')
+            this.logger.verbose(`WS:OUT ${message}`, "ws");
           } else {
-            this.logger.debug(`WS:OUT ${message}`, 'ws')
+            this.logger.debug(`WS:OUT ${message}`, "ws");
           }
-          oldSend(message)
-        }
+          oldSend(message);
+        },
       };
-      ws.send = (ws as any).context.sendToClient
-      await callback(...args, (ws as any).context)
+      ws.send = (ws as any).context.sendToClient;
+      await callback(...args, (ws as any).context);
     });
   }
 
   public bindClientDisconnect(client: BaseWsInstance, callback: Function) {
     client.on(DISCONNECT_EVENT, (...arg) => {
-      this.logger.log(`Closing connection ${(client as any)?.context?.id}`, 'ws')
-      callback(...arg)
+      this.logger.log(`Closing connection ${(client as any)?.context?.id}`, "ws");
+      callback(...arg);
     });
   }
 
   public async close(server: BaseWsInstance) {
     const isCallable = server && isFunction(server.close);
-    isCallable && (await new Promise(resolve => server.close(resolve)));
+    isCallable && await new Promise((resolve) => server.close(resolve));
   }
 
   public create(
@@ -89,16 +90,18 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
       ...options,
     });
 
-    this.httpServer.on('upgrade', (request, socket, head) => {
+    this.httpServer.on("upgrade", (request, socket, head) => {
       this.wsServer.handleUpgrade(request, socket, head, (ws: unknown) => {
-        this.wsServer.emit('connection', ws, request);
+        this.wsServer.emit("connection", ws, request);
       });
     });
 
-    this.httpServer.on(CONNECTION_EVENT, (ws: any) =>
-      ws.on(ERROR_EVENT, (err: any) => this.logger.error(err, err?.stack, 'ws')),
-    );
-    this.httpServer.on(ERROR_EVENT, (err: any) => this.logger.error(err, err?.stack, 'ws'));
+    this.httpServer.on(CONNECTION_EVENT, (ws: any) => ws.on(ERROR_EVENT, (err: any) => {
+      this.logger.error(err, err?.stack, "ws");
+    }),);
+    this.httpServer.on(ERROR_EVENT, (err: any) => {
+      this.logger.error(err, err?.stack, "ws");
+    });
     return this.wsServer;
   }
 
@@ -109,47 +112,44 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
     client.on(MESSAGE_METADATA, async(data) => {
       let parsed: DefaultWsOutMessage<any>;
       try {
-        let s = String(data);
-        this.logger.debug(`WS:IN ${s}`, 'ws')
+        const s = String(data);
+        this.logger.debug(`WS:IN ${s}`, "ws");
         if (client.readyState !== client.OPEN) {
-          throw new BadRequestException('Cannot process new messages, while opening a connection')
+          throw new BadRequestException("Cannot process new messages, while opening a connection");
         }
         parsed = JSON.parse(s);
         if (!parsed.action) {
-          throw new BadRequestException('Invalid message structure, "action" property is not defined')
+          throw new BadRequestException("Invalid message structure, \"action\" property is not defined");
         }
-        let handler = handlers.find(handler => handler.message === parsed.action)
+        const handler = handlers.find((handler) => handler.message === parsed.action);
         if (!handler) {
           throw new BadRequestException(`Unknown handler ${parsed.action}`);
         }
-        let result = await handler.callback(parsed);
+        const result = await handler.callback(parsed);
         if (result) {
           if (!parsed.cbId) {
-            throw new InternalServerErrorException(`Gateway ${parsed.action} returned result ${result}, without having cbId`)
+            throw new InternalServerErrorException(`Gateway ${parsed.action} returned result ${result}, without having cbId`);
           }
-          let response: DefaultWsInMessage<any, any> = {
+          const response: DefaultWsInMessage<any, any> = {
             cbBySender: (client as any).context.id,
             cbId: parsed.cbId,
-            handler: 'void',
+            handler: "void",
             ...result,
-          }
-          client.send(response)
+          };
+          client.send(response);
         }
       } catch (e) {
         processErrors(e, client, this.logger);
       }
-
     });
 
     client.on(CLOSE_EVENT, (...arg) => {
-      this.logger.log(`Closing connection ${(client as any)?.context?.id}`, 'ws');
-      handlers.find(handler => handler.message === 'closeConnection').callback()
+      this.logger.log(`Closing connection ${(client as any)?.context?.id}`, "ws");
+      handlers.find((handler) => handler.message === "closeConnection").callback();
     });
-
   }
 
   public async dispose() {
     await this.httpServer.close();
   }
-
 }
diff --git a/newback/src/utils/consts.ts b/newback/src/utils/consts.ts
index 5d5cb8579..8208bfa00 100644
--- a/newback/src/utils/consts.ts
+++ b/newback/src/utils/consts.ts
@@ -2,6 +2,6 @@ export const ALL_ROOM_ID = 1;
 export const MAX_USERNAME_LENGTH = 16;
 
 export enum REDIS_KEYS {
-  REDIS_SESSIONS_KEY = 'sessions',
-  REDIS_ONLINE_KEY = 'online'
+  REDIS_SESSIONS_KEY = "sessions",
+  REDIS_ONLINE_KEY = "online",
 }
diff --git a/newback/src/utils/decorators.ts b/newback/src/utils/decorators.ts
index b94eeaed2..01a23ae42 100644
--- a/newback/src/utils/decorators.ts
+++ b/newback/src/utils/decorators.ts
@@ -1,18 +1,18 @@
+import type {ExecutionContext,
+  Logger} from "@nestjs/common";
 import {
   createParamDecorator,
-  ExecutionContext,
-  Logger,
-  UnauthorizedException
-} from '@nestjs/common';
+  UnauthorizedException,
+} from "@nestjs/common";
 import {WebSocket} from "ws";
-import {WebSocketContextData} from '@/data/types/internal';
-import {OnGatewayConnection} from '@nestjs/websockets';
-import {WS_SESSION_EXPIRED_CODE} from '@/data/types/frontend';
+import type {WebSocketContextData} from "@/data/types/internal";
+import type {OnGatewayConnection} from "@nestjs/websockets";
+import {WS_SESSION_EXPIRED_CODE} from "@/data/types/frontend";
 
 
 export const WebsocketContext = createParamDecorator(
   (data: unknown, ctx: ExecutionContext) => {
-    let handler =  ctx.getArgs().find(a => a instanceof WebSocket)
+    const handler = ctx.getArgs().find((a) => a instanceof WebSocket);
     if (!handler.context) {
       handler.context = {userId: Date.now()} as WebSocketContextData;
     }
@@ -22,44 +22,43 @@ export const WebsocketContext = createParamDecorator(
 
 export const WsContext = createParamDecorator(
   (data: unknown, ctx: ExecutionContext) => {
-    let handler =  ctx.getArgs().find(a => a instanceof WebSocket)
-    return (handler.context as WebSocketContextData);
+    const handler = ctx.getArgs().find((a) => a instanceof WebSocket);
+    return handler.context as WebSocketContextData;
   },
 );
 
 
 export function processErrors(e, socket, logger: Logger) {
-  logger.error(`Ws error ${e.message}`, e.stack,  'ws')
+  logger.error(`Ws error ${e.message}`, e.stack, "ws");
   if (e instanceof UnauthorizedException) {
-    socket.close(WS_SESSION_EXPIRED_CODE, (e.message || 'Invalid session').substr(0, 123))
-  } else if (e?.status >= 400 && e?.status < 500) {  // Invalid frame payload data
+    socket.close(WS_SESSION_EXPIRED_CODE, (e.message || "Invalid session").substr(0, 123));
+  } else if (e?.status >= 400 && e?.status < 500) { // Invalid frame payload data
     socket.close(1007, `Error during creating a connection ${e.message}`.substr(0, 123));
   } else { // Internal Error
-    socket.close(1011, `Error during opening a socket ${e.message}`.substr(0, 123)); // message cannot be greather 123 bytes
+    socket.close(1011, `Error during opening a socket ${e.message}`.substr(0, 123)); // Message cannot be greather 123 bytes
   }
 }
-interface TargetCatchErrors extends OnGatewayConnection{
+interface TargetCatchErrors extends OnGatewayConnection {
   logger: Logger;
 }
 
-export function CatchWsErrors(target: TargetCatchErrors, memberName: 'handleConnection', propertyDescriptor: PropertyDescriptor) {
+export function CatchWsErrors(target: TargetCatchErrors, memberName: "handleConnection", propertyDescriptor: PropertyDescriptor) {
   return {
     get() {
-      const wrapperFn = async function (socket, ...args) {
+      const wrapperFn = async function(socket, ...args) {
         try {
-          let result = await propertyDescriptor.value.apply(this, [socket, ...args]);
-          return result;
-        } catch (e) { // need to catch , otherwise node process crashes
+          return await propertyDescriptor.value.apply(this, [socket, ...args]);
+        } catch (e) { // Need to catch , otherwise node process crashes
           processErrors(e, socket, this.logger);
         }
-      }
+      };
 
       Object.defineProperty(this, memberName, {
         value: wrapperFn,
         configurable: true,
-        writable: true
+        writable: true,
       });
       return wrapperFn;
-    }
-  }
+    },
+  };
 }
diff --git a/newback/src/utils/helpers.spec.ts b/newback/src/utils/helpers.spec.ts
index 871e8d267..f30f5c581 100644
--- a/newback/src/utils/helpers.spec.ts
+++ b/newback/src/utils/helpers.spec.ts
@@ -1,17 +1,16 @@
-import {generateUserName} from '@/utils/helpers';
+import {generateUserName} from "@/utils/helpers";
 
-describe('helper', () => {
-
-  describe('generateUserName', () => {
-    it('should remove email domain', () => {
-      expect(generateUserName('deathangel@gmail.com')).toEqual('deathangel')
+describe("helper", () => {
+  describe("generateUserName", () => {
+    it("should remove email domain", () => {
+      expect(generateUserName("deathangel@gmail.com")).toEqual("deathangel");
     });
 
-    it('should cut to 16 symbolx', () => {
-      expect(generateUserName('deathangasdfasfasdfsadfasdfel@gmail.com')).toHaveLength(16)
+    it("should cut to 16 symbolx", () => {
+      expect(generateUserName("deathangasdfasfasdfsadfasdfel@gmail.com")).toHaveLength(16);
     });
-    it('should replace multiple invalid chars', () => {
-      expect(generateUserName('f#8f))c@gmail.com')).toEqual('f-8f-c')
+    it("should replace multiple invalid chars", () => {
+      expect(generateUserName("f#8f))c@gmail.com")).toEqual("f-8f-c");
     });
   });
-})
+});
diff --git a/newback/src/utils/helpers.ts b/newback/src/utils/helpers.ts
index 7be2a29af..824eec17a 100644
--- a/newback/src/utils/helpers.ts
+++ b/newback/src/utils/helpers.ts
@@ -1,19 +1,19 @@
-import type {SequelizeModuleOptions} from '@nestjs/sequelize';
+import type {SequelizeModuleOptions} from "@nestjs/sequelize";
 
-import {MAX_USERNAME_LENGTH} from '@/utils/consts';
-import {config} from 'node-ts-config';
+import {MAX_USERNAME_LENGTH} from "@/utils/consts";
+import {config} from "node-ts-config";
 
 export function generateUserName(email: string) {
-  return email.split('@')[0].replace(/[^0-9a-zA-Z-_]+/g, '-').substring(0, MAX_USERNAME_LENGTH);
+  return email.split("@")[0].replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, MAX_USERNAME_LENGTH);
 }
 
-export function generateOrmConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, 'ssl'> {
+export function generateOrmConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, "ssl"> {
   const sync = false;
-  // drop database pychat2; create database pychat2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; GRANT ALL ON pychat2.* TO 'pychat'@'localhost';
+  // Drop database pychat2; create database pychat2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; GRANT ALL ON pychat2.* TO 'pychat'@'localhost';
   return {
     synchronize: sync,
-    logging: logging,
-    dialect: 'mysql',
+    logging,
+    dialect: "mysql",
     host: config.mysql.host,
     port: config.mysql.port,
     username: config.mysql.username,
@@ -25,15 +25,15 @@ export function generateOrmConfig(logging: ((sql: string) => void)): Omit<Sequel
     },
     query: {
       nest: !sync,
-      // raw: true,
+      // Raw: true,
     },
     define: {
-      collate: 'utf8mb4_general_ci',
-      charset: 'utf8mb4',
+      collate: "utf8mb4_general_ci",
+      charset: "utf8mb4",
       paranoid: true,
       timestamps: true,
       underscored: true,
-    }
+    },
   };
 }
 
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index 03bc77cda..d02f3e96a 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -1,49 +1,48 @@
 #!/usr/bin/yarn ts-node --compiler ttypescript ./src/utils/migration.old.ts
 
-import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {ConsoleLogger} from '@nestjs/common';
-import {UserModel} from '@/data/model/user.model';
-import {Test} from '@nestjs/testing';
-import {LoggerModule} from '@/modules/rest/logger/logger.module';
-import {ConfigModule} from '@/modules/rest/config/config.module';
-import {getModelToken} from '@nestjs/sequelize';
-import {Sequelize} from 'sequelize-typescript';
-import {Gender} from '@/data/types/frontend';
-import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
-import {UserAuthModel} from '@/data/model/user.auth.model';
-import {UserProfileModel} from '@/data/model/user.profile.model';
-import {ChannelModel} from '@/data/model/channel.model';
-import {ImageModel} from '@/data/model/image.model';
-import {MessageModel} from '@/data/model/message.model';
-import {MessageHistoryModel} from '@/data/model/message.history.model';
-import {MessageMentionModel} from '@/data/model/message.mention.model';
-import {RoomModel} from '@/data/model/room.model';
-import {RoomUsersModel} from '@/data/model/room.users.model';
-import {SubscriptionModel} from '@/data/model/subscription.model';
-import {SubscriptionMessageModel} from '@/data/model/subscription.message.model';
-import {UploadedFileModel} from '@/data/model/uploaded.file.model';
-import {VerificationModel} from '@/data/model/verification.model';
-import * as pychat_chat_channel from '@/fixtures/prod/pychat_chat_channel.json';
-import * as pychat_chat_image from '@/fixtures/prod/pychat_chat_image.json';
-import * as pychat_chat_ip_address from '@/fixtures/prod/pychat_chat_ip_address.json';
-import * as pychat_chat_message from '@/fixtures/prod/pychat_chat_message.json';
-import * as pychat_chat_messagehistory from '@/fixtures/prod/pychat_chat_messagehistory.json';
-import * as pychat_chat_messagemention from '@/fixtures/prod/pychat_chat_messagemention.json';
-import * as pychat_chat_room from '@/fixtures/prod/pychat_chat_room.json';
-import * as pychat_chat_room_users from '@/fixtures/prod/pychat_chat_room_users.json';
-import * as pychat_chat_subscription from '@/fixtures/prod/pychat_chat_subscription.json';
-import * as pychat_chat_subscription_message from '@/fixtures/prod/pychat_chat_subscription_message.json';
-import * as pychat_chat_uploadedfile from '@/fixtures/prod/pychat_chat_uploadedfile.json';
-import * as pychat_chat_user_joined_info from '@/fixtures/prod/pychat_chat_user_joined_info.json';
-import * as pychat_chat_user from '@/fixtures/prod/pychat_chat_user.json';
-import * as pychat_chat_userprofile from '@/fixtures/prod/pychat_chat_userprofile.json';
-import * as pychat_chat_verification from '@/fixtures/prod/pychat_chat_verification.json';
-import {IpAddressModel} from '@/data/model/ip.address.model';
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {ConsoleLogger} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+import {Test} from "@nestjs/testing";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {ConfigModule} from "@/modules/rest/config/config.module";
+import {getModelToken} from "@nestjs/sequelize";
+import {Sequelize} from "sequelize-typescript";
+import {Gender} from "@/data/types/frontend";
+import {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
+import {UserAuthModel} from "@/data/model/user.auth.model";
+import {UserProfileModel} from "@/data/model/user.profile.model";
+import {ChannelModel} from "@/data/model/channel.model";
+import {ImageModel} from "@/data/model/image.model";
+import {MessageModel} from "@/data/model/message.model";
+import {MessageHistoryModel} from "@/data/model/message.history.model";
+import {MessageMentionModel} from "@/data/model/message.mention.model";
+import {RoomModel} from "@/data/model/room.model";
+import {RoomUsersModel} from "@/data/model/room.users.model";
+import {SubscriptionModel} from "@/data/model/subscription.model";
+import {SubscriptionMessageModel} from "@/data/model/subscription.message.model";
+import {UploadedFileModel} from "@/data/model/uploaded.file.model";
+import {VerificationModel} from "@/data/model/verification.model";
+import * as pychat_chat_channel from "@/fixtures/prod/pychat_chat_channel.json";
+import * as pychat_chat_image from "@/fixtures/prod/pychat_chat_image.json";
+import * as pychat_chat_ip_address from "@/fixtures/prod/pychat_chat_ip_address.json";
+import * as pychat_chat_message from "@/fixtures/prod/pychat_chat_message.json";
+import * as pychat_chat_messagehistory from "@/fixtures/prod/pychat_chat_messagehistory.json";
+import * as pychat_chat_messagemention from "@/fixtures/prod/pychat_chat_messagemention.json";
+import * as pychat_chat_room from "@/fixtures/prod/pychat_chat_room.json";
+import * as pychat_chat_room_users from "@/fixtures/prod/pychat_chat_room_users.json";
+import * as pychat_chat_subscription from "@/fixtures/prod/pychat_chat_subscription.json";
+import * as pychat_chat_subscription_message from "@/fixtures/prod/pychat_chat_subscription_message.json";
+import * as pychat_chat_uploadedfile from "@/fixtures/prod/pychat_chat_uploadedfile.json";
+import * as pychat_chat_user_joined_info from "@/fixtures/prod/pychat_chat_user_joined_info.json";
+import * as pychat_chat_user from "@/fixtures/prod/pychat_chat_user.json";
+import * as pychat_chat_userprofile from "@/fixtures/prod/pychat_chat_userprofile.json";
+import * as pychat_chat_verification from "@/fixtures/prod/pychat_chat_verification.json";
+import {IpAddressModel} from "@/data/model/ip.address.model";
 
 
 async function bootstrap() {
-
-  let app = await Test.createTestingModule({
+  const app = await Test.createTestingModule({
     imports: [
       {
         module: DatabaseModule,
@@ -55,53 +54,53 @@ async function bootstrap() {
       },
 
     ],
-  }).setLogger(new ConsoleLogger()).compile();
+  }).setLogger(new ConsoleLogger()).
+    compile();
 
-  let userModel: typeof UserModel = app.get(getModelToken(UserModel));
-  let userJoinedInfoModel: typeof UserJoinedInfoModel = app.get(getModelToken(UserJoinedInfoModel));
-  let userAuthModel: typeof UserAuthModel = app.get(getModelToken(UserAuthModel));
-  let userProfileModel: typeof UserProfileModel = app.get(getModelToken(UserProfileModel));
-  let channelModel: typeof ChannelModel = app.get(getModelToken(ChannelModel));
-  let imageModel: typeof ImageModel = app.get(getModelToken(ImageModel));
-  let messageModel: typeof MessageModel = app.get(getModelToken(MessageModel));
-  let messageHistoryModel: typeof MessageHistoryModel = app.get(getModelToken(MessageHistoryModel));
-  let messageMentionModel: typeof MessageMentionModel = app.get(getModelToken(MessageMentionModel));
-  let roomModel: typeof RoomModel = app.get(getModelToken(RoomModel));
-  let roomUsersModel: typeof RoomUsersModel = app.get(getModelToken(RoomUsersModel));
-  let subscriptionModel: typeof SubscriptionModel = app.get(getModelToken(SubscriptionModel));
-  let subscriptionMessageModel: typeof SubscriptionMessageModel = app.get(getModelToken(SubscriptionMessageModel));
-  let uploadedFileModel: typeof UploadedFileModel = app.get(getModelToken(UploadedFileModel));
-  let verificationModel: typeof VerificationModel = app.get(getModelToken(VerificationModel));
-  let ipAddressModel: typeof IpAddressModel = app.get(getModelToken(IpAddressModel));
-  let sequelize = app.get(Sequelize);
+  const userModel: typeof UserModel = app.get(getModelToken(UserModel));
+  const userJoinedInfoModel: typeof UserJoinedInfoModel = app.get(getModelToken(UserJoinedInfoModel));
+  const userAuthModel: typeof UserAuthModel = app.get(getModelToken(UserAuthModel));
+  const userProfileModel: typeof UserProfileModel = app.get(getModelToken(UserProfileModel));
+  const channelModel: typeof ChannelModel = app.get(getModelToken(ChannelModel));
+  const imageModel: typeof ImageModel = app.get(getModelToken(ImageModel));
+  const messageModel: typeof MessageModel = app.get(getModelToken(MessageModel));
+  const messageHistoryModel: typeof MessageHistoryModel = app.get(getModelToken(MessageHistoryModel));
+  const messageMentionModel: typeof MessageMentionModel = app.get(getModelToken(MessageMentionModel));
+  const roomModel: typeof RoomModel = app.get(getModelToken(RoomModel));
+  const roomUsersModel: typeof RoomUsersModel = app.get(getModelToken(RoomUsersModel));
+  const subscriptionModel: typeof SubscriptionModel = app.get(getModelToken(SubscriptionModel));
+  const subscriptionMessageModel: typeof SubscriptionMessageModel = app.get(getModelToken(SubscriptionMessageModel));
+  const uploadedFileModel: typeof UploadedFileModel = app.get(getModelToken(UploadedFileModel));
+  const verificationModel: typeof VerificationModel = app.get(getModelToken(VerificationModel));
+  const ipAddressModel: typeof IpAddressModel = app.get(getModelToken(IpAddressModel));
+  const sequelize = app.get(Sequelize);
   await sequelize.transaction(async(transaction) => {
-    let users: UserModel[] = pychat_chat_user.map(a => {
-      let b: UserModel = {
+    const users: UserModel[] = pychat_chat_user.map((a) => {
+      const b: UserModel = {
         lastTimeOnline: a.last_time_online,
         username: a.username,
         id: a.id,
         sex: a.sex === 0 ? Gender.OTHER : a.sex === 1 ? Gender.MALE : Gender.FEMALE,
-        thumbnail: a.thumbnail
+        thumbnail: a.thumbnail,
       } as any;
       return b;
     });
-    await userModel.bulkCreate(users, {transaction})
+    await userModel.bulkCreate(users, {transaction});
 
-    let channelModels = pychat_chat_channel.map(key => {
-      let result: ChannelModel = {
+    const channelModels = pychat_chat_channel.map((key) => {
+      const result: ChannelModel = {
         id: key.id,
         name: key.name,
-        deletedAt: key.disabled ?new Date(): null,
+        deletedAt: key.disabled ? new Date() : null,
         creatorId: key.creator_id,
       } as any;
       return result;
-    })
-    await channelModel.bulkCreate(channelModels, {transaction})
-
+    });
+    await channelModel.bulkCreate(channelModels, {transaction});
 
 
-    let ipaddress = pychat_chat_ip_address.map(key => {
-      let result: IpAddressModel = {
+    const ipaddress = pychat_chat_ip_address.map((key) => {
+      const result: IpAddressModel = {
         id: key.id,
         ip: key.ip,
         status: true,
@@ -116,43 +115,45 @@ async function bootstrap() {
         timezone: key.timezone,
       } as any;
       return result;
-    })
-    await ipAddressModel.bulkCreate(ipaddress, {transaction})
+    });
+    await ipAddressModel.bulkCreate(ipaddress, {transaction});
 
-    let rooms = pychat_chat_room.map(key => {
-      let result: RoomModel = {
+    const rooms = pychat_chat_room.map((key) => {
+      const result: RoomModel = {
         id: key.id,
         name: key.name,
-        deletedAt: key.disabled ?new Date(): null,
+        deletedAt: key.disabled ? new Date() : null,
         channelId: key.channel_id,
         creatorId: key.creator_id,
         isMainInChannel: key.is_main_in_channel,
         p2p: key.p2p,
       } as any;
       return result;
-    })
-    await roomModel.bulkCreate(rooms, {transaction})
+    });
+    await roomModel.bulkCreate(rooms, {transaction});
 
-      let messaggs = pychat_chat_message.map(key => {
-      let result: MessageModel = {
+    const messaggs = pychat_chat_message.map((key) => {
+      const result: MessageModel = {
         id: key.id,
         senderId: key.sender_id,
         roomId: key.room_id,
         time: key.time,
         content: key.content,
         symbol: key.symbol,
-        messageStatus: {'u': 'ON_SERVER', 'r': "READ", 's': "RECEIVED"}[key.message_status],
+        messageStatus: {u: "ON_SERVER",
+          r: "READ",
+          s: "RECEIVED"}[key.message_status],
         threadMessageCount: key.thread_messages_count,
         parentMessageId: key.parent_message_id,
         updatedAt: new Date(key.updated_at),
       } as any;
       return result;
-    })
-    await messageModel.bulkCreate(messaggs, {transaction})
+    });
+    await messageModel.bulkCreate(messaggs, {transaction});
 
 
-    let roomUsers = pychat_chat_room_users.map(key => {
-      let result: RoomUsersModel = {
+    const roomUsers = pychat_chat_room_users.map((key) => {
+      const result: RoomUsersModel = {
         id: key.id,
         roomId: key.room_id,
         userId: key.user_id,
@@ -160,11 +161,11 @@ async function bootstrap() {
         volume: key.volume,
       } as any;
       return result;
-    })
-    await roomUsersModel.bulkCreate(roomUsers, {transaction})
+    });
+    await roomUsersModel.bulkCreate(roomUsers, {transaction});
 
-    let subscriptions = pychat_chat_subscription.map(key => {
-      let result: SubscriptionModel = {
+    const subscriptions = pychat_chat_subscription.map((key) => {
+      const result: SubscriptionModel = {
         id: key.id,
         userId: key.user_id,
         registrationId: key.registration_id,
@@ -176,40 +177,42 @@ async function bootstrap() {
         deletedAt: key.inactive ? new Date() : null,
       } as any;
       return result;
-    })
-    await subscriptionModel.bulkCreate(subscriptions, {transaction})
+    });
+    await subscriptionModel.bulkCreate(subscriptions, {transaction});
 
-    let uploadedFIles = pychat_chat_uploadedfile.map(key => {
-      let result: UploadedFileModel = {
+    const uploadedFIles = pychat_chat_uploadedfile.map((key) => {
+      const result: UploadedFileModel = {
         id: key.id,
-        type: {v: 'VIDEO', i: 'IMAGE', 'f': 'FILE'}[key.type],
+        type: {v: "VIDEO",
+          i: "IMAGE",
+          f: "FILE"}[key.type],
         symbol: key.symbol,
         userId: key.user_id,
         file: key.file,
       } as any;
       return result;
-    })
-    await uploadedFileModel.bulkCreate(uploadedFIles, {transaction})
+    });
+    await uploadedFileModel.bulkCreate(uploadedFIles, {transaction});
 
-    let userJoinedInfo = pychat_chat_user_joined_info.map(key => {
-      let result: UserJoinedInfoModel = {
+    const userJoinedInfo = pychat_chat_user_joined_info.map((key) => {
+      const result: UserJoinedInfoModel = {
         id: key.id,
         createdAt: new Date(key.time),
         ipId: key.ip_id,
         userId: key.user_id,
       } as any;
       return result;
-    })
-    await userJoinedInfoModel.bulkCreate(userJoinedInfo, {transaction})
+    });
+    await userJoinedInfoModel.bulkCreate(userJoinedInfo, {transaction});
 
 
-  let verifications = pychat_chat_verification.map(key => {
-      let result: VerificationModel = {
+    const verifications = pychat_chat_verification.map((key) => {
+      const result: VerificationModel = {
         id: key.id,
         type: {
-          r: 'REGISTER',
-          p: 'PASSWORD',
-          c: 'EMAIL',
+          r: "REGISTER",
+          p: "PASSWORD",
+          c: "EMAIL",
         }[key.type],
         token: key.token,
         createdAt: new Date(key.time),
@@ -218,11 +221,12 @@ async function bootstrap() {
         email: key.email,
       } as any;
       return result;
-    })
-    await verificationModel.bulkCreate(verifications, {transaction})
+    });
+    await verificationModel.bulkCreate(verifications, {transaction});
 
-    let auth = pychat_chat_userprofile.map(u => ({...u, ...pychat_chat_user.find(us => us.id == u.user_ptr_id)})).map(key => {
-      let result: UserAuthModel = {
+    const auth = pychat_chat_userprofile.map((u) => ({...u,
+      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id)})).map((key) => {
+      const result: UserAuthModel = {
         id: key.id,
         password: key.password,
         email: key.email,
@@ -231,12 +235,13 @@ async function bootstrap() {
         emailVerificationId: key.email_verification_id,
       } as any;
       return result;
-    })
-    await userAuthModel.bulkCreate(auth, {transaction})
+    });
+    await userAuthModel.bulkCreate(auth, {transaction});
 
 
-    let userProf = pychat_chat_userprofile.map(u => ({...u, ...pychat_chat_user.find(us => us.id == u.user_ptr_id)})).map(key => {
-      let result: UserProfileModel = {
+    const userProf = pychat_chat_userprofile.map((u) => ({...u,
+      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id)})).map((key) => {
+      const result: UserProfileModel = {
         id: key.id,
         name: key.name,
         city: key.city,
@@ -245,67 +250,66 @@ async function bootstrap() {
         contacts: key.contacts,
       } as any;
       return result;
-    })
-    await userProfileModel.bulkCreate(userProf, {transaction})
+    });
+    await userProfileModel.bulkCreate(userProf, {transaction});
 
-       let mentions = pychat_chat_messagemention.map(key => {
-      let result: MessageMentionModel = {
+    const mentions = pychat_chat_messagemention.map((key) => {
+      const result: MessageMentionModel = {
         id: key.id,
         symbol: key.symbol,
         messageId: key.message_id,
         userId: key.user_id,
       } as any;
       return result;
-    })
-    await messageMentionModel.bulkCreate(mentions, {transaction})
+    });
+    await messageMentionModel.bulkCreate(mentions, {transaction});
 
 
-    let subMessage = pychat_chat_subscription_message.map(key => {
-      let result: SubscriptionMessageModel = {
+    const subMessage = pychat_chat_subscription_message.map((key) => {
+      const result: SubscriptionMessageModel = {
         id: key.id,
         subscriptionId: key.subscription_id,
         messageId: key.message_id,
         received: key.received,
       } as any;
       return result;
-    })
-    await subscriptionMessageModel.bulkCreate(subMessage, {transaction})
+    });
+    await subscriptionMessageModel.bulkCreate(subMessage, {transaction});
 
-      let imageModels = pychat_chat_image.map(key => {
-      let result: ImageModel = {
+    const imageModels = pychat_chat_image.map((key) => {
+      const result: ImageModel = {
         id: key.id,
         type: {
-          i: 'IMAGE',
-          v: 'VIDEO',
-          m: 'MEDIA_RECORD',
-          a: 'AUDIO_RECORD',
-          f: 'FILE',
-          g: 'GIPHY',
+          i: "IMAGE",
+          v: "VIDEO",
+          m: "MEDIA_RECORD",
+          a: "AUDIO_RECORD",
+          f: "FILE",
+          g: "GIPHY",
         }[key.type],
         symbol: key.symbol,
         messageId: key.message_id,
         img: key.img,
         preview: key.preview,
         absoluteUrl: key.absolute_url,
-        webpAsboluteUrl: key.webp_absolute_url
+        webpAsboluteUrl: key.webp_absolute_url,
       } as any;
       return result;
-    })
-    await imageModel.bulkCreate(imageModels, {transaction})
+    });
+    await imageModel.bulkCreate(imageModels, {transaction});
 
 
-     let histories = pychat_chat_messagehistory.map(key => {
-      let result: MessageHistoryModel = {
+    const histories = pychat_chat_messagehistory.map((key) => {
+      const result: MessageHistoryModel = {
         id: key.id,
         messageId: key.message_id,
         time: key.time,
         content: key.content,
       } as any;
       return result;
-    })
-    await messageHistoryModel.bulkCreate(histories, {transaction})
-
-  })
+    });
+    await messageHistoryModel.bulkCreate(histories, {transaction});
+  });
 }
 
 bootstrap();
diff --git a/newback/src/utils/migration.runner.ts b/newback/src/utils/migration.runner.ts
index 1fd780ed3..9df4a6c7c 100644
--- a/newback/src/utils/migration.runner.ts
+++ b/newback/src/utils/migration.runner.ts
@@ -1,11 +1,13 @@
-import {createConnection} from 'mysql2';
-import {generateOrmConfig} from '@/utils/helpers';
+import {createConnection} from "mysql2";
+import {generateOrmConfig} from "@/utils/helpers";
 import {
   CommandsRunner,
-  MysqlDriver
-} from 'node-db-migration';
+  MysqlDriver,
+} from "node-db-migration";
 
-const {database, host, password, port, username, define} = generateOrmConfig((sql) => console.log(sql))
+const {database, host, password, port, username, define} = generateOrmConfig((sql) => {
+  console.log(sql);
+});
 
 const connection = createConnection({
   database,
@@ -16,16 +18,20 @@ const connection = createConnection({
   multipleStatements: true,
   charset: define.charset,
   connectAttributes: {
-    'collate': define.collate
-  }
+    collate: define.collate,
+  },
 });
 
-connection.connect(async function (err) {
-  let migrations = new CommandsRunner({
+connection.connect(async(err) => {
+  const migrations = new CommandsRunner({
     driver: new MysqlDriver(connection),
     directoryWithScripts: `${__dirname}/../data/migration/`,
   });
-  await migrations.run('init')
-  await migrations.run('migrate')
-  await new Promise((resolve, reject) => connection.end((err) => err ? reject() : resolve(undefined)));
+  await migrations.run("init");
+  await migrations.run("migrate");
+  await new Promise((resolve, reject) => {
+    connection.end((err) => {
+      err ? reject() : resolve(undefined);
+    });
+  });
 });

From ce7343661043e8de926b009099d123c8754cb72d Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 16 Apr 2022 15:15:36 +0300
Subject: [PATCH 066/221] Fixing image model

---
 common/dto.ts                                 |  9 +---
 frontend/src/ts/classes/DatabaseWrapper.ts    | 10 ++---
 frontend/src/ts/types/model.ts                | 12 +++---
 frontend/src/ts/utils/htmlApi.ts              |  6 +--
 .../migration.start/202204110326-init.sql     | 20 ++++-----
 newback/src/data/model/image.model.ts         | 14 +------
 .../modules/api/websocket/message.service.ts  | 25 ++++++++++-
 .../websocket/transformers/ws.transformer.ts  | 42 +++++++++++++++++++
 .../repository/message.repository.e2e.spec.ts | 13 +++---
 .../repository/messages.repository.ts         | 34 +++++++++++++--
 newback/src/utils/migration.old.ts            | 33 ++++++++-------
 11 files changed, 144 insertions(+), 74 deletions(-)

diff --git a/common/dto.ts b/common/dto.ts
index 252b760af..cd7c92341 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -613,16 +613,9 @@ export interface RoomDto extends RoomNoUsersDto {
 export interface FileModelDto {
   url: string;
   id: number;
-  type: BlobType;
+  type: ImageType;
   preview: string;
 }
 
-export type BlobType =
-  "a"
-  | "f"
-  | "g"
-  | "i"
-  | "m"
-  | "v";
 
 export const WS_SESSION_EXPIRED_CODE = 4001;
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 188a40c5b..74b71b438 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -36,11 +36,11 @@ import type {
 } from "@/ts/types/db";
 import type {SetStateFromStorage} from "@/ts/types/dto";
 import type {MainWindow} from "@/ts/classes/MainWindow";
+import type {ImageType} from "@/ts/types/backend";
 import {
-  BlobType,
-  MessageStatus
-} from '@/ts/types/backend';
-import {MessageStatusInner} from '@/ts/types/model';
+  MessageStatus,
+} from "@/ts/types/backend";
+import {MessageStatusInner} from "@/ts/types/model";
 
 type TransactionCb = (t: SQLTransaction, ...rest: unknown[]) => void;
 type QueryObject = [string, any[]];
@@ -501,7 +501,7 @@ export default class DatabaseWrapper implements IStorage {
           serverId: f.server_id,
           previewFileId: f.preview_file_id,
           sending: convertToBoolean(f.sending),
-          type: f.type as BlobType,
+          type: f.type as ImageType,
           preview: f.preview,
 
         };
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 7c1bc59da..d6eee73ad 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,9 +1,9 @@
 import type {LogLevel} from "lines-logger";
-import {
-  BlobType,
+import type {
+  ImageType,
   Gender,
-  MessageStatus
-} from '@/ts/types/backend';
+  MessageStatus,
+} from "@/ts/types/backend";
 
 export enum GrowlType {
   SUCCESS = "col-success", INFO = "col-info", ERROR = "col-error",
@@ -98,7 +98,7 @@ export interface Location {
 
 export interface FileModel {
   url: string | null;
-  type: BlobType;
+  type: ImageType;
   serverId: number | null;
   previewFileId: number | null;
   fileId: number | null;
@@ -138,7 +138,7 @@ export interface MessageModel {
 }
 
 export enum MessageStatusInner {
-  SENDING = 'SENDING'
+  SENDING = "SENDING",
 }
 export type MessageStatusModel = MessageStatus | MessageStatusInner;
 
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index d48fb578a..f756c27f3 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -25,7 +25,7 @@ import {
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GIFObject} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
-import {BlobType} from '@/ts/types/backend';
+import type {ImageType} from "@/ts/types/backend";
 
 const tmpCanvasContext: CanvasRenderingContext2D = document.createElement("canvas").getContext("2d")!; // TODO why is it not safe?
 const yotubeTimeRegex = /(?:(\d*)h)?(?:(\d*)m)?(?:(\d*)s)?(\d)?/;
@@ -606,7 +606,7 @@ export function getMessageData(userMessage: HTMLElement, messageModel?: MessageM
     const serverId = parseInt(img.getAttribute("serverId")!);
     const asGiphy = img.className.includes(PASTED_GIPHY_CLASS) ? img.getAttribute("url") : null;
     const asGiphyPreview = img.className.includes(PASTED_GIPHY_CLASS) ? img.getAttribute("webp") : null;
-    const videoType: BlobType = img.getAttribute("videoType")! as BlobType;
+    const videoType: ImageType = img.getAttribute("videoType")! as ImageType;
 
     let elSymbol = oldSymbol;
     if (!elSymbol) {
@@ -624,7 +624,7 @@ export function getMessageData(userMessage: HTMLElement, messageModel?: MessageM
         return;
       }
     }
-    let type: BlobType;
+    let type: ImageType;
     if (videoType) {
       type = videoType;
     } else if (assAudio) {
diff --git a/newback/src/data/migration.start/202204110326-init.sql b/newback/src/data/migration.start/202204110326-init.sql
index c680afd34..8b5c529e1 100644
--- a/newback/src/data/migration.start/202204110326-init.sql
+++ b/newback/src/data/migration.start/202204110326-init.sql
@@ -69,17 +69,15 @@ CREATE TABLE `message`
   COLLATE utf8mb4_general_ci;
 CREATE TABLE `image`
 (
-    `id`                INTEGER auto_increment,
-    `type`              ENUM('VIDEO', 'FILE', 'MEDIA_RECORD', 'AUDIO_RECORD', 'IMAGE', 'PREVIEW', 'GIPHY') NOT NULL,
-    `symbol`            VARCHAR(1)                       NOT NULL,
-    `message_id`        INTEGER                          NOT NULL,
-    `img`               VARCHAR(255),
-    `preview`           VARCHAR(255),
-    `absolute_url`      VARCHAR(255),
-    `webp_asbolute_url` VARCHAR(255),
-    `created_at`        DATETIME                         NOT NULL,
-    `updated_at`        DATETIME                         NOT NULL,
-    `deleted_at`        DATETIME,
+    `id`         INTEGER auto_increment,
+    `type`       ENUM ('VIDEO', 'FILE', 'MEDIA_RECORD', 'AUDIO_RECORD', 'IMAGE', 'PREVIEW', 'GIPHY') NOT NULL,
+    `symbol`     VARCHAR(1)                                                                          NOT NULL,
+    `message_id` INTEGER                                                                             NOT NULL,
+    `img`        VARCHAR(255)                                                                        NOT NULL,
+    `preview`    VARCHAR(255),
+    `created_at` DATETIME                                                                            NOT NULL,
+    `updated_at` DATETIME                                                                            NOT NULL,
+    `deleted_at` DATETIME,
     UNIQUE `unique_image_symbol_message` (`symbol`, `message_id`),
     PRIMARY KEY (`id`),
     FOREIGN KEY (`message_id`) REFERENCES `message` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
diff --git a/newback/src/data/model/image.model.ts b/newback/src/data/model/image.model.ts
index 4e0ebb358..ab2cdd8df 100644
--- a/newback/src/data/model/image.model.ts
+++ b/newback/src/data/model/image.model.ts
@@ -50,7 +50,7 @@ export class ImageModel extends Model<ImageModel> {
 
   @Column({
     type: DataType.STRING,
-    allowNull: true,
+    allowNull: false,
   })
   public img: string;
 
@@ -59,16 +59,4 @@ export class ImageModel extends Model<ImageModel> {
     allowNull: true,
   })
   public preview: string;
-
-  @Column({
-    type: DataType.STRING,
-    allowNull: true,
-  })
-  public absoluteUrl: string;
-
-  @Column({
-    type: DataType.STRING,
-    allowNull: true,
-  })
-  public webpAsboluteUrl: string;
 }
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 2b18705b3..951d80ea0 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -8,6 +8,11 @@ import type {
   ShowITypeWsInMessage,
   ShowITypeWsOutMessage,
   SyncHistoryOutMessage,
+  SyncHistoryResponseMessage,
+} from "@/data/types/frontend";
+import {
+  ImageType,
+  MessageStatus,
 } from "@/data/types/frontend";
 import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
 import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
@@ -50,11 +55,27 @@ export class MessageService {
   }
 
   public async syncHistory(data: SyncHistoryOutMessage, context: WebSocketContextData) {
-    const messagesIds = await this.messageRepository.getNewMessagesAfterSync(data.roomIds, data.messagesIds, data.lastSynced);
+    // MessageStatus.ON_SERVER
+    const messages = await this.messageRepository.getNewOnServerMessages(data.roomIds, data.messagesIds, data.lastSynced);
+
+    let receivedMessageIds = [];
     if (data.onServerMessageIds) {
-      this.messageRepository.getMessages2(data.roomIds, data.onServerMessageIds,);
+      receivedMessageIds = await this.messageRepository.getMessagesByIdsAndStatus(data.roomIds, data.onServerMessageIds, MessageStatus.RECEIVED);
+    }
+
+    let readmesageIds = [];
+    if (data.receivedMessageIds) {
+      const ids = [...data.receivedMessageIds, ...data.onServerMessageIds];
+      readmesageIds = await this.messageRepository.getMessagesByIdsAndStatus(data.roomIds, ids, MessageStatus.READ);
     }
 
+    const messageIdsWithSymbol: number[] = messages.filter((m) => m.symbol).map((m) => m.id);
+    const images = await this.messageRepository.getImagesByMessagesId(messageIdsWithSymbol);
+    const mentions = await this.messageRepository.getTagsByMessagesId(messageIdsWithSymbol);
+
+
+    const dtso: any = messages.map((m) => transformMessage(m, mentions, images));
+
   /*
    *
    * If in_message[VarNames.ON_SERVER_MESSAGE_IDS]:
diff --git a/newback/src/modules/api/websocket/transformers/ws.transformer.ts b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
index dfaee67fd..d1fc0bdf6 100644
--- a/newback/src/modules/api/websocket/transformers/ws.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
@@ -7,6 +7,8 @@ import type {
   UserProfileDto,
   UserSettingsDto,
   RemoveOnlineUserMessage,
+  MessageModelDto,
+  FileModelDto,
 } from "@/data/types/frontend";
 import type {UserModel} from "@/data/model/user.model";
 import type {
@@ -16,6 +18,9 @@ import type {
 import type {ChannelModel} from "@/data/model/channel.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {GetRoomsForUser} from "@/modules/rest/database/repository/room.repository";
+import type {MessageModel} from "@/data/model/message.model";
+import type {MessageMentionModel} from "@/data/model/message.mention.model";
+import type {ImageModel} from "@/data/model/image.model";
 
 export interface TransformSetWsIdDataParams {
   myRooms: GetRoomsForUser[];
@@ -155,3 +160,40 @@ export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number,
     userId: context.userId,
   };
 }
+
+
+function getTags(mentions: MessageMentionModel[], m: MessageModel) {
+  return mentions.filter((mention) => mention.messageId == m.id).reduce((mentions, mention) => {
+    mentions[mention.symbol] = mention.userId;
+    return mentions;
+  }, {});
+}
+
+function getFiles(images: ImageModel[], m: MessageModel): Record<number, FileModelDto> {
+  return Object.fromEntries(images.filter((i) => i.messageId === m.id).map((i) => [
+    i.symbol, {
+      url: i.img,
+      type: i.type,
+      preview: i.preview,
+      id: i.id,
+    },
+  ]));
+}
+
+function getMessage(m: MessageModel, mentions: MessageMentionModel[], images: ImageModel[]): MessageModelDto {
+  return {
+    id: m.id,
+    content: m.content,
+    tags: getTags(mentions, m),
+    roomId: m.roomId,
+    userId: m.senderId,
+    parentMessage: m.parentMessageId,
+    deleted: Boolean(m.deletedAt),
+    threadMessagesCount: m.threadMessageCount,
+    symbol: m.symbol,
+    status: m.messageStatus,
+    time: m.time,
+    edited: m.updatedAt,
+    files: getFiles(images, m),
+  };
+}
diff --git a/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts b/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
index b2ad237df..86f26451a 100644
--- a/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
+++ b/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
@@ -1,14 +1,11 @@
 import {DatabaseModule} from "@/modules/rest/database/database.module";
 import {ConsoleLogger} from "@nestjs/common";
-import type {
-  TestingModule,
-} from "@nestjs/testing";
-import {
-  Test,
-} from "@nestjs/testing";
+import type {TestingModule} from "@nestjs/testing";
+import {Test} from "@nestjs/testing";
 import {LoggerModule} from "@/modules/rest/logger/logger.module";
 import {ConfigModule} from "@/modules/rest/config/config.module";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import {MessageStatus} from "../common/dto";
 
 describe("MessageRepository", () => {
   let app: TestingModule;
@@ -31,13 +28,13 @@ describe("MessageRepository", () => {
   describe("getNewMessagesFromRoom", () => {
     it("should produce correct sql", async() => {
       const mr: MessageRepository = app.get(MessageRepository);
-      const result = await mr.getNewMessagesAfterSync([1, 2], [3, 4], 3600000);
+      const result = await mr.getNewOnServerMessages([1, 2], [3, 4], 3600000);
     });
   });
   describe("getMessages2", () => {
     it("should produce correct sql", async() => {
       const mr: MessageRepository = app.get(MessageRepository);
-      const result = await mr.getMessages2([1, 2], [3, 4]);
+      const result = await mr.getMessagesByIdsAndStatus([1, 2], [3, 4], MessageStatus.READ);
     });
   });
 });
diff --git a/newback/src/modules/rest/database/repository/messages.repository.ts b/newback/src/modules/rest/database/repository/messages.repository.ts
index 10a611677..167e976ff 100644
--- a/newback/src/modules/rest/database/repository/messages.repository.ts
+++ b/newback/src/modules/rest/database/repository/messages.repository.ts
@@ -3,16 +3,20 @@ import {InjectModel} from "@nestjs/sequelize";
 import {Op} from "sequelize";
 import {MessageModel} from "@/data/model/message.model";
 import {MessageStatus} from "@/data/types/frontend";
+import {ImageModel} from "@/data/model/image.model";
+import {MessageMentionModel} from "@/data/model/message.mention.model";
 
 
 @Injectable()
 export class MessageRepository {
   public constructor(
     @InjectModel(MessageModel) private readonly messageModel: typeof MessageModel,
+    @InjectModel(ImageModel) private readonly imageModel: typeof ImageModel,
+    @InjectModel(MessageMentionModel) private readonly messageMentionModel: typeof MessageMentionModel,
   ) {
   }
 
-  public async getNewMessagesAfterSync(roomIds: number[], messageIds: number[], lastSynced: number): Promise<MessageModel[]> {
+  public async getNewOnServerMessages(roomIds: number[], messageIds: number[], lastSynced: number): Promise<MessageModel[]> {
     return this.messageModel.findAll({
       where: {
         roomId: {
@@ -28,11 +32,12 @@ export class MessageRepository {
           messageStatus: MessageStatus.ON_SERVER,
         },
       },
+      paranoid: true,
     });
   }
 
-  public async getMessages2(roomIds: number[], onServerMessageIds: number[]): Promise<MessageModel[]> {
-    return this.messageModel.findAll({
+  public async getMessagesByIdsAndStatus(roomIds: number[], onServerMessageIds: number[], status: MessageStatus): Promise<number[]> {
+    return (await this.messageModel.findAll({
       where: {
         roomId: {
           [Op.in]: roomIds,
@@ -40,9 +45,30 @@ export class MessageRepository {
         id: {
           [Op.in]: onServerMessageIds,
         },
-        messageStatus: MessageStatus.RECEIVED,
+        messageStatus: status,
       },
       attributes: ["id"],
+      paranoid: true,
+    })).map((m) => m.id);
+  }
+
+  public async getImagesByMessagesId(messageIds: number[]): Promise<ImageModel[]> {
+    return this.imageModel.findAll({
+      where: {
+        messageId: {
+          [Op.in]: messageIds,
+        },
+      },
+    });
+  }
+
+  public async getTagsByMessagesId(messageIds: number[]): Promise<MessageMentionModel[]> {
+    return this.messageMentionModel.findAll({
+      where: {
+        messageId: {
+          [Op.in]: messageIds,
+        },
+      },
     });
   }
 }
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index d02f3e96a..f8989efa8 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -54,8 +54,7 @@ async function bootstrap() {
       },
 
     ],
-  }).setLogger(new ConsoleLogger()).
-    compile();
+  }).setLogger(new ConsoleLogger()).compile();
 
   const userModel: typeof UserModel = app.get(getModelToken(UserModel));
   const userJoinedInfoModel: typeof UserJoinedInfoModel = app.get(getModelToken(UserJoinedInfoModel));
@@ -140,9 +139,11 @@ async function bootstrap() {
         time: key.time,
         content: key.content,
         symbol: key.symbol,
-        messageStatus: {u: "ON_SERVER",
+        messageStatus: {
+          u: "ON_SERVER",
           r: "READ",
-          s: "RECEIVED"}[key.message_status],
+          s: "RECEIVED"
+        }[key.message_status],
         threadMessageCount: key.thread_messages_count,
         parentMessageId: key.parent_message_id,
         updatedAt: new Date(key.updated_at),
@@ -183,9 +184,11 @@ async function bootstrap() {
     const uploadedFIles = pychat_chat_uploadedfile.map((key) => {
       const result: UploadedFileModel = {
         id: key.id,
-        type: {v: "VIDEO",
+        type: {
+          v: "VIDEO",
           i: "IMAGE",
-          f: "FILE"}[key.type],
+          f: "FILE"
+        }[key.type],
         symbol: key.symbol,
         userId: key.user_id,
         file: key.file,
@@ -224,8 +227,10 @@ async function bootstrap() {
     });
     await verificationModel.bulkCreate(verifications, {transaction});
 
-    const auth = pychat_chat_userprofile.map((u) => ({...u,
-      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id)})).map((key) => {
+    const auth = pychat_chat_userprofile.map((u) => ({
+      ...u,
+      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id)
+    })).map((key) => {
       const result: UserAuthModel = {
         id: key.id,
         password: key.password,
@@ -239,8 +244,10 @@ async function bootstrap() {
     await userAuthModel.bulkCreate(auth, {transaction});
 
 
-    const userProf = pychat_chat_userprofile.map((u) => ({...u,
-      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id)})).map((key) => {
+    const userProf = pychat_chat_userprofile.map((u) => ({
+      ...u,
+      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id)
+    })).map((key) => {
       const result: UserProfileModel = {
         id: key.id,
         name: key.name,
@@ -289,10 +296,8 @@ async function bootstrap() {
         }[key.type],
         symbol: key.symbol,
         messageId: key.message_id,
-        img: key.img,
-        preview: key.preview,
-        absoluteUrl: key.absolute_url,
-        webpAsboluteUrl: key.webp_absolute_url,
+        img: key.type === 'g' ? key.absolute_url : key.img,
+        preview: key.type === 'g' ? key.webp_absolute_url : key.preview,
       } as any;
       return result;
     });

From 3d8dd2f3de31df7fe606df44b3727855f3b1bc55 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 16 Apr 2022 16:35:04 +0300
Subject: [PATCH 067/221] Fixed captcha and syncMessage

---
 common/dto.ts                                 |  4 +-
 frontend/src/ts/message_handlers/WsHandler.ts | 40 +++++-----
 .../ts/message_handlers/WsMessageHandler.ts   | 15 ++--
 frontend/src/ts/utils/htmlApi.ts              | 24 +++---
 frontend/src/vue/auth/CaptchaComponent.vue    | 80 ++++++++++---------
 frontend/src/vue/chat/chatbox/ChatBox.vue     |  2 +-
 .../src/vue/chat/textarea/ChatTextArea.vue    |  3 +-
 newback/.gitignore                            |  1 +
 .../modules/api/websocket/message.service.ts  | 10 +--
 .../websocket/transformers/ws.transformer.ts  | 67 ++++++++++------
 .../api/websocket/websocket.gateway.ts        | 18 +++--
 11 files changed, 144 insertions(+), 120 deletions(-)

diff --git a/common/dto.ts b/common/dto.ts
index cd7c92341..7caf904f3 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -147,7 +147,7 @@ export interface DefaultMessage<A extends string> {
 }
 
 
-export interface SyncHistoryOutMessage extends DefaultWsOutMessage<"syncHistory"> {
+export interface SyncHistoryWsOutMessage extends DefaultWsOutMessage<"syncHistory"> {
   roomIds: number[];
   messagesIds: number[];
   onServerMessageIds: number[];
@@ -324,7 +324,7 @@ export interface MessagesResponseMessage {
   content: MessageModelDto[];
 }
 
-export interface SyncHistoryResponseMessage extends MessagesResponseMessage {
+export interface SyncHistoryWsInMessage extends MessagesResponseMessage {
   readMessageIds: number[];
   receivedMessageIds: number[];
 }
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index cbf877d25..0b3bdecfd 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -25,17 +25,15 @@ import {
   currentUserInfoDtoToModel,
   userSettingsDtoToModel,
 } from "@/ts/types/converters";
-import type {
-  GiphyDto,
+import type {GiphyDto,
   RoomNoUsersDto,
   UserProfileDto,
   UserProfileDtoWoImage,
   UserSettingsDto,
-} from "@/ts/types/dto";
+  GetCountryCodeWsOutMessage} from "@/ts/types/dto";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
-import type {
-  AddChannelMessage,
+import type {AddChannelMessage,
   AddInviteMessage,
   AddRoomMessage,
   DefaultWsOutMessage,
@@ -49,27 +47,25 @@ import type {
   SetSettingsMessage,
   SetUserProfileMessage,
   SetWsIdMessage,
-  SyncHistoryOutMessage,
-  SyncHistoryResponseMessage,
+  SyncHistoryWsOutMessage,
+  SyncHistoryWsInMessage,
   UserProfileChangedMessage,
   WebRtcSetConnectionIdMessage,
   ShowITypeWsOutMessage,
-} from "@/ts/types/backend";
+
+  HandlerType,
+  HandlerTypes,
+
+  MessageStatus} from "@/ts/types/backend";
 import type {
   InternetAppearMessage,
   LogoutMessage,
   PubSetRooms,
 } from "@/ts/types/messages/innerMessages";
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
 import type Subscription from "@/ts/classes/Subscription";
 import {
-  MessageStatus,
-  WS_SESSION_EXPIRED_CODE
-} from '@/ts/types/backend';
-import {GetCountryCodeWsOutMessage} from '@/ts/types/dto';
+  WS_SESSION_EXPIRED_CODE,
+} from "@/ts/types/backend";
 
 enum WsState {
   NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
@@ -154,9 +150,9 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
   }
 
   public async getCountryCode(): Promise<GetCountryCodeWsInMessage> {
-    let body: GetCountryCodeWsOutMessage = {
+    const body: GetCountryCodeWsOutMessage = {
       action: "getCountryCode",
-    }
+    };
     return this.messageProc.sendToServerAndAwait(body);
   }
 
@@ -279,10 +275,10 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
   }
 
   public showIType(roomId: number): void {
-    let request: ShowITypeWsOutMessage = {
+    const request: ShowITypeWsOutMessage = {
       roomId,
       action: "showIType",
-    }
+    };
     this.sendToServer(request);
   }
 
@@ -311,8 +307,8 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     receivedMessageIds: number[],
     onServerMessageIds: number[],
     lastSynced: number,
-  ): Promise<SyncHistoryResponseMessage> {
-    const payload: SyncHistoryOutMessage = {
+  ): Promise<SyncHistoryWsInMessage> {
+    const payload: SyncHistoryWsOutMessage = {
       messagesIds,
       receivedMessageIds,
       onServerMessageIds,
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index f7dd08190..01e890bbd 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -15,7 +15,7 @@ import type {
   MessageModel,
   RoomModel,
 } from "@/ts/types/model";
-import {MessageStatusInner} from '@/ts/types/model';
+import {MessageStatusInner} from "@/ts/types/model";
 import type {Logger} from "lines-logger";
 
 import type {
@@ -23,7 +23,7 @@ import type {
   MessageModelDto,
   SaveFileResponse,
 } from "@/ts/types/dto";
-import {MessageStatus} from '@/ts/types/dto';
+import {MessageStatus} from "@/ts/types/dto";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
@@ -37,7 +37,7 @@ import type {
   MessagesResponseMessage,
   PrintMessage,
   SetMessageStatusMessage,
-  SyncHistoryResponseMessage,
+  SyncHistoryWsInMessage,
 } from "@/ts/types/backend";
 import {savedFiles} from "@/ts/utils/htmlApi";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
@@ -51,6 +51,7 @@ import {
   getMissingIds,
 } from "@/ts/utils/pureFunctions";
 import type Subscription from "@/ts/classes/Subscription";
+import {ImageType} from "@/ts/types/backend";
 
 export default class WsMessageHandler extends MessageHandler implements MessageSender {
   protected readonly logger: Logger;
@@ -322,7 +323,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
         symbol: message.symbol || null,
         threadMessagesCount: message.threadMessagesCount,
         isHighlighted: false,
-        status: message.status === MessageStatusInner.SENDING ? MessageStatus.ON_SERVER: message.status,
+        status: message.status === MessageStatusInner.SENDING ? MessageStatus.ON_SERVER : message.status,
         edited: inMessage.edited,
         roomId: message.roomId,
         userId: message.userId,
@@ -381,7 +382,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     if (!storeMessage.files) {
       return [];
     }
-    return Object.entries(storeMessage.files).filter(([k, v]) => v.type === "g" && !v.serverId).
+    return Object.entries(storeMessage.files).filter(([k, v]) => v.type === ImageType.GIPHY && !v.serverId).
       map(([k, v]) => ({
         url: v.url!,
         symbol: k,
@@ -396,7 +397,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       if (fileValues.find((f) => !f.fileId && f.sending)) {
         throw Error("New files were added during upload"); // TODO
       }
-      fileValues.filter((fv) => fv.type !== "g").forEach((fv) => {
+      fileValues.filter((fv) => fv.type !== ImageType.GIPHY).forEach((fv) => {
         files.push(fv.fileId!);
         if (fv.previewFileId) {
           files.push(fv.previewFileId);
@@ -479,7 +480,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     }
     joined = parseInt(joined);
 
-    const result: SyncHistoryResponseMessage = await this.ws.syncHistory(
+    const result: SyncHistoryWsInMessage = await this.ws.syncHistory(
       roomIds,
       messagesIds,
       receivedMessageIds,
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index f756c27f3..c488b70c5 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -25,7 +25,7 @@ import {
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GIFObject} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
-import type {ImageType} from "@/ts/types/backend";
+import {ImageType} from "@/ts/types/backend";
 
 const tmpCanvasContext: CanvasRenderingContext2D = document.createElement("canvas").getContext("2d")!; // TODO why is it not safe?
 const yotubeTimeRegex = /(?:(\d*)h)?(?:(\d*)m)?(?:(\d*)s)?(\d)?/;
@@ -238,17 +238,17 @@ function encodeFiles(html: string, files: Record<string, FileModel> | null) {
     html = html.replace(imageUnicodeRegex, (s) => {
       const v = files[s];
       if (v) {
-        if (v.type === "i") {
+        if (v.type === ImageType.IMAGE) {
           return `<img src='${resolveMediaUrl(v.url!)}' symbol='${s}' class='${PASTED_IMG_CLASS}' serverId="${v.serverId}"/>`;
-        } else if (v.type === "v" || v.type === "m") {
-          const className = v.type === "v" ? "video-player" : "video-player video-record";
+        } else if (v.type === ImageType.VIDEO || v.type === ImageType.MEDIA_RECORD) {
+          const className = v.type === ImageType.VIDEO ? "video-player" : "video-player video-record";
 
           return `<div class='${className}' serverId="${v.serverId}" associatedVideo='${v.url}'><div><img ${v.preview ? `src="${resolveMediaUrl(v.preview)}"` : ""} symbol='${s}' class='${PASTED_IMG_CLASS}'/><div class="icon-youtube-play"></div></div></div>`;
-        } else if (v.type === "a") {
+        } else if (v.type === ImageType.AUDIO_RECORD) {
           return `<img src='${recordIcon}' serverId="${v.serverId}" symbol='${s}' associatedAudio='${v.url}' class='audio-record'/>`;
-        } else if (v.type === "f") {
+        } else if (v.type === ImageType.FILE) {
           return `<a href="${resolveMediaUrl(v.url!)}" serverId="${v.serverId}" target="_blank" download><img src='${fileIcon}' symbol='${s}' class='uploading-file'/></a>`;
-        } else if (v.type === "g") {
+        } else if (v.type === ImageType.GIPHY) {
           // Giphy api sometimes doesn't contain webp, so it can be null
           return `<img serverId="${v.serverId}" src='${webpSupported && v.preview ? v.preview : v.url}' ${v.preview ? `webp="${v.preview}"` : ""} url="${v.url}" symbol='${s}' class='${PASTED_IMG_CLASS} ${PASTED_GIPHY_CLASS}'/>`;
         }
@@ -573,7 +573,7 @@ export function pasteImgToTextArea(file: File, textArea: HTMLElement, errCb: Fun
     const img = blobToImg(file);
     pasteNodeAtCaret(img, textArea);
   } else if (file.type.includes("video")) {
-    pasteBlobVideoToTextArea(file, textArea, "v", errCb);
+    pasteBlobVideoToTextArea(file, textArea, ImageType.VIDEO, errCb);
   } else {
     errCb(`Pasted file type ${file.type}, which is not an image`);
   }
@@ -628,13 +628,13 @@ export function getMessageData(userMessage: HTMLElement, messageModel?: MessageM
     if (videoType) {
       type = videoType;
     } else if (assAudio) {
-      type = "a";
+      type = ImageType.AUDIO_RECORD;
     } else if (assFile) {
-      type = "f";
+      type = ImageType.FILE;
     } else if (asGiphy) {
-      type = "g";
+      type = ImageType.GIPHY;
     } else {
-      type = "i";
+      type = ImageType.IMAGE;
     }
 
     let url: string;
diff --git a/frontend/src/vue/auth/CaptchaComponent.vue b/frontend/src/vue/auth/CaptchaComponent.vue
index 2f76d8059..b4b83fc92 100644
--- a/frontend/src/vue/auth/CaptchaComponent.vue
+++ b/frontend/src/vue/auth/CaptchaComponent.vue
@@ -37,13 +37,13 @@ import {
 import type {GoogleCaptcha} from "@/ts/types/model";
 import {ref} from "vue";
 
-const captchaInited = ref(false)
+const captchaInited = ref(false);
 
-let captchaId = 1; // Just random id to diff one comp fro another
+let captchaId = 1; // Just random id to diff one comp from another
 
 window.onloadrecaptcha = function () {
   captchaInited.value = true;
-}
+};
 
 @Component({name: "CaptchaComponent"})
 export default class CaptchaComponent extends Vue {
@@ -59,8 +59,6 @@ export default class CaptchaComponent extends Vue {
   @Ref()
   public iframe!: HTMLIFrameElement;
 
-  public skipInitReset: boolean = true;
-
   public id = captchaId++;
 
   @Prop() public loading!: boolean;
@@ -72,46 +70,65 @@ export default class CaptchaComponent extends Vue {
   private event: ((E: MessageEvent) => void) | null = null;
 
   public get grecaptcha(): GoogleCaptcha {
-    if (window.grecaptcha && (window.grecaptcha as any).reset) {
-      return window.grecaptcha;
-    }
     return {
-      render: () => {
+      render: (...args) => {
+        if (this.isIframe && this.iframe) {
+          this.$logger.log("Adding message listener")();
+          this.event = (event: MessageEvent) => {
+            this.$logger.log("On message {}", event)();
+            if (event.data && event.data["g-recaptcha-response"]) {
+              captchaInited.value = true;
+              this.$emit("update:loading", true);
+              this.$emit("update:token", event.data["g-recaptcha-response"]);
+            }
+          };
+          window.addEventListener("message", this.event, false);
+        } else if ((window as any).grecaptcha?.render) {
+          this.grecaptcha.render(...args);
+        }
       },
-      reset: () => {
+      reset: (...args) => {
+        if (this.isIframe && this.iframe) {
+          this.$logger.log("Resetting captcha")();
+          this.iframe.contentWindow!.postMessage("reset-captcha", "*");
+        } else if ((window as any).grecaptcha?.reset) {
+          this.grecaptcha.reset(...args);
+        }
       },
     };
   }
 
   @Watch("loading")
   public onValueChange(newValue: boolean, oldValue: boolean) {
+    this.$logger.log("loading change {}", {
+      newValue,
+      oldValue,
+      resettingAllowed: this.resettingAllowed,
+    })();
     if (!newValue && newValue != oldValue) {
       if (this.resettingAllowed) {
-        if (this.isIframe && this.iframe) {
-          this.$logger.log("Resetting captcha")();
-          this.iframe.contentWindow!.postMessage("reset-captcha", "*");
-        } else {
-          this.grecaptcha.reset();
-        }
+        this.grecaptcha.reset();
       }
       this.resettingAllowed = true;
     }
-    this.skipInitReset = false;
   }
 
 
-
   public renderCaptcha() {
     this.$emit("update:loading", false);
     this.grecaptcha.render(this.repactha, {
       sitekey: this.captchaKey,
-      theme: 'dark',
-      callback: (response: string) => this.$emit("update:token", response),
-    })
-    captchaInited.value = true
+      theme: "dark",
+      callback: (response: string) => {
+        this.$emit("update:token", response);
+      },
+    });
+    captchaInited.value = true;
   }
 
   public destroyed(): void {
+    // Always reset captcha, otherwise next component which assumes that captcha is not confirmed will fail
+    this.grecaptcha.reset();
     if (this.event) {
       this.$logger.log("Removing message listener {}", this.event)();
       window.removeEventListener("message", this.event);
@@ -123,32 +140,21 @@ export default class CaptchaComponent extends Vue {
     return captchaInited.value;
   }
 
-  @Watch('captchaInited')
+  @Watch("captchaInited")
   public async oncatpchaChange() {
     if (captchaInited.value) {
       this.renderCaptcha();
     }
   }
 
-  public async mounted() { // should be mounted thus div to render recaptcha exists
+  public async mounted() { // Should be mounted thus div to render recaptcha exists
     this.$logger.debug("initing captcha with key {}", this.captchaKey)();
     if (this.captchaKey) {
-      if (this.isIframe) {
-        this.$logger.log("Adding message listener")();
-        this.event = (event: MessageEvent) => {
-          this.$logger.log("On message {}", event)();
-          if (event.data && event.data["g-recaptcha-response"]) {
-            captchaInited.value = true;
-            this.$emit("update:loading", true);
-            this.$emit("update:token", event.data["g-recaptcha-response"]);
-          }
-        };
-        window.addEventListener("message", this.event, false);
-      } else if (captchaInited.value) {
+      if (this.isIframe || captchaInited.value) {
         this.renderCaptcha();
       } else {
         this.$emit("update:loading", true);
-        await this.$api.loadRecaptcha('onloadrecaptcha');
+        await this.$api.loadRecaptcha("onloadrecaptcha");
       }
     }
   }
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 71e7e6d22..3d6021384 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -125,7 +125,7 @@ import type {
   HandlerType,
   HandlerTypes,
 } from "@/ts/types/backend";
-import {MessageStatus} from '@/ts/types/backend';
+import {MessageStatus} from "@/ts/types/backend";
 
 
 @Component({
diff --git a/frontend/src/vue/chat/textarea/ChatTextArea.vue b/frontend/src/vue/chat/textarea/ChatTextArea.vue
index 61ce57c48..90a7dae09 100644
--- a/frontend/src/vue/chat/textarea/ChatTextArea.vue
+++ b/frontend/src/vue/chat/textarea/ChatTextArea.vue
@@ -116,6 +116,7 @@ import ChatTagging from "@/vue/chat/textarea/ChatTagging.vue";
 import {Throttle} from "@/ts/classes/Throttle";
 import GiphySearch from "@/vue/chat/textarea/GiphySearch.vue";
 import type {GIFObject} from "giphy-api";
+import {ImageType} from "@/ts/types/backend";
 
 const timePattern = /^\(\d\d:\d\d:\d\d\)\s\w+:.*&gt;&gt;&gt;\s/;
 
@@ -433,7 +434,7 @@ export default class ChatTextArea extends Vue {
 
   public handleAddVideo(file: Blob) {
     if (file) {
-      pasteBlobVideoToTextArea(file, this.userMessage, "m", (e: string) => {
+      pasteBlobVideoToTextArea(file, this.userMessage, ImageType.MEDIA_RECORD, (e: string) => {
         this.$store.growlError(e);
       });
     }
diff --git a/newback/.gitignore b/newback/.gitignore
index f70c43903..8ebb16cf6 100644
--- a/newback/.gitignore
+++ b/newback/.gitignore
@@ -8,3 +8,4 @@ coverage
 !src/data/migration/.gitkeep
 codecov
 src/fixtures/prod
+src/config/env/backup.json
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 951d80ea0..79840b10c 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -7,8 +7,8 @@ import {PasswordService} from "@/modules/rest/password/password.service";
 import type {
   ShowITypeWsInMessage,
   ShowITypeWsOutMessage,
-  SyncHistoryOutMessage,
-  SyncHistoryResponseMessage,
+  SyncHistoryWsOutMessage,
+  SyncHistoryWsInMessage,
 } from "@/data/types/frontend";
 import {
   ImageType,
@@ -21,6 +21,7 @@ import {RedisService} from "@/modules/rest/redis/redis.service";
 import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 import type {WebSocketContextData} from "@/data/types/internal";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import {getSyncMessage} from "@/modules/api/websocket/transformers/ws.transformer";
 
 
 @Injectable()
@@ -54,7 +55,7 @@ export class MessageService {
     );
   }
 
-  public async syncHistory(data: SyncHistoryOutMessage, context: WebSocketContextData) {
+  public async syncHistory(data: SyncHistoryWsOutMessage, context: WebSocketContextData) {
     // MessageStatus.ON_SERVER
     const messages = await this.messageRepository.getNewOnServerMessages(data.roomIds, data.messagesIds, data.lastSynced);
 
@@ -73,8 +74,7 @@ export class MessageService {
     const images = await this.messageRepository.getImagesByMessagesId(messageIdsWithSymbol);
     const mentions = await this.messageRepository.getTagsByMessagesId(messageIdsWithSymbol);
 
-
-    const dtso: any = messages.map((m) => transformMessage(m, mentions, images));
+    return getSyncMessage(readmesageIds, receivedMessageIds, messages, mentions, images);
 
   /*
    *
diff --git a/newback/src/modules/api/websocket/transformers/ws.transformer.ts b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
index d1fc0bdf6..dfdf05f1e 100644
--- a/newback/src/modules/api/websocket/transformers/ws.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
@@ -1,14 +1,15 @@
 import type {
   AddOnlineUserMessage,
   ChannelDto,
+  FileModelDto,
+  MessageModelDto,
+  RemoveOnlineUserMessage,
   RoomDto,
   SetWsIdMessage,
+  SyncHistoryWsInMessage,
   UserDto,
   UserProfileDto,
   UserSettingsDto,
-  RemoveOnlineUserMessage,
-  MessageModelDto,
-  FileModelDto,
 } from "@/data/types/frontend";
 import type {UserModel} from "@/data/model/user.model";
 import type {
@@ -162,38 +163,52 @@ export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number,
 }
 
 
-function getTags(mentions: MessageMentionModel[], m: MessageModel) {
-  return mentions.filter((mention) => mention.messageId == m.id).reduce((mentions, mention) => {
+export function getTags(mentions: MessageMentionModel[], m: MessageModel): Record<string, number> {
+  return mentions.filter((mention) => mention.messageId === m.id).reduce((mentions, mention) => {
     mentions[mention.symbol] = mention.userId;
     return mentions;
   }, {});
 }
 
-function getFiles(images: ImageModel[], m: MessageModel): Record<number, FileModelDto> {
-  return Object.fromEntries(images.filter((i) => i.messageId === m.id).map((i) => [
-    i.symbol, {
-      url: i.img,
-      type: i.type,
-      preview: i.preview,
-      id: i.id,
+export function getFiles(images: ImageModel[], mess: MessageModel): Record<number, FileModelDto> {
+  return Object.fromEntries(images.filter((img) => img.messageId === mess.id).map((img) => [
+    img.symbol, {
+      url: img.img,
+      type: img.type,
+      preview: img.preview,
+      id: img.id,
     },
   ]));
 }
 
-function getMessage(m: MessageModel, mentions: MessageMentionModel[], images: ImageModel[]): MessageModelDto {
+export function getMessage(message: MessageModel, mentions: MessageMentionModel[], images: ImageModel[]): MessageModelDto {
+  return {
+    id: message.id,
+    content: message.content,
+    tags: getTags(mentions, message),
+    roomId: message.roomId,
+    userId: message.senderId,
+    parentMessage: message.parentMessageId,
+    deleted: Boolean(message.deletedAt),
+    threadMessagesCount: message.threadMessageCount,
+    symbol: message.symbol,
+    status: message.messageStatus,
+    time: message.time,
+    edited: message.updatedAt.getTime(),
+    files: getFiles(images, message),
+  };
+}
+
+export function getSyncMessage(
+  readMessageIds: number[],
+  receivedMessageIds: number[],
+  messages: MessageModel[],
+  mentions: MessageMentionModel[],
+  images: ImageModel[]
+): SyncHistoryWsInMessage {
   return {
-    id: m.id,
-    content: m.content,
-    tags: getTags(mentions, m),
-    roomId: m.roomId,
-    userId: m.senderId,
-    parentMessage: m.parentMessageId,
-    deleted: Boolean(m.deletedAt),
-    threadMessagesCount: m.threadMessageCount,
-    symbol: m.symbol,
-    status: m.messageStatus,
-    time: m.time,
-    edited: m.updatedAt,
-    files: getFiles(images, m),
+    readMessageIds,
+    receivedMessageIds,
+    content: messages.map((m) => getMessage(m, mentions, images)),
   };
 }
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 85b571fc8..c2fa7b9f4 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -19,12 +19,14 @@ import {
   Logger,
   UseFilters,
 } from "@nestjs/common";
-import type {GetCountryCodeWsInMessage} from "@/data/types/frontend";
+import type {
+  GetCountryCodeWsInMessage,
+  SyncHistoryWsInMessage,
+} from "@/data/types/frontend";
 import {
   GetCountryCodeWsOutMessage,
-  ShowITypeWsInMessage,
   ShowITypeWsOutMessage,
-  SyncHistoryOutMessage,
+  SyncHistoryWsOutMessage,
 } from "@/data/types/frontend";
 import {SubscribePuBSub} from "@/modules/rest/pubsub/pubsub.service";
 import {SendToClientPubSubMessage} from "@/modules/api/websocket/interfaces/pubsub";
@@ -66,12 +68,15 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
   }
 
   @SubscribeMessage("syncHistory")
-  public async syncHistory(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context: WebSocketContextData): Promise<any> {
-    await this.messageService.syncHistory(data, context);
+  public async syncHistory(
+    @MessageBody() data: SyncHistoryWsOutMessage,
+      @WsContext() context: WebSocketContextData
+  ): Promise<SyncHistoryWsInMessage> {
+    return this.messageService.syncHistory(data, context);
   }
 
   @SubscribeMessage("printMessage")
-  public async printMessage(@MessageBody() data: SyncHistoryOutMessage, @WsContext() context: WebSocketContextData): Promise<any> {
+  public async printMessage(@MessageBody() data: SyncHistoryWsOutMessage, @WsContext() context: WebSocketContextData): Promise<any> {
   }
 
   @SubscribeMessage("showIType")
@@ -79,7 +84,6 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
     await this.messageService.showIType(data, context);
   }
 
-
   @SubscribeMessage("getCountryCode")
   async getCountryCode(@MessageBody() data: GetCountryCodeWsOutMessage, @WsContext() context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, "action" | "handler">> {
     return this.wsDataService.getCountryCodes(context);

From 6593423e65204aee1ec4f8931ed67f875442299a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 16 Apr 2022 16:46:12 +0300
Subject: [PATCH 068/221] Fixed captcha inifinty loop

---
 frontend/src/vue/auth/CaptchaComponent.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/vue/auth/CaptchaComponent.vue b/frontend/src/vue/auth/CaptchaComponent.vue
index b4b83fc92..3a13bac65 100644
--- a/frontend/src/vue/auth/CaptchaComponent.vue
+++ b/frontend/src/vue/auth/CaptchaComponent.vue
@@ -41,7 +41,7 @@ const captchaInited = ref(false);
 
 let captchaId = 1; // Just random id to diff one comp from another
 
-window.onloadrecaptcha = function () {
+window.onloadrecaptcha = function() {
   captchaInited.value = true;
 };
 
@@ -83,16 +83,16 @@ export default class CaptchaComponent extends Vue {
             }
           };
           window.addEventListener("message", this.event, false);
-        } else if ((window as any).grecaptcha?.render) {
-          this.grecaptcha.render(...args);
+        } else if (window.grecaptcha?.render) {
+          window.grecaptcha.render(...args);
         }
       },
       reset: (...args) => {
         if (this.isIframe && this.iframe) {
           this.$logger.log("Resetting captcha")();
           this.iframe.contentWindow!.postMessage("reset-captcha", "*");
-        } else if ((window as any).grecaptcha?.reset) {
-          this.grecaptcha.reset(...args);
+        } else if (window.grecaptcha?.reset) {
+          window.grecaptcha.reset(...args);
         }
       },
     };

From 8ccc5b45b8627c7ed68d1bb80b2c42b845867aef Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 16 Apr 2022 20:48:11 +0300
Subject: [PATCH 069/221] Refactor fetch api

---
 frontend/src/ts/classes/DatabaseWrapper.ts    |   2 +-
 frontend/src/ts/classes/DefaultStore.ts       |   2 +-
 frontend/src/ts/classes/Fetch.ts              | 192 +++++++++++-------
 frontend/src/ts/classes/Http.ts               |  35 ----
 frontend/src/ts/main.ts                       |   3 +-
 frontend/src/ts/message_handlers/Api.ts       | 145 ++++++-------
 .../ts/message_handlers/WsMessageHandler.ts   |  23 +--
 frontend/src/ts/types/env.d.ts                |   6 +-
 frontend/src/ts/types/model.ts                |   2 +-
 frontend/src/ts/types/types.ts                |  13 +-
 frontend/src/ts/utils/consts.ts               |   1 -
 frontend/src/ts/utils/pureFunctions.ts        |   2 +-
 frontend/src/vue/auth/SignIn.vue              |   4 +-
 frontend/src/vue/auth/SignUp.vue              |  36 ++--
 .../vue/chat/message/ChatMessageToolTip.vue   |   4 +-
 .../vue/chat/message/ChatSendingMessage.vue   |   4 +-
 .../src/vue/chat/textarea/GiphySearch.vue     |  20 +-
 17 files changed, 241 insertions(+), 253 deletions(-)
 delete mode 100644 frontend/src/ts/classes/Http.ts

diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 74b71b438..0014e1d42 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -471,7 +471,7 @@ export default class DatabaseWrapper implements IStorage {
         tags,
         transfer: m.status === MessageStatusInner.SENDING ? {
           error: null,
-          xhr: null,
+          abortFn: null,
           upload: null,
         } : null,
         files: {},
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index 503c9588b..389c5d4f0 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -403,7 +403,7 @@ export class DefaultStore extends VuexModule {
   public setUploadXHR(payload: SetUploadXHR) {
     const message = this.roomsDict[payload.roomId].messages[payload.messageId];
     if (message.transfer) {
-      message.transfer.xhr = payload.xhr;
+      message.transfer.abortFn = payload.abortFunction;
     } else {
       throw Error(`Transfer upload doesn't exist ${JSON.stringify(this.state)} ${JSON.stringify(payload)}`);
     }
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index 0c08fd45f..a4da13985 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -1,97 +1,141 @@
 import type {
-  GetData,
   PostData,
   SessionHolder,
 } from "@/ts/types/types";
-import Http from "@/ts/classes/Http";
 import {XHR_API_URL} from "@/ts/utils/runtimeConsts";
+import type {Logger} from "lines-logger";
+import loggerFactory from "@/ts/instances/loggerFactory";
+import {SetMessageProgress} from '@/ts/types/types';
+
+export default class Fetch {
+  protected httpLogger: Logger;
+
+  protected sessionHolder: SessionHolder;
 
-export default class Fetch extends Http {
   public constructor(sessionHolder: SessionHolder) {
-    super(sessionHolder);
+    this.sessionHolder = sessionHolder;
+    this.httpLogger = loggerFactory.getLogger("http");
   }
 
-  public async doGet<T>(url: string, d?: GetData): Promise<T> {
-    if (d?.process) {
-      debugger
-      throw Error("Unable to handle process");
-    }
-    if (d?.baseUrl) {
-      debugger
-      throw Error("Unable to handle baseUrl");
-    }
-    const fileUrl = `${d?.baseUrl ?? XHR_API_URL}${url}`;
-    let headers: Record<string, string> = {
-      'Content-Type': 'application/json'
-    };
-    if (!d?.baseUrl) {
-      headers['session_id'] = this.sessionHolder.session!;
-    }
-    try {
-      let response = await fetch(fileUrl, {
-        method: "GET",
-        mode: 'cors',
-        headers
+  public async doGet<T>(url: string, onSetAbortFunction?: (c: () => void) => void): Promise<T> {
+    const {signal, fetchUrl, headers} = this.prepareRequest(url, onSetAbortFunction);
+    const response = await fetch(fetchUrl, {
+      method: "GET",
+      mode: "cors",
+      headers,
+      signal,
+    });
+    return this.processResponse<T>(response);
+  }
+
+  public async doPost<T>(d: PostData): Promise<T> {
+    const {headers, signal, fetchUrl} = this.prepareRequest(d.url, d.onSetAbortFunction, {
+      "Content-Type": "application/json",
+    });
+    const response = await fetch(fetchUrl, {
+      method: "POST",
+      mode: "cors",
+      signal,
+      body: JSON.stringify(d.params),
+      headers,
+    });
+    return this.processResponse<T>(response);
+  }
+
+
+  public async upload<T>(url: string, form: FormData, onSetAbortFunction?: (e: () => void) => void, onProgress?: (i: number) => void) {
+     /*
+     * https://ilikekillnerds.com/2020/09/file-upload-progress-with-the-fetch-api-is-coming/
+     * https://chromestatus.com/feature/5274139738767360
+     * fetch api doesnt support progress api yet
+     */
+    return new Promise((resolve, reject) => {
+      const r = new XMLHttpRequest();
+      r.addEventListener("load", () => {
+        let response = r.response;
+        try {
+          response = JSON.parse(r.response);
+          if (r.status < 200 || r.status >= 300) {
+            this.processException(response);
+          } else {
+            resolve(response);
+            return;
+          }
+        } catch (e) {
+          reject(e);
+          return;
+        }
+        resolve(response);
+      });
+      r.addEventListener("error", () => {
+        reject("Network Error");
       });
-      let body = await response.json();
-      if (response.ok) {
-        return body as T;
+      if (onSetAbortFunction) {
+        onSetAbortFunction(() => r.abort());
       }
-      if (typeof body.message === 'string') {
-        throw Error(body.message)
-      } else if (body?.message?.length && typeof  body.message[0] === 'string') {
-        throw Error(body.message[0])
-      } else if (typeof body.error === 'string') {
-        throw Error(body.error)
-      } else {
-        throw Error("Network error");
+      if (onProgress) {
+        r.upload.addEventListener("progress", (evt) => {
+          if (evt.lengthComputable) {
+            onProgress(evt.loaded);
+          }
+        });
       }
-    } catch (e) {
-      debugger
-      throw new Error(e as any);
+      r.open("GET", `${XHR_API_URL}${url}`);
+      r.setRequestHeader("session-id", this.sessionHolder.session!);
+      r.send();
+    });
+  }
+
+  public async loadJs(fullFileUrlWithProtocol: string): Promise<Event> {
+    return new Promise((resolve, reject) => {
+      this.httpLogger.log("GET out {}", fullFileUrlWithProtocol)();
+      const fileRef = document.createElement("script");
+      fileRef.setAttribute("type", "text/javascript");
+      fileRef.setAttribute("src", fullFileUrlWithProtocol);
+
+      document.getElementsByTagName("head")[0].appendChild(fileRef);
+      fileRef.onload = resolve;
+      fileRef.onerror = reject;
+    });
+  }
+
+  // @ts-expect-error TS2366
+  private async processResponse<T>(response: Response): Promise<T> {
+    const body = await response.json();
+    if (response.ok) {
+      return body as T;
     }
+    this.processException(body);
   }
 
-  public async doPost<T>(d: PostData): Promise<T> {
-    if (d?.process) {
-      debugger
-      throw Error("Unable to handle process");
+  private processException(body: any) {
+    if (typeof body?.message === "string") {
+      throw Error(body.message);
+    } else if (body?.message?.length && typeof body.message[0] === "string") {
+      throw Error(body.message[0]);
+    } else if (typeof body?.error === "string") {
+      throw Error(body.error);
+    } else {
+      throw Error("Network error");
     }
-    const fileUrl = `${XHR_API_URL}${d.url}`;
-    let headers: Record<string, string> = {};
+  }
+
+  private prepareRequest(url: string, onSetAbortFunction?: (c: () => void) => void, headers: Record<string, string> = {}) {
     let signal = null;
-    if (d.onAbortController) {
+    if (onSetAbortFunction) {
       const controller = new AbortController();
       signal = controller.signal;
-      d.onAbortController(controller);
-    }
-    if (!d.formData) {
-      headers['Content-Type'] = 'application/json';
-      headers['session_id'] = this.sessionHolder.session!;
+      onSetAbortFunction(() => controller.abort());
     }
-    try {
-      let response = await fetch(fileUrl, {
-        method: "POST",
-        mode: 'cors',
-        signal,
-        body: d.params ? JSON.stringify(d.params) : d.formData,
-        headers
-      });
-      let body = await response.json();
-      if (response.ok) {
-        return body as T;
-      }
-      if (typeof body.message === 'string') {
-        throw Error(body.message)
-      } else if (body?.message?.length && typeof  body.message[0] === 'string') {
-        throw Error(body.message[0])
-      } else if (typeof body.error === 'string') {
-        throw Error(body.error)
-      } else {
-        throw Error("Network error");
-      }
-    } catch (e) {
-      throw new Error(e as any);
+    const is3rdPartyApi = (/^https?:\/\//u).test(url);
+    const fetchUrl = is3rdPartyApi ? url : `${XHR_API_URL}${url}`;
+    if (!is3rdPartyApi) {
+      headers["session-id"] = this.sessionHolder.session!;
     }
+    return {
+      signal,
+      fetchUrl,
+      headers,
+    };
   }
 }
diff --git a/frontend/src/ts/classes/Http.ts b/frontend/src/ts/classes/Http.ts
deleted file mode 100644
index 72380c8dd..000000000
--- a/frontend/src/ts/classes/Http.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import loggerFactory from "@/ts/instances/loggerFactory";
-import type {
-  GetData,
-  PostData,
-  SessionHolder,
-} from "@/ts/types/types";
-import type {Logger} from "lines-logger";
-
-export default abstract class Http {
-  protected httpLogger: Logger;
-
-  protected sessionHolder: SessionHolder;
-
-  public constructor(sessionHolder: SessionHolder) {
-    this.sessionHolder = sessionHolder;
-    this.httpLogger = loggerFactory.getLogger("http");
-  }
-
-  public abstract doGet<T>(url: string, d?: GetData): Promise<T>;
-
-  public abstract doPost<T>(d: PostData): Promise<T>;
-
-  public async loadJs(fullFileUrlWithProtocol: string): Promise<Event> {
-    return new Promise((resolve, reject) => {
-      this.httpLogger.log("GET out {}", fullFileUrlWithProtocol)();
-      const fileRef = document.createElement("script");
-      fileRef.setAttribute("type", "text/javascript");
-      fileRef.setAttribute("src", fullFileUrlWithProtocol);
-
-      document.getElementsByTagName("head")[0].appendChild(fileRef);
-      fileRef.onload = resolve;
-      fileRef.onerror = reject;
-    });
-  }
-}
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index f2e3c9af5..165665852 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -24,7 +24,6 @@ import DatabaseWrapper from "@/ts/classes/DatabaseWrapper";
 import LocalStorage from "@/ts/classes/LocalStorage";
 import Api from "@/ts/message_handlers/Api";
 import NotifierHandler from "@/ts/classes/NotificationHandler";
-import type Http from "@/ts/classes/Http";
 import WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import {routerFactory} from "@/ts/instances/routerInstance";
 import {AudioPlayer} from "@/ts/classes/AudioPlayer";
@@ -113,7 +112,7 @@ function init(): void {
   });
 
   const sub = new Subscription();
-  const xhr: Http = new Fetch(sessionHolder);
+  const xhr: Fetch = new Fetch(sessionHolder);
   const api: Api = new Api(xhr, sub);
 
   let storage;
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 66196aec5..dc196208f 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -2,46 +2,41 @@ import {
   CONNECTION_ERROR,
   GIPHY_API_KEY,
   GIPHY_URL,
-  RESPONSE_SUCCESS,
 } from "@/ts/utils/consts";
 import type {UploadFile} from "@/ts/types/types";
 import type {
   OauthSessionResponse,
   OauthStatus,
+  OkResponse,
   SaveFileResponse,
+  SendRestorePasswordRequest,
   SessionResponse,
+  SignInRequest,
+  SignUpRequest,
+  ValidateEmailResponse,
   ViewUserProfileDto,
 } from "@/ts/types/dto";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
-import type Http from "@/ts/classes/Http";
 import type {
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
-import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
-import type {MultiResponse} from "giphy-api";
-import type Subscription from "@/ts/classes/Subscription";
-import {
-  OkResponse,
-  SendRestorePasswordRequest,
-  SignInRequest,
-  SignUpRequest,
-  ValidateEmailResponse
-} from '@/ts/types/dto';
-import {
   AcceptTokenRequest,
   AcceptTokenResponse,
   ConfirmEmailRequest,
   ConfirmEmailResponse,
   GoogleSignInResponse,
+  HandlerType,
+  HandlerTypes,
   SignUpResponse,
   ValidateUserEmailRequest,
   ValidateUserResponse,
   VerifyTokenRequest,
-  VerifyTokenResponse
-} from '@/ts/types/backend';
+  VerifyTokenResponse,
+} from "@/ts/types/backend";
+import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
+import type {MultiResponse} from "giphy-api";
+import type Subscription from "@/ts/classes/Subscription";
+import type Fetch from "@/ts/classes/Fetch";
 
 export default class Api extends MessageHandler {
   protected readonly handlers: HandlerTypes<keyof Api, "*"> = {
@@ -50,26 +45,26 @@ export default class Api extends MessageHandler {
 
   protected readonly logger: Logger;
 
-  private readonly xhr: Http;
+  private readonly fetch: Fetch;
 
   private retryFcb: Function | null = null;
 
-  public constructor(xhr: Http, sub: Subscription) {
+  public constructor(fetch: Fetch, sub: Subscription) {
     super();
     sub.subscribe("*", this);
     this.logger = loggerFactory.getLogger("api");
-    this.xhr = xhr;
+    this.fetch = fetch;
   }
 
   public async signIn(body: SignInRequest): Promise<SessionResponse> {
-    return this.xhr.doPost<SessionResponse>({
+    return this.fetch.doPost<SessionResponse>({
       url: "/auth/sign-in",
-      params: {...body}
+      params: {...body},
     });
   }
 
   public async changePassword(old_password: string, password: string): Promise<void> {
-    return this.xhr.doPost<void>({
+    return this.fetch.doPost<void>({
       url: "/change_password",
       params: {
         old_password,
@@ -79,21 +74,21 @@ export default class Api extends MessageHandler {
   }
 
   public async logout(registration_id: string | null = null): Promise<void> {
-    await this.xhr.doPost({
+    await this.fetch.doPost({
       url: "/logout",
       params: {registration_id},
     });
   }
 
   public async sendRestorePassword(params: SendRestorePasswordRequest): Promise<OkResponse> {
-    return this.xhr.doPost<OkResponse>({
+    return this.fetch.doPost<OkResponse>({
       url: "/verify/send-restore-password",
       params: params as any,
     });
   }
 
   public async signUp(data: SignUpRequest): Promise<SignUpResponse> {
-    return this.xhr.doPost<SessionResponse>({
+    return this.fetch.doPost<SessionResponse>({
       url: "/auth/sign-up",
       params: data as any,
     });
@@ -103,21 +98,21 @@ export default class Api extends MessageHandler {
     text: string,
     offset: number,
     limit: number,
-    process?: (R: XMLHttpRequest) => void,
+    onSetAbortFunction:  (c: () => void) => void,
   ): Promise<MultiResponse> {
     let response!: MultiResponse;
     if ((/^\s*$/).exec(text)) {
       // https://developers.giphy.com/docs/api/endpoint#trending
-      response = await this.xhr.doGet<MultiResponse>(`/gifs/trending?api_key=${GIPHY_API_KEY}&limit=${limit}&offset=${offset}`, {
-        baseUrl: GIPHY_URL,
-        process,
-      });
+      response = await this.fetch.doGet<MultiResponse>(
+        `${GIPHY_URL}/gifs/trending?api_key=${GIPHY_API_KEY}&limit=${limit}&offset=${offset}`,
+        onSetAbortFunction,
+      );
     } else {
       // https://developers.giphy.com/docs/api/endpoint#search
-      response = await this.xhr.doGet<MultiResponse>(`/gifs/search?api_key=${GIPHY_API_KEY}&limit=12&q=${encodeURIComponent(text)}&offset=${offset}`, {
-        baseUrl: GIPHY_URL,
-        process,
-      });
+      response = await this.fetch.doGet<MultiResponse>(
+        `${GIPHY_URL}/gifs/search?api_key=${GIPHY_API_KEY}&limit=12&q=${encodeURIComponent(text)}&offset=${offset}`,
+        onSetAbortFunction,
+      );
     }
 
     if (response?.meta?.msg === "OK") {
@@ -127,25 +122,25 @@ export default class Api extends MessageHandler {
   }
 
   public async getOauthStatus(): Promise<OauthStatus> {
-    return this.xhr.doGet<OauthStatus>( "/oauth_status");
+    return this.fetch.doGet<OauthStatus>("/oauth_status");
   }
 
   public async setGoogleOauth(token: string): Promise<void> {
-    return this.xhr.doPost<void>({
+    return this.fetch.doPost<void>({
       url: "/set_google_oauth",
       params: {token},
     });
   }
 
   public async setFacebookOauth(token: string): Promise<void> {
-    return this.xhr.doPost<void>({
+    return this.fetch.doPost<void>({
       url: "/set_facebook_oauth",
       params: {token},
     });
   }
 
   public async googleAuth(token: string): Promise<GoogleSignInResponse> {
-    return this.xhr.doPost<OauthSessionResponse>({
+    return this.fetch.doPost<OauthSessionResponse>({
       url: "/auth/google-sign-in",
       params: {
         token,
@@ -154,7 +149,7 @@ export default class Api extends MessageHandler {
   }
 
   public async facebookAuth(token: string): Promise<OauthSessionResponse> {
-    return this.xhr.doPost<OauthSessionResponse>({
+    return this.fetch.doPost<OauthSessionResponse>({
       url: "/auth/facebook-sign-in",
       params: {
         token,
@@ -163,20 +158,20 @@ export default class Api extends MessageHandler {
   }
 
   public async loadGoogle(): Promise<void> {
-    await this.xhr.loadJs("https://apis.google.com/js/platform.js");
+    await this.fetch.loadJs("https://apis.google.com/js/platform.js");
   }
 
   public async loadFacebook(): Promise<void> {
-    await this.xhr.loadJs("https://connect.facebook.net/en_US/sdk.js");
+    await this.fetch.loadJs("https://connect.facebook.net/en_US/sdk.js");
   }
 
   public async loadRecaptcha(callbackId: string): Promise<void> {
-    await this.xhr.loadJs(`https://www.google.com/recaptcha/api.js?render=explicit&onload=${callbackId}`);
+    await this.fetch.loadJs(`https://www.google.com/recaptcha/api.js?render=explicit&onload=${callbackId}`);
   }
 
   public async registerFCB(registration_id: string, agent: string, is_mobile: boolean): Promise<void> {
     try {
-      await this.xhr.doPost({
+      await this.fetch.doPost({
         url: "/register_fcb",
         params: {
           registration_id,
@@ -197,34 +192,30 @@ export default class Api extends MessageHandler {
     }
   }
 
-  public async validateUsername(username: string, onAbortController: (controller: AbortController) => void): Promise<ValidateUserResponse> {
-    return this.xhr.doPost({
+  public async validateUsername(username: string, onSetAbortFunction:  (c: () => void) => void): Promise<ValidateUserResponse> {
+    return this.fetch.doPost({
       url: "/auth/validate-user",
       params: {username},
-      onAbortController,
+      onSetAbortFunction: onSetAbortFunction,
     });
   }
 
   public async uploadProfileImage(file: Blob): Promise<void> {
     const fd = new FormData();
     fd.append("file", file);
-
-    return this.xhr.doPost<void>({
-      url: "/upload_profile_image",
-      formData: fd,
-    });
+    await this.fetch.upload<void>("/upload_profile_image", fd);
   }
 
   public async showProfile(id: number): Promise<ViewUserProfileDto> {
-    return this.xhr.doGet<ViewUserProfileDto>(`/profile?id=${id}`);
+    return this.fetch.doGet<ViewUserProfileDto>(`/profile?id=${id}`);
   }
 
   public async changeEmail(token: string): Promise<string> {
-    return this.xhr.doGet<string>(`/change_email?token=${token}`);
+    return this.fetch.doGet<string>(`/change_email?token=${token}`);
   }
 
   public async changeEmailLogin(email: string, password: string): Promise<void> {
-    return this.xhr.doPost({
+    return this.fetch.doPost({
       url: "/change_email_login",
       params: {
         email,
@@ -234,45 +225,43 @@ export default class Api extends MessageHandler {
   }
 
   public async confirmEmail(params: ConfirmEmailRequest): Promise<ConfirmEmailResponse> {
-    return this.xhr.doPost({
-      url: '/verify/confirm-email',
-      params
+    return this.fetch.doPost({
+      url: "/verify/confirm-email",
+      params,
     });
   }
 
-  public async uploadFiles(files: UploadFile[], progress: (e: ProgressEvent) => void, setXhr: (e: XMLHttpRequest) => void): Promise<SaveFileResponse> {
-    const fd = new FormData();
-    files.forEach((sd) => {
-      fd.append(sd.key, sd.file, sd.file.name);
-    });
-
-    return this.xhr.doPost<SaveFileResponse>({
-      url: "/upload_file",
-      formData: fd,
-      process: (r) => {
-        setXhr(r);
-        r.upload.addEventListener("progress", progress);
-      },
-    });
+  // @ts-expect-error
+  public async uploadFiles(files: UploadFile[], onProgress: (i: number) => void, setAbortEvent: (e: () => void) => void): Promise<SaveFileResponse> {
+    let totalLength = 0;
+    for (let index = 0; index < files.length; index++) {
+      const fd = new FormData();
+      fd.append('file', files[index].file);
+      fd.append('symbol', files[index].key);
+      const response = await this.fetch.upload<SaveFileResponse>("/files/upload-file", fd, setAbortEvent, (bytes) => {
+        totalLength += bytes;
+        onProgress(totalLength);
+      });
+    }
   }
 
-  public async validateEmail(params: ValidateUserEmailRequest, onAbortController: (controller: AbortController) => void): Promise<ValidateEmailResponse> {
-    return this.xhr.doPost({
+  public async validateEmail(params: ValidateUserEmailRequest,onSetAbortFunction: (c: () => void) => void): Promise<ValidateEmailResponse> {
+    return this.fetch.doPost({
       url: "/auth/validate-email",
       params,
-      onAbortController,
+      onSetAbortFunction,
     });
   }
 
   public async verifyToken(params: VerifyTokenRequest): Promise<VerifyTokenResponse> {
-    return this.xhr.doPost<VerifyTokenResponse>({
+    return this.fetch.doPost<VerifyTokenResponse>({
       url: "/verify/verify-token",
       params,
     });
   }
 
   public async acceptToken(params: AcceptTokenRequest): Promise<AcceptTokenResponse> {
-    return this.xhr.doPost({
+    return this.fetch.doPost({
       url: "/verify/accept-token",
       params,
     });
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 01e890bbd..e895b6e79 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -229,8 +229,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     roomId: number,
     files: UploadFile[],
   ): Promise<SaveFileResponse> {
-    let size: number = 0;
-    files.forEach((f) => size += f.file.size);
+    const size = files.reduce((summ, f) => summ + f.file.size, 0);
     const sup: SetUploadProgress = {
       upload: {
         total: size,
@@ -243,19 +242,17 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     try {
       const res: SaveFileResponse = await this.api.uploadFiles(
         files,
-        (evt) => {
-          if (evt.lengthComputable) {
-            const payload: SetMessageProgress = {
-              messageId,
-              roomId,
-              uploaded: evt.loaded,
-            };
-            this.store.setMessageProgress(payload);
-          }
+        (uploaded) => {
+          const payload: SetMessageProgress = {
+            messageId,
+            roomId,
+            uploaded,
+          };
+          this.store.setMessageProgress(payload);
         },
-        (xhr) => {
+        (abortFunction) => {
           this.store.setUploadXHR({
-            xhr,
+            abortFunction,
             messageId,
             roomId,
           });
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index 9c4d76bc8..d764bff75 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -13,24 +13,24 @@ import type {
 } from "@/ts/types/types";
 import type WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import type Subscription from "@/ts/classes/Subscription";
-import type Http from "@/ts/classes/Http";
 import type {Router} from "vue-router";
 import type {MessageSenderProxy} from "@/ts/message_handlers/MessageSenderProxy";
 import type {RoomHandler} from "@/ts/message_handlers/RomHandler";
 import type {App as VueApp} from "@vue/runtime-core";
 import type {SmileysApi} from "@/ts/utils/smileys";
+import type Fetch from "@/ts/classes/Fetch";
 
 declare global {
   interface Window {
     GIT_VERSION: string | undefined;
     vue: VueApp;
-    onloadrecaptcha: () => any;
+    onloadrecaptcha(): any;
     router: Router;
     api: Api;
     deferredPrompt: BeforeInstallPromptEvent;
     wsMessageHandler: WsMessageHandler;
     roomHandler: RoomHandler;
-    xhr: Http;
+    xhr: Fetch;
     ws: WsHandler;
     storage: IStorage;
     store: DefaultStore;
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index d6eee73ad..f8529c4f9 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -114,7 +114,7 @@ export interface UploadProgressModel {
 export interface MessageTransferInfo {
   upload: UploadProgressModel | null;
   error: string | null;
-  xhr: XMLHttpRequest | null;
+  abortFn: (() => void) | null;
 }
 
 export interface MessageModel {
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 84923ed1d..6b482b5a2 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -86,7 +86,7 @@ export interface SetUploadProgress {
 }
 
 export interface SetUploadXHR {
-  xhr: XMLHttpRequest;
+  abortFunction: () => void;
   roomId: number;
   messageId: number;
 }
@@ -232,15 +232,8 @@ export interface IStorage {
 
 export interface PostData {
   url: string;
-  params?: any;
-  formData?: FormData;
-  onAbortController?: (controller: AbortController) => void;
-  process?(R: XMLHttpRequest): void;
-}
-
-export interface GetData {
-  baseUrl?: string;
-  process?(R: XMLHttpRequest): void;
+  params: any;
+  onSetAbortFunction?: (c: () => void) => void;
 }
 
 export interface AddSendingFileTransfer {
diff --git a/frontend/src/ts/utils/consts.ts b/frontend/src/ts/utils/consts.ts
index 23a800e9e..e8dcf3100 100644
--- a/frontend/src/ts/utils/consts.ts
+++ b/frontend/src/ts/utils/consts.ts
@@ -23,7 +23,6 @@ export const {
 export const CONNECTION_RETRY_TIME = 5000;
 export const LOAD_GIPHIES_PER_REQUEST = 12;
 export const CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT = 313000;
-export const RESPONSE_SUCCESS = "ok";
 export const LOG_LEVEL_LS = "logLevel";
 
 // 1 day
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index d4ea78f2f..168d7c61c 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -117,7 +117,7 @@ export function editMessageWs(
     transfer: Boolean(messageContent) || messageId > 0 ? { // TODO can this be simplified?
       error: null,
       upload: null,
-      xhr: null,
+      abortFn: null,
     } : null,
     time,
     tags,
diff --git a/frontend/src/vue/auth/SignIn.vue b/frontend/src/vue/auth/SignIn.vue
index 9a19d21cd..3c409c484 100644
--- a/frontend/src/vue/auth/SignIn.vue
+++ b/frontend/src/vue/auth/SignIn.vue
@@ -6,9 +6,9 @@
     <div>
       <i class="icon-user"/>
       <input
+        v-model="username"
         autocomplete="username"
         class="input"
-        v-model="username"
         maxlength="254"
         name="username"
         placeholder="Username/Email"
@@ -19,9 +19,9 @@
     <div>
       <i class="icon-key"/>
       <input
+        v-model="password"
         autocomplete="password"
         class="input"
-        v-model="password"
         name="password"
         placeholder="Password"
         required
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index b401384ee..5fe69800f 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -178,15 +178,15 @@ export default class SignUp extends Vue {
   debouncedValidateUserName!: Function;
 
 
-  private currentValidateUsernameRequest: AbortController | null = null;
+  private abortUsernameValidation: (() => void)|null = null;
 
   async checkUserName(username: string) {
-    if (this.currentValidateUsernameRequest) {
-      this.currentValidateUsernameRequest.abort();
-      this.currentValidateUsernameRequest = null;
+    if (this.abortUsernameValidation) {
+      this.abortUsernameValidation();
+      this.abortUsernameValidation = null;
     }
     try {
-      await this.$api.validateUsername(username, (r: AbortController) => this.currentValidateUsernameRequest = r);
+      await this.$api.validateUsername(username, (r: () => void) => this.abortUsernameValidation = r);
       this.userCheckValue = IconColor.SUCCESS;
       this.userDescription = "Username is ok!";
       this.usernameValidity = "";
@@ -195,7 +195,7 @@ export default class SignUp extends Vue {
       this.usernameValidity = errors;
       this.userDescription = errors;
     } finally {
-      this.currentValidateUsernameRequest = null;
+      this.abortUsernameValidation = null;
     }
   }
 
@@ -280,15 +280,15 @@ export default class SignUp extends Vue {
 
   debouncedValidateEmail!: Function;
 
-  private currentValidateEmailRequest: AbortController | null = null;
+  private abortEmailValidation: (() => void)| null = null;
 
   async checkEmail(email: string) {
-    if (this.currentValidateEmailRequest) {
-      this.currentValidateEmailRequest.abort();
-      this.currentValidateEmailRequest = null;
+    if (this.abortEmailValidation) {
+      this.abortEmailValidation();
+      this.abortEmailValidation = null;
     }
     try {
-      await this.$api.validateEmail({email}, (r:AbortController) => this.currentValidateEmailRequest = r);
+      await this.$api.validateEmail({email}, (r: () => void) => this.abortEmailValidation = r);
       this.emailCheckValue = IconColor.SUCCESS;
       this.emailDescription = "Email is ok!";
       this.emailValidity = "";
@@ -297,19 +297,19 @@ export default class SignUp extends Vue {
       this.emailValidity = errors;
       this.emailDescription = errors;
     } finally {
-      this.currentValidateEmailRequest = null;
+      this.abortEmailValidation = null;
     }
   }
 
 
   destroyed(): void {
-    if (this.currentValidateEmailRequest) {
-      this.currentValidateEmailRequest.abort();
-      this.currentValidateEmailRequest = null;
+    if (this.abortEmailValidation) {
+      this.abortEmailValidation();
+      this.abortEmailValidation = null;
     }
-    if (this.currentValidateUsernameRequest) {
-      this.currentValidateUsernameRequest.abort();
-      this.currentValidateUsernameRequest = null;
+    if (this.abortUsernameValidation) {
+      this.abortUsernameValidation();
+      this.abortUsernameValidation = null;
     }
   }
 
diff --git a/frontend/src/vue/chat/message/ChatMessageToolTip.vue b/frontend/src/vue/chat/message/ChatMessageToolTip.vue
index 22ae7d9f1..270e9f4eb 100644
--- a/frontend/src/vue/chat/message/ChatMessageToolTip.vue
+++ b/frontend/src/vue/chat/message/ChatMessageToolTip.vue
@@ -76,8 +76,8 @@ export default class ChatMessageToolTip extends Vue {
       return;
     }
     // TODO, check if opened is the only status with abor request
-    if (this.message?.transfer?.xhr?.readyState === XMLHttpRequest.OPENED) {
-      this.message.transfer.xhr.abort();
+    if (this.message?.transfer?.abortFn) {
+      this.message.transfer.abortFn();
     }
     editMessageWs(
       null,
diff --git a/frontend/src/vue/chat/message/ChatSendingMessage.vue b/frontend/src/vue/chat/message/ChatSendingMessage.vue
index 9c82e018f..40d2e7ed7 100644
--- a/frontend/src/vue/chat/message/ChatSendingMessage.vue
+++ b/frontend/src/vue/chat/message/ChatSendingMessage.vue
@@ -109,7 +109,9 @@ export default class ChatSendingMessage extends Vue {
   }
 
   cancelTransfer() {
-    this.message.transfer?.xhr?.abort();
+    if (this.message.transfer?.abortFn) {
+      this.message.transfer.abortFn();
+    }
   }
 
   closeThread() {
diff --git a/frontend/src/vue/chat/textarea/GiphySearch.vue b/frontend/src/vue/chat/textarea/GiphySearch.vue
index c8decb877..6e417c858 100644
--- a/frontend/src/vue/chat/textarea/GiphySearch.vue
+++ b/frontend/src/vue/chat/textarea/GiphySearch.vue
@@ -20,7 +20,7 @@
       class="giphy-content"
       @scroll.passive="loadMore"
     >
-      <div v-if="images.length === 0 && search && !request">
+      <div v-if="images.length === 0 && search && !abortFn">
         Nothing found
       </div>
       <app-loading-image
@@ -62,7 +62,7 @@ import AppLoadingImage from "@/vue/ui/AppLoadingImage.vue";
 import {LOAD_GIPHIES_PER_REQUEST} from "@/ts/utils/consts";
 
 @Component({
-  name: 'GiphySearch',
+  name: "GiphySearch",
   components: {
     AppLoadingImage,
     AppSuspense,
@@ -82,7 +82,7 @@ export default class GiphySearch extends Vue {
 
   public images: GIFObject[] = [];
 
-  public request: XMLHttpRequest | null = null;
+  public abortFn: (() => void) | null = null;
 
   @Ref()
   private readonly suspense!: AppSuspense;
@@ -93,7 +93,7 @@ export default class GiphySearch extends Vue {
   private webpSupported: boolean = webpSupported;
 
   public get showLoadMoreBtn() {
-    return !this.request && this.images.length > 0 && this.pagination.count === LOAD_GIPHIES_PER_REQUEST;
+    return !this.abortFn && this.images.length > 0 && this.pagination.count === LOAD_GIPHIES_PER_REQUEST;
   }
 
   async mounted() {
@@ -121,13 +121,13 @@ export default class GiphySearch extends Vue {
     runningProp: "moreLoading",
   })
   async onSearchChange() {
-    if (this.request) {
-      this.request.abort();
-      this.request = null;
+    if (this.abortFn) {
+      this.abortFn();
+      this.abortFn = null;
     }
-    const response = await this.$api.searchGiphys(this.search, 0, LOAD_GIPHIES_PER_REQUEST, (r) => this.request = r);
+    const response = await this.$api.searchGiphys(this.search, 0, LOAD_GIPHIES_PER_REQUEST, (r) => this.abortFn = r);
     this.pagination = response.pagination;
-    this.request = null;
+    this.abortFn = null;
     this.images = response.data;
   }
 
@@ -149,7 +149,7 @@ export default class GiphySearch extends Vue {
      * W/0 +1, it returns duplicate id
      * the weird thing docs say, that pagination start with 0, but it seems like with 1
      */
-    const response: MultiResponse = await this.$api.searchGiphys(this.search, this.images.length + 1, LOAD_GIPHIES_PER_REQUEST, (r) => this.request = r);
+    const response: MultiResponse = await this.$api.searchGiphys(this.search, this.images.length + 1, LOAD_GIPHIES_PER_REQUEST, (r) => this.abortFn = r);
     this.pagination = response.pagination;
     this.images.push(...response.data.filter((n) => !this.images.find((o) => o.id === n.id)));
   }

From 797b1798518912f1682cdbabdb6bc93c822e3d58 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 17 Apr 2022 17:13:25 +0300
Subject: [PATCH 070/221] Upload message refactor and image process adding
 guards for ws

---
 common/dto.ts                                 |  43 ++-
 frontend/.eslintrc.json                       |   1 +
 frontend/src/ts/classes/DatabaseWrapper.ts    |   6 +-
 frontend/src/ts/classes/DefaultStore.ts       |   6 +-
 frontend/src/ts/classes/Fetch.ts              |  34 ++-
 frontend/src/ts/message_handlers/Api.ts       |  36 ++-
 frontend/src/ts/message_handlers/WsHandler.ts |  44 +--
 .../ts/message_handlers/WsMessageHandler.ts   |  96 ++++---
 frontend/src/ts/types/db.ts                   |   1 +
 frontend/src/ts/types/dto.ts                  |  10 -
 frontend/src/ts/types/model.ts                |  10 +-
 frontend/src/ts/types/types.ts                |  16 +-
 frontend/src/ts/utils/htmlApi.ts              |  55 ++--
 newback/.eslintrc.json                        |   2 +-
 newback/package.json                          |  26 +-
 newback/src/config/default.json               |  22 +-
 .../migration.start/202204110326-init.sql     |   3 +-
 newback/src/data/model/subscription.model.ts  |   4 +-
 newback/src/data/model/uploaded.file.model.ts |   6 +-
 newback/src/data/model/user.profile.model.ts  |   7 +
 newback/src/data/types/internal.ts            |   5 +
 newback/src/main.ts                           |   3 +-
 .../src/modules/api/file/file.controller.ts   |  40 +++
 newback/src/modules/api/file/file.module.ts   |  30 ++
 newback/src/modules/api/file/file.service.ts  |  58 ++++
 newback/src/modules/api/file/image.service.ts |  82 ++++++
 .../api/websocket/interfaces/pubsub.ts        |   4 -
 .../modules/api/websocket/message.service.ts  |  65 ++---
 .../api/websocket/websocket.gateway.ts        |  43 ++-
 .../api/websocket/websocket.service.ts        |   4 +-
 newback/src/modules/app/app.module.ts         |   2 +
 .../app/decorators/catch.ws.errors.ts}        |  27 +-
 .../app/decorators/user.id.decorator.ts       |  15 +
 .../app/decorators/ws.context.decorator.ts    |  16 ++
 newback/src/modules/app/guards/auth.guard.ts  |  28 ++
 .../modules/app/guards/own.message.guard.ts   |  50 ++++
 .../repository/messages.repository.ts         |  64 ++++-
 .../database/repository/room.repository.ts    |  15 +-
 .../modules/rest/password/password.service.ts |   2 -
 .../src/modules/rest/pubsub/pubsub.service.ts |  14 +-
 .../modules/rest/session/session.service.ts   |  19 +-
 .../src/modules/rest/ws.adapter/ws.adapter.ts |  12 +-
 newback/yarn.lock                             | 264 +++++++++++++++++-
 43 files changed, 985 insertions(+), 305 deletions(-)
 create mode 100644 newback/src/modules/api/file/file.controller.ts
 create mode 100644 newback/src/modules/api/file/file.module.ts
 create mode 100644 newback/src/modules/api/file/file.service.ts
 create mode 100644 newback/src/modules/api/file/image.service.ts
 rename newback/src/{utils/decorators.ts => modules/app/decorators/catch.ws.errors.ts} (67%)
 create mode 100644 newback/src/modules/app/decorators/user.id.decorator.ts
 create mode 100644 newback/src/modules/app/decorators/ws.context.decorator.ts
 create mode 100644 newback/src/modules/app/guards/auth.guard.ts
 create mode 100644 newback/src/modules/app/guards/own.message.guard.ts

diff --git a/common/dto.ts b/common/dto.ts
index 7caf904f3..dc8127354 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -1,4 +1,3 @@
-
 export interface SignInRequest extends CaptchaRequest {
   username?: string;
   password: string;
@@ -130,10 +129,17 @@ export enum ImageType {
   GIPHY = "GIPHY",
 }
 
-export enum UploadedFileChoices {
-  VIDEO = "VIDEO",
-  IMAGE = "IMAGE",
-  FILE = "FILE",
+export interface SaveFileResponse {
+  id: number;
+  previewId?: number;
+  symbol: string;
+}
+
+export interface SaveFileRequest {
+  file: Blob;
+  name: string;
+  symbol: string;
+  type: ImageType;
 }
 
 /** CODE THAT I PUT HERE MANUALLY */
@@ -335,7 +341,13 @@ export interface DeleteMessage extends DefaultWsInMessage<"deleteMessage", "ws-m
   edited: number;
 }
 
-export interface SetMessageStatusMessage extends DefaultWsInMessage<"setMessageStatus", "ws-message"> {
+export interface SetMessageStatusWsOutMessage extends DefaultWsOutMessage<"setMessageStatus"> {
+  messagesIds: number[];
+  status: MessageStatus;
+  roomId: number;
+}
+
+export interface SetMessageStatusWsInMessage extends DefaultWsInMessage<"setMessageStatus", "ws-message"> {
   roomId: number;
   status: MessageStatus;
   messagesIds: number[];
@@ -344,7 +356,24 @@ export interface SetMessageStatusMessage extends DefaultWsInMessage<"setMessageS
 export interface EditMessage extends DefaultWsInMessage<"editMessage", "ws-message">, MessageModelDto {
 }
 
-export interface PrintMessage extends DefaultWsInMessage<"printMessage", "ws-message">, MessageModelDto {
+export interface GiphyDto {
+  webp: string;
+  url: string;
+  symbol: string;
+}
+
+export interface PrintMessageWsOutMessage extends DefaultMessage<"printMessage"> {
+  content: string;
+  roomId: number;
+  files: number[];
+  id: number;
+  timeDiff: number;
+  parentMessage: number | null;
+  tags: Record<string, number>;
+  giphies: GiphyDto[];
+}
+
+export interface PrintMessageWsInMessage extends DefaultWsInMessage<"printMessage", "ws-message">, MessageModelDto {
 }
 
 export interface AddOnlineUserMessage extends DefaultWsInMessage<"addOnlineUser", "room">, ChangeUserOnlineBase {
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
index afe6d7943..7b24087a3 100644
--- a/frontend/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -23,6 +23,7 @@
   "rules": {
     "no-warning-comments": 0,
     "object-curly-spacing": 0,
+    "sort-keys": 0,
     "init-declarations": 0, // poor choice
     "func-style": [1, "declaration"],
     "one-var": 0, // poor choice
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 0014e1d42..3d408f048 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -132,7 +132,7 @@ export default class DatabaseWrapper implements IStorage {
         for (const k in message.tags) {
           const userId = message.tags[k];
           this.executeSql(t, "insert into tag (user_id, message_id, symbol) values (?, ?, ?)", [userId, message.id, k])();
-          // This.executeSql(t, 'delete from file where message_id = ? and symbol = ? ', [message.id, k], (t) => {
+          // This.executeSql(t,G 'delete from file where message_id = ? and symbol = ? ', [message.id, k], (t) => {
 
           // })();
         }
@@ -342,9 +342,9 @@ export default class DatabaseWrapper implements IStorage {
     this.write((t) => {
       this.executeMultiple(
         t,
-        Object.keys(m.fileIds).map((symb) => [
+        m.files.map(file => [
           "update file set file_id = ?, preview_file_id = ? where symbol = ? and message_id = ?",
-          [m.fileIds[symb].fileId, m.fileIds[symb].previewFileId ?? null, symb, m.messageId],
+          [file.id, file.previewId ?? null, file.symbol, m.messageId],
         ]),
       )();
     });
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index 389c5d4f0..649b86743 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -637,9 +637,9 @@ export class DefaultStore extends VuexModule {
     if (!mm.files) {
       throw Error(`Message ${payload.messageId} in room ${payload.roomId} doesn't have files`);
     }
-    Object.keys(payload.fileIds).forEach((symb) => {
-      mm.files![symb].fileId = payload.fileIds[symb].fileId || null;
-      mm.files![symb].previewFileId = payload.fileIds[symb].previewFileId || null;
+    payload.files.forEach(file => {
+      mm.files![file.symbol].fileId = file.id || null;
+      mm.files![file.symbol].previewFileId = file.previewId || null;
     });
     this.storage.updateFileIds(payload);
   }
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index a4da13985..e2b8ab323 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -5,7 +5,11 @@ import type {
 import {XHR_API_URL} from "@/ts/utils/runtimeConsts";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import {SetMessageProgress} from '@/ts/types/types';
+import {
+  SetMessageProgress,
+  UploadData
+} from "@/ts/types/types";
+import {SaveFileRequest} from "@/ts/types/backend";
 
 export default class Fetch {
   protected httpLogger: Logger;
@@ -43,16 +47,16 @@ export default class Fetch {
   }
 
 
-  public async upload<T>(url: string, form: FormData, onSetAbortFunction?: (e: () => void) => void, onProgress?: (i: number) => void) {
+  public async upload<T>({url, data, onSetAbortFunction, onProgress}: UploadData): Promise<T> {
      /*
-     * https://ilikekillnerds.com/2020/09/file-upload-progress-with-the-fetch-api-is-coming/
-     * https://chromestatus.com/feature/5274139738767360
-     * fetch api doesnt support progress api yet
-     */
+      * https://ilikekillnerds.com/2020/09/file-upload-progress-with-the-fetch-api-is-coming/
+      * https://chromestatus.com/feature/5274139738767360
+      * fetch api doesnt support progress api yet
+      */
     return new Promise((resolve, reject) => {
       const r = new XMLHttpRequest();
       r.addEventListener("load", () => {
-        let response = r.response;
+        let {response} = r;
         try {
           response = JSON.parse(r.response);
           if (r.status < 200 || r.status >= 300) {
@@ -71,7 +75,9 @@ export default class Fetch {
         reject("Network Error");
       });
       if (onSetAbortFunction) {
-        onSetAbortFunction(() => r.abort());
+        onSetAbortFunction(() => {
+          r.abort();
+        });
       }
       if (onProgress) {
         r.upload.addEventListener("progress", (evt) => {
@@ -80,9 +86,13 @@ export default class Fetch {
           }
         });
       }
-      r.open("GET", `${XHR_API_URL}${url}`);
+      r.open("POST", `${XHR_API_URL}${url}`);
       r.setRequestHeader("session-id", this.sessionHolder.session!);
-      r.send();
+      const form = new FormData();
+      Object.entries(data).forEach(([key, value]) => {
+        form.append(key, value);
+      });
+      r.send(form);
     });
   }
 
@@ -125,7 +135,9 @@ export default class Fetch {
     if (onSetAbortFunction) {
       const controller = new AbortController();
       signal = controller.signal;
-      onSetAbortFunction(() => controller.abort());
+      onSetAbortFunction(() => {
+        controller.abort();
+      });
     }
     const is3rdPartyApi = (/^https?:\/\//u).test(url);
     const fetchUrl = is3rdPartyApi ? url : `${XHR_API_URL}${url}`;
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index dc196208f..78745c082 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -3,11 +3,11 @@ import {
   GIPHY_API_KEY,
   GIPHY_URL,
 } from "@/ts/utils/consts";
-import type {UploadFile} from "@/ts/types/types";
 import type {
   OauthSessionResponse,
   OauthStatus,
   OkResponse,
+  SaveFileRequest,
   SaveFileResponse,
   SendRestorePasswordRequest,
   SessionResponse,
@@ -98,7 +98,7 @@ export default class Api extends MessageHandler {
     text: string,
     offset: number,
     limit: number,
-    onSetAbortFunction:  (c: () => void) => void,
+    onSetAbortFunction: (c: () => void) => void,
   ): Promise<MultiResponse> {
     let response!: MultiResponse;
     if ((/^\s*$/).exec(text)) {
@@ -192,18 +192,19 @@ export default class Api extends MessageHandler {
     }
   }
 
-  public async validateUsername(username: string, onSetAbortFunction:  (c: () => void) => void): Promise<ValidateUserResponse> {
+  public async validateUsername(username: string, onSetAbortFunction: (c: () => void) => void): Promise<ValidateUserResponse> {
     return this.fetch.doPost({
       url: "/auth/validate-user",
       params: {username},
-      onSetAbortFunction: onSetAbortFunction,
+      onSetAbortFunction,
     });
   }
 
   public async uploadProfileImage(file: Blob): Promise<void> {
-    const fd = new FormData();
-    fd.append("file", file);
-    await this.fetch.upload<void>("/upload_profile_image", fd);
+    await this.fetch.upload<void>({
+      url:"/upload_profile_image",
+      data: {file}
+    });
   }
 
   public async showProfile(id: number): Promise<ViewUserProfileDto> {
@@ -231,21 +232,16 @@ export default class Api extends MessageHandler {
     });
   }
 
-  // @ts-expect-error
-  public async uploadFiles(files: UploadFile[], onProgress: (i: number) => void, setAbortEvent: (e: () => void) => void): Promise<SaveFileResponse> {
-    let totalLength = 0;
-    for (let index = 0; index < files.length; index++) {
-      const fd = new FormData();
-      fd.append('file', files[index].file);
-      fd.append('symbol', files[index].key);
-      const response = await this.fetch.upload<SaveFileResponse>("/files/upload-file", fd, setAbortEvent, (bytes) => {
-        totalLength += bytes;
-        onProgress(totalLength);
-      });
-    }
+  public async uploadFile(data: SaveFileRequest, onProgress: (i: number) => void, onSetAbortFunction: (e: () => void) => void): Promise<SaveFileResponse> {
+    return this.fetch.upload<SaveFileResponse>({
+      url: "/file/upload-file",
+      data,
+      onSetAbortFunction,
+      onProgress,
+    });
   }
 
-  public async validateEmail(params: ValidateUserEmailRequest,onSetAbortFunction: (c: () => void) => void): Promise<ValidateEmailResponse> {
+  public async validateEmail(params: ValidateUserEmailRequest, onSetAbortFunction: (c: () => void) => void): Promise<ValidateEmailResponse> {
     return this.fetch.doPost({
       url: "/auth/validate-email",
       params,
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 0b3bdecfd..313aefec7 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -25,12 +25,10 @@ import {
   currentUserInfoDtoToModel,
   userSettingsDtoToModel,
 } from "@/ts/types/converters";
-import type {GiphyDto,
-  RoomNoUsersDto,
-  UserProfileDto,
-  UserProfileDtoWoImage,
-  UserSettingsDto,
-  GetCountryCodeWsOutMessage} from "@/ts/types/dto";
+import type {
+  GiphyDto,
+  PrintMessageWsOutMessage
+} from "@/ts/types/dto";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
 import type {AddChannelMessage,
@@ -41,7 +39,7 @@ import type {AddChannelMessage,
   MessagesResponseMessage,
   PingMessage,
   PongMessage,
-  PrintMessage,
+  PrintMessageWsInMessage,
   SaveChannelSettingsMessage,
   SetProfileImageMessage,
   SetSettingsMessage,
@@ -52,11 +50,16 @@ import type {AddChannelMessage,
   UserProfileChangedMessage,
   WebRtcSetConnectionIdMessage,
   ShowITypeWsOutMessage,
-
-  HandlerType,
+  RoomNoUsersDto,
+  UserProfileDto,
+  UserProfileDtoWoImage,
+  UserSettingsDto,
+  GetCountryCodeWsOutMessage,
+  SetMessageStatusWsOutMessage,
   HandlerTypes,
-
-  MessageStatus} from "@/ts/types/backend";
+  HandlerType,
+  MessageStatus
+} from "@/ts/types/backend";
 import type {
   InternetAppearMessage,
   LogoutMessage,
@@ -150,10 +153,9 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
   }
 
   public async getCountryCode(): Promise<GetCountryCodeWsInMessage> {
-    const body: GetCountryCodeWsOutMessage = {
+    return this.messageProc.sendToServerAndAwait<GetCountryCodeWsOutMessage, "getCountryCode">({
       action: "getCountryCode",
-    };
-    return this.messageProc.sendToServerAndAwait(body);
+    });
   }
 
   public async offerFile(roomId: number, browser: string, name: string, size: number, threadId: number | null): Promise<WebRtcSetConnectionIdMessage> {
@@ -252,8 +254,8 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     parentMessage: number | null,
     tags: Record<string, number>,
     giphies: GiphyDto[],
-  ): Promise<PrintMessage> {
-    const newVar = {
+  ): Promise<PrintMessageWsInMessage> {
+    return this.messageProc.sendToServerAndAwait<PrintMessageWsOutMessage, "printMessage">({
       files,
       id,
       timeDiff,
@@ -263,8 +265,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
       parentMessage,
       roomId,
       giphies,
-    };
-    return this.messageProc.sendToServerAndAwait(newVar);
+    });
   }
 
   public async saveSettings(content: UserSettingsDto): Promise<SetSettingsMessage | unknown> {
@@ -308,15 +309,14 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     onServerMessageIds: number[],
     lastSynced: number,
   ): Promise<SyncHistoryWsInMessage> {
-    const payload: SyncHistoryWsOutMessage = {
+    return this.messageProc.sendToServerAndAwait<SyncHistoryWsOutMessage, "syncHistory">({
       messagesIds,
       receivedMessageIds,
       onServerMessageIds,
       roomIds,
       lastSynced,
       action: "syncHistory",
-    };
-    return this.messageProc.sendToServerAndAwait(payload);
+    });
   }
 
   public async sendAddChannel(channelName: string, users: number[]): Promise<AddChannelMessage> {
@@ -443,7 +443,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     roomId: number,
     status: MessageStatus,
   ) {
-    return this.messageProc.sendToServerAndAwait({
+    return this.messageProc.sendToServerAndAwait<SetMessageStatusWsOutMessage, "setMessageStatus">({
       messagesIds,
       action: "setMessageStatus",
       status,
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index e895b6e79..93a70273f 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -8,7 +8,6 @@ import type {
   SetMessageProgress,
   SetMessageProgressError,
   SetUploadProgress,
-  UploadFile,
 } from "@/ts/types/types";
 import type {
   FileModel,
@@ -22,8 +21,13 @@ import type {
   GiphyDto,
   MessageModelDto,
   SaveFileResponse,
+
+  SaveFileRequest,
 } from "@/ts/types/dto";
-import {MessageStatus} from "@/ts/types/dto";
+import {
+  ImageType,
+  MessageStatus,
+} from "@/ts/types/backend";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
@@ -35,8 +39,8 @@ import type {
   HandlerType,
   HandlerTypes,
   MessagesResponseMessage,
-  PrintMessage,
-  SetMessageStatusMessage,
+  PrintMessageWsInMessage,
+  SetMessageStatusWsInMessage,
   SyncHistoryWsInMessage,
 } from "@/ts/types/backend";
 import {savedFiles} from "@/ts/utils/htmlApi";
@@ -51,7 +55,6 @@ import {
   getMissingIds,
 } from "@/ts/utils/pureFunctions";
 import type Subscription from "@/ts/classes/Subscription";
-import {ImageType} from "@/ts/types/backend";
 
 export default class WsMessageHandler extends MessageHandler implements MessageSender {
   protected readonly logger: Logger;
@@ -201,7 +204,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     const fileIds: number[] = this.getFileIdsFromMessage(storeMessage);
     const giphies: GiphyDto[] = this.getGiphiesFromMessage(storeMessage);
     if (storeMessage.id < 0 && storeMessage.content) {
-      const a: PrintMessage = await this.ws.sendPrintMessage(
+      const a: PrintMessageWsInMessage = await this.ws.sendPrintMessage(
         storeMessage.content,
         roomId,
         fileIds,
@@ -227,8 +230,8 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
   public async uploadFiles(
     messageId: number,
     roomId: number,
-    files: UploadFile[],
-  ): Promise<SaveFileResponse> {
+    files: SaveFileRequest[],
+  ): Promise<SaveFileResponse[]> {
     const size = files.reduce((summ, f) => summ + f.file.size, 0);
     const sup: SetUploadProgress = {
       upload: {
@@ -239,35 +242,39 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       roomId,
     };
     this.store.setUploadProgress(sup);
+    let responses: SaveFileResponse[] = [];
     try {
-      const res: SaveFileResponse = await this.api.uploadFiles(
-        files,
-        (uploaded) => {
-          const payload: SetMessageProgress = {
-            messageId,
-            roomId,
-            uploaded,
-          };
-          this.store.setMessageProgress(payload);
-        },
-        (abortFunction) => {
-          this.store.setUploadXHR({
-            abortFunction,
-            messageId,
-            roomId,
-          });
-        },
-      );
+      let total = 0;
+      for (let i = 0; i < files.length; i++) {
+        const res: SaveFileResponse = await this.api.uploadFile(
+          files[i],
+          (uploaded) => {
+            const payload: SetMessageProgress = {
+              messageId,
+              roomId,
+              uploaded: total + uploaded,
+            };
+            this.store.setMessageProgress(payload);
+          },
+          (abortFunction) => {
+            this.store.setUploadXHR({
+              abortFunction,
+              messageId,
+              roomId,
+            });
+          },
+        );
+        total += files[i].file.size;
+        responses.push(res);
+      }
+
       const newVar: RemoveMessageProgress = {
         messageId,
         roomId,
       };
       this.store.removeMessageProgress(newVar);
-      if (!res || Object.keys(res).length === 0) {
-        throw Error("Missing files uploads");
-      }
 
-      return res;
+      return responses;
     } catch (error: any) {
       const newVar: SetMessageProgressError = {
         messageId,
@@ -346,7 +353,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     }
   }
 
-  public async printMessage(inMessage: PrintMessage) {
+  public async printMessage(inMessage: PrintMessageWsInMessage) {
     const message: MessageModel = convertMessageModelDtoToModel(inMessage, null, (time) => this.ws.convertServerTimeToPC(time));
     this.messageHelper.processUnknownP2pMessage(message);
     if (inMessage.userId !== this.store.myId) {
@@ -367,7 +374,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     this.syncHistory(); // If some messages were sent during offline
   }
 
-  public async setMessageStatus(m: SetMessageStatusMessage) {
+  public async setMessageStatus(m: SetMessageStatusWsInMessage) {
     this.store.setMessagesStatus({
       roomId: m.roomId,
       status: m.status,
@@ -406,27 +413,32 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
 
   private async uploadFilesForMessages(storeMessage: MessageModel) {
     if (storeMessage.files) {
-      const uploadFiles: UploadFile[] = [];
+      const uploadFiles: SaveFileRequest[] = [];
       Object.keys(storeMessage.files).filter((k) => !storeMessage.files![k].fileId && storeMessage.files![k].sending).
-        forEach((k) => {
-          const file: FileModel = storeMessage.files![k];
-          uploadFiles.push({
-            file: savedFiles[file.url!], // TODO why null?
-            key: file.type + k,
-          });
+        forEach((key) => {
+          const file: FileModel = storeMessage.files![key];
+          const items: SaveFileRequest = {
+            file: savedFiles[file.url!],
+            symbol: key,
+            name: savedFiles[file.url!].name!,
+            type: file.type,
+          };
+          uploadFiles.push(items);
           if (file.preview) {
             uploadFiles.push({
               file: savedFiles[file.preview],
-              key: `p${k}`,
+              name: savedFiles[file.url!].name!,
+              type: file.type,
+              symbol: key,
             });
           }
         });
       if (uploadFiles.length > 0) {
-        const fileIds = await this.uploadFiles(storeMessage.id, storeMessage.roomId, uploadFiles);
+        const files: SaveFileResponse[] = await this.uploadFiles(storeMessage.id, storeMessage.roomId, uploadFiles);
         this.store.setMessageFileIds({
           roomId: storeMessage.roomId,
           messageId: storeMessage.id,
-          fileIds,
+          files,
         });
       }
     }
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index 4a2524a10..f64e682b7 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -62,6 +62,7 @@ export interface MessageDB {
 
 export interface FileDB {
   id: number;
+  name: string;
   preview_file_id: number; //  So this is UploadFile.id for "preview" File
   file_id: number; // So this is UploadFile.id for "url" File
   server_id: number; // If we saved this file on backend, it would have its id
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index f67ad6989..6f5089d69 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -25,9 +25,6 @@ export interface ViewUserProfileDto extends UserProfileDto {
   image: string;
 }
 
-export type SaveFileResponse = Record<string, {fileId: number; previewFileId?: number}>;
-
-
 
 export interface SetStateFromWS {
   roomsDict: RoomDictModel;
@@ -44,13 +41,6 @@ export interface SetStateFromStorage {
 }
 
 
-
-export interface GiphyDto {
-  webp: string;
-  url: string;
-  symbol: string;
-}
-
 export interface OauthStatus {
   google: boolean;
   facebook: boolean;
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index f8529c4f9..767fbfeb1 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -87,18 +87,10 @@ export interface Location {
   region: string | null;
 }
 
-/*
- * F - file
- * g - giphy
- * i - image
- * v - video
- * a - audio
- * m - media (same as video, but you need to click on image, in order to load video)
- */
-
 export interface FileModel {
   url: string | null;
   type: ImageType;
+  name?: string; // TODO
   serverId: number | null;
   previewFileId: number | null;
   fileId: number | null;
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 6b482b5a2..7481991cb 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -21,12 +21,7 @@ import {
   MessageStatusInner,
   MessageStatusModel
 } from '@/ts/types/model';
-
-
-export interface UploadFile {
-  key: string;
-  file: Blob | File;
-}
+import {ImageType} from '@/ts/types/dto';
 
 export type ValueFilterForKey<T extends object, U> = {
   [K in keyof T]: U extends T[K] ? K : never;
@@ -160,7 +155,7 @@ export interface SetMessageProgressError {
 export interface SetFileIdsForMessage {
   messageId: number;
   roomId: number;
-  fileIds: SaveFileResponse;
+  files: SaveFileResponse[];
 }
 
 export interface RoomMessageIds {
@@ -236,6 +231,13 @@ export interface PostData {
   onSetAbortFunction?: (c: () => void) => void;
 }
 
+export interface UploadData {
+  url: string;
+  data: Record<string, any>;
+  onSetAbortFunction?: (e: () => void) => void;
+  onProgress?: (i: number) => void;
+}
+
 export interface AddSendingFileTransfer {
   roomId: number;
   connId: string;
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index c488b70c5..8a21b939b 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -501,37 +501,46 @@ export function pasteBlobToContentEditable(blob: Blob, textArea: HTMLElement) {
 
 export function pasteBlobVideoToTextArea(file: Blob, textArea: HTMLElement, videoType: string, errCb: Function) {
   const video = document.createElement("video");
+  video.style.opacity = '0';
+  video.style.width = '0';
+  video.style.height = '0';
+  video.style.position = 'absolute'
+  document.body.appendChild(video);
   if (video.canPlayType(file.type)) {
     video.autoplay = false;
     const src = URL.createObjectURL(file);
     video.loop = false;
-    video.addEventListener("loadeddata", () => {
+    video.addEventListener("loadedmetadata", () => {
       tmpCanvasContext.canvas.width = video.videoWidth;
       tmpCanvasContext.canvas.height = video.videoHeight;
-      tmpCanvasContext.drawImage(video, 0, 0);
-      tmpCanvasContext.canvas.toBlob(
-        (blob) => {
-          const img = document.createElement("img");
-          if (!blob) {
-            logger.error(`Failed to render 1st frame image for file ${file.name}, setting videoIcon instead`)();
-            img.src = videoIcon;
-          } else {
-            const url = URL.createObjectURL(blob);
-            savedFiles[url] = blob;
-            blob.name = ".jpg";
-            img.src = url;
-          }
-          img.className = PASTED_IMG_CLASS;
-          img.setAttribute("videoType", videoType);
-          img.setAttribute("associatedVideo", src);
-          savedFiles[src] = file;
-          pasteNodeAtCaret(img, textArea);
-        },
-        "image/jpeg",
-        0.95,
-      );
+      logger.log(`Loaded video metadata ${video.videoWidth}x${video.videoHeight}`)();
+      setTimeout(() => {
+        tmpCanvasContext.drawImage(video, 0, 0);
+        tmpCanvasContext.canvas.toBlob(
+          (blob) => {
+            const img = document.createElement("img");
+            if (!blob) {
+              logger.error(`Failed to render 1st frame image for file ${file.name}, setting videoIcon instead`)();
+              img.src = videoIcon;
+            } else {
+              const url = URL.createObjectURL(blob);
+              savedFiles[url] = blob;
+              blob.name = ".jpg";
+              img.src = url;
+            }
+            img.className = PASTED_IMG_CLASS;
+            img.setAttribute("videoType", videoType);
+            img.setAttribute("associatedVideo", src);
+            savedFiles[src] = file;
+            pasteNodeAtCaret(img, textArea);
+          },
+          "image/jpeg",
+          0.95,
+        );
+      }, 100); // https://stackoverflow.com/a/71900837/3872976
     }, false);
     video.src = src;
+    video.load()
   } else {
     errCb(`Browser doesn't support playing ${file.type}`);
   }
diff --git a/newback/.eslintrc.json b/newback/.eslintrc.json
index a256125a9..4e3475ca0 100644
--- a/newback/.eslintrc.json
+++ b/newback/.eslintrc.json
@@ -110,7 +110,7 @@
     "import/no-named-default": 1,
     "import/no-named-export":0, // we want them
     "import/no-namespace": 0,
-    "import/no-nodejs-modules":1,
+    "import/no-nodejs-modules":0,
     "import/no-restricted-paths": 1,
     "import/no-self-import":1,
     "import/no-unassigned-import": [1,  {"allow": ["**/*.sass", "**/*.css"]}],
diff --git a/newback/package.json b/newback/package.json
index 80367d75d..cbf7e0600 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -24,11 +24,14 @@
     "@nestjs/core": "^8.4.4",
     "@nestjs/platform-express": "^8.4.4",
     "@nestjs/sequelize": "^8.0.0",
+    "@nestjs/serve-static": "^2.2.2",
     "@nestjs/swagger": "^5.2.1",
     "@nestjs/websockets": "^8.4.4",
     "@types/bcrypt": "^5.0.0",
+    "@types/multer": "^1.4.7",
     "@types/node-fetch": "^2.6.1",
     "@types/nodemailer": "^6.4.4",
+    "@types/sharp": "^0.30.2",
     "@types/supertest": "^2.0.12",
     "@types/ws": "^8.5.3",
     "bcrypt": "^5.0.1",
@@ -45,11 +48,9 @@
     "rxjs": "^7",
     "sequelize": "^6.18.0",
     "sequelize-typescript": "^2.1.3",
+    "sharp": "^0.30.3",
     "swagger-ui-express": "^4.3.0",
-    "tsruntime": "^3.0.0-beta.1",
-    "ttypescript": "^1.5.13",
     "typend": "^1.1.1",
-    "typescript-transform-paths": "^3.3.1",
     "ws": "^8.5.0"
   },
   "devDependencies": {
@@ -61,22 +62,25 @@
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.23",
     "@types/sequelize": "^4.28.11",
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0",
     "eslint": "^8.12.0",
+    "eslint-find-rules": "^4.1.0",
+    "eslint-plugin-babel": "^5.3.1",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jest": "^26.1.4",
+    "eslint-plugin-only-warn": "^1.0.3",
+    "eslint-plugin-sonarjs": "^0.13.0",
     "jest": "^27.5.1",
     "jest-runner-eslint": "^1.0.0",
     "supertest": "^6.2.2",
     "ts-jest": "^27.1.4",
     "ts-loader": "^9.2.8",
     "ts-node": "^10.7.0",
+    "tsruntime": "^3.0.0-beta.1",
+    "ttypescript": "^1.5.13",
     "typescript": "^4.6.3",
-    "wait-for-expect": "^3.0.2",
-    "eslint-find-rules": "^4.1.0",
-    "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-only-warn": "^1.0.3",
-    "eslint-plugin-sonarjs": "^0.13.0",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0"
+    "typescript-transform-paths": "^3.3.1",
+    "wait-for-expect": "^3.0.2"
   }
 }
diff --git a/newback/src/config/default.json b/newback/src/config/default.json
index 2d2fdf332..3baddc761 100644
--- a/newback/src/config/default.json
+++ b/newback/src/config/default.json
@@ -1,22 +1,12 @@
 {
   "name": "pychat",
   "application": {
-    "env": "default",
     "port": 8888,
-    "logLevel": "debug",
-    "logOutput": "text",
     "crtPath": "../frontend/build/certs/server.crt.pem",
     "keyPath": "../frontend/build/certs/private.key.pem"
   },
   "settings": {
-    "wsIdCharLength": 4,
-    "allRedisRoom": "all",
-    "allRoomId": 1,
-    "flags": true,
-    "firebaseUrl": "https://fcm.googleapis.com/fcm/send",
-    "pingCloseJsDelay": 10000,
-    "pingInterval": 300000,
-    "clientNoServerPingCloseTimeout": 320000
+    "flags": true
   },
   "redis": {
     "host": "localhost",
@@ -25,19 +15,13 @@
   },
   "frontend": {
     "address": "https://localhost:8080",
-    "jsConsoleLogs": "debug",
-    "maxMessageSize": 100000,
-    "issueReportLink": "https://github.com/akoidan/pychat/issues/new",
-    "chromeExtension": {
-      "id" : "cnlplcfdldebgdlcmpkafcialnbopedn",
-      "url" : "https://chrome.google.com/webstore/detail/pychat-screensharing-exte/cnlplcfdldebgdlcmpkafcialnbopedn"
-    }
+    "issueReportLink": "https://github.com/akoidan/pychat/issues/new"
   },
   "mysql": {
     "host": "localhost",
     "port": 3306,
     "username": "pychat",
     "password": "pypass",
-    "database": "pychat2"
+    "database": "pychat"
   }
 }
diff --git a/newback/src/data/migration.start/202204110326-init.sql b/newback/src/data/migration.start/202204110326-init.sql
index 8b5c529e1..8a10a05eb 100644
--- a/newback/src/data/migration.start/202204110326-init.sql
+++ b/newback/src/data/migration.start/202204110326-init.sql
@@ -188,7 +188,7 @@ CREATE TABLE `subscription_message`
 CREATE TABLE `uploaded_file`
 (
     `id`         INTEGER auto_increment,
-    `type`       ENUM('VIDEO', 'IMAGE', 'FILE') NOT NULL,
+    `type`       ENUM ('VIDEO', 'FILE', 'MEDIA_RECORD', 'AUDIO_RECORD', 'IMAGE', 'PREVIEW', 'GIPHY') NOT NULL,
     `symbol`     VARCHAR(1)                                                                          NOT NULL,
     `user_id`    INTEGER                                                                             NOT NULL,
     `file`       VARCHAR(255)                                                                        NOT NULL,
@@ -256,6 +256,7 @@ CREATE TABLE `user_profile`
     `surname`    VARCHAR(30),
     `birthday`   DATE,
     `contacts`   VARCHAR(100),
+    `image`      VARCHAR(100) DEFAULT NULL,
     `created_at` DATETIME NOT NULL,
     `updated_at` DATETIME NOT NULL,
     `deleted_at` DATETIME,
diff --git a/newback/src/data/model/subscription.model.ts b/newback/src/data/model/subscription.model.ts
index 3221d16a1..019fe365c 100644
--- a/newback/src/data/model/subscription.model.ts
+++ b/newback/src/data/model/subscription.model.ts
@@ -8,7 +8,6 @@ import {
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
-import {UploadedFileChoices} from "@/data/types/frontend";
 import {IpAddressModel} from "@/data/model/ip.address.model";
 import {MysqlBool} from "@/data/types/internal";
 
@@ -37,7 +36,7 @@ export class SubscriptionModel extends Model<SubscriptionModel> {
     unique: true,
     allowNull: false,
   })
-  public registrationId: UploadedFileChoices;
+  public registrationId: string;
 
   @Column({
     type: DataType.STRING(64),
@@ -45,7 +44,6 @@ export class SubscriptionModel extends Model<SubscriptionModel> {
   })
   public agent: string;
 
-
   @Column({
     type: DataType.BOOLEAN,
     defaultValue: false,
diff --git a/newback/src/data/model/uploaded.file.model.ts b/newback/src/data/model/uploaded.file.model.ts
index b10128061..73c3ca2fd 100644
--- a/newback/src/data/model/uploaded.file.model.ts
+++ b/newback/src/data/model/uploaded.file.model.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
-import {UploadedFileChoices} from "@/data/types/frontend";
+import {ImageType} from "@/data/types/frontend";
 import {UserModel} from "@/data/model/user.model";
 
 @Injectable()
@@ -21,10 +21,10 @@ export class UploadedFileModel extends Model<UploadedFileModel> {
   public id: number;
 
   @Column({
-    type: DataType.ENUM(...Object.keys(UploadedFileChoices)),
+    type: DataType.ENUM(...Object.keys(ImageType)),
     allowNull: false,
   })
-  public type: UploadedFileChoices;
+  public type: ImageType;
 
   @Column({
     type: DataType.STRING(1),
diff --git a/newback/src/data/model/user.profile.model.ts b/newback/src/data/model/user.profile.model.ts
index dd9b73a35..89b878ca3 100644
--- a/newback/src/data/model/user.profile.model.ts
+++ b/newback/src/data/model/user.profile.model.ts
@@ -52,4 +52,11 @@ export class UserProfileModel extends Model<UserProfileModel> {
     allowNull: true,
   })
   public contacts: string;
+
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(100),
+    defaultValue: null,
+  })
+  public image: string;
 }
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 65271823d..0eca75ac5 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -9,3 +9,8 @@ export type UserOnlineData = Record<string, string[]>;
 
 // https://stackoverflow.com/questions/48881009/convert-tinyint-field-as-boolean-in-result-using-sequelize-raw-query-node-js
 export type MysqlBool = 0 | 1 | false | true;
+
+export interface FileSaveResponse {
+  originFileName: string;
+  previewFileName: string;
+}
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 42c7b020b..3939d41da 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -2,7 +2,6 @@ import {NestFactory} from "@nestjs/core";
 import {AppModule} from "@/modules/app/app.module";
 import {config} from "node-ts-config";
 import {
-  ConsoleLogger,
   Logger,
   ValidationPipe,
 } from "@nestjs/common";
@@ -17,7 +16,7 @@ async function bootstrap() {
   const app = await NestFactory.create(AppModule, {
     logger: ["log", "error", "warn", "debug"],
     cors: {
-      allowedHeaders: ["x-requested-with", "session_id", "Content-Type"],
+      allowedHeaders: ["x-requested-with", "session-id", "Content-Type"],
       methods: ["POST", "GET", "OPTIONS"],
       origin: "*",
     },
diff --git a/newback/src/modules/api/file/file.controller.ts b/newback/src/modules/api/file/file.controller.ts
new file mode 100644
index 000000000..506d700aa
--- /dev/null
+++ b/newback/src/modules/api/file/file.controller.ts
@@ -0,0 +1,40 @@
+import {
+  Body,
+  Controller,
+  Post,
+  UploadedFile,
+  UseGuards,
+  UseInterceptors,
+} from "@nestjs/common";
+import {FileInterceptor} from "@nestjs/platform-express";
+import {AuthGuard} from "@/modules/app/guards/auth.guard";
+import {UserId} from "@/modules/app/decorators/user.id.decorator";
+import {FileService} from "@/modules/api/file/file.service";
+import type {
+  SaveFileResponse,
+} from "@/data/types/frontend";
+import {
+  SaveFileRequest,
+} from "@/data/types/frontend";
+
+
+@Controller({
+  path: "/api/file",
+})
+export class FileController {
+  public constructor(
+    private readonly fileService: FileService,
+  ) {
+  }
+
+  @UseGuards(AuthGuard)
+  @Post("/upload-file")
+  @UseInterceptors(FileInterceptor("file"))
+  public async acceptToken(
+    @UploadedFile() file: Express.Multer.File,
+      @Body() body: SaveFileRequest,
+      @UserId() userId: number,
+  ): Promise<SaveFileResponse> {
+    return this.fileService.saveFile(userId, file, body.symbol, body.type, body.name);
+  }
+}
diff --git a/newback/src/modules/api/file/file.module.ts b/newback/src/modules/api/file/file.module.ts
new file mode 100644
index 000000000..0c9ec2392
--- /dev/null
+++ b/newback/src/modules/api/file/file.module.ts
@@ -0,0 +1,30 @@
+import {Module} from "@nestjs/common";
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {ServeStaticModule} from "@nestjs/serve-static";
+import {join} from "path";
+import {FileController} from "@/modules/api/file/file.controller";
+import {SessionService} from "@/modules/rest/session/session.service";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {ImageService} from "@/modules/api/file/image.service";
+import {FileService} from "@/modules/api/file/file.service";
+
+@Module({
+  imports: [
+    DatabaseModule,
+    ServeStaticModule.forRoot({
+      rootPath: join(__dirname, "..", "..", "..", "photos"),
+      serveRoot: "photo",
+    }),
+  ],
+  controllers: [FileController],
+  providers: [
+    SessionService,
+    RedisService,
+    PasswordService,
+    ImageService,
+    FileService,
+  ],
+})
+export class FileModule {
+}
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
new file mode 100644
index 000000000..cd4af1a7e
--- /dev/null
+++ b/newback/src/modules/api/file/file.service.ts
@@ -0,0 +1,58 @@
+import {
+  Injectable,
+  Logger,
+} from "@nestjs/common";
+import type {
+  SaveFileResponse,
+  ImageType,
+} from "@/data/types/frontend";
+import {join} from "path";
+import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import type {FileSaveResponse} from "@/data/types/internal";
+import {Sequelize} from "sequelize-typescript";
+import {ImageService} from "@/modules/api/file/image.service";
+
+@Injectable()
+export class FileService {
+  private readonly savePath: string = join(__dirname, "..", "..", "..", "..", "photos");
+
+  public constructor(
+    private readonly messageRepository: MessageRepository,
+    private readonly logger: Logger,
+    private readonly imageService: ImageService,
+    private readonly sequelize: Sequelize,
+  ) {
+
+  }
+
+  public async saveFile(
+    userId: number,
+    file: Express.Multer.File,
+    symbol: string,
+    type: ImageType,
+    name: string
+  ): Promise<SaveFileResponse> {
+    return this.sequelize.transaction(async(transaction) => {
+      const fileSaveResponse: FileSaveResponse = await this.imageService.saveFile(userId, file, symbol, type, name);
+      const id = await this.messageRepository.saveUploadFile({
+        type,
+        file: fileSaveResponse.originFileName,
+        symbol,
+        userId,
+      }, transaction);
+      const response: SaveFileResponse = {
+        id,
+        symbol,
+      };
+      if (fileSaveResponse.previewFileName) {
+        response.previewId = await this.messageRepository.saveUploadFile({
+          type,
+          file: fileSaveResponse.originFileName,
+          symbol,
+          userId,
+        }, transaction);
+      }
+      return response;
+    });
+  }
+}
diff --git a/newback/src/modules/api/file/image.service.ts b/newback/src/modules/api/file/image.service.ts
new file mode 100644
index 000000000..069415015
--- /dev/null
+++ b/newback/src/modules/api/file/image.service.ts
@@ -0,0 +1,82 @@
+import {
+  Injectable,
+  Logger,
+} from "@nestjs/common";
+import {
+  ImageType,
+} from "@/data/types/frontend";
+import type {Metadata} from "sharp";
+import * as sharp from "sharp";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {join} from "path";
+import {writeFile} from "fs/promises";
+import {FileSaveResponse} from '@/data/types/internal';
+
+@Injectable()
+export class ImageService {
+  private readonly savePath: string = join(__dirname, "..", "..", "..", "..", "photos");
+
+  public constructor(
+    private readonly passwordService: PasswordService,
+    private readonly logger: Logger,
+  ) {
+
+  }
+
+  private async getName(origin: string, extension: string = "") {
+    let namUrl = origin;
+    if (namUrl?.endsWith(`.${extension}`)) { // exclude blah.jpeg.jpeg
+      namUrl = namUrl.substring(0, namUrl.length - extension.length -1)
+    }
+    if (namUrl) {
+      namUrl = origin.replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, 20);
+    }
+    let id = await this.passwordService.generateRandomString(8);
+    return `${id}_${namUrl}${extension ?? `.${extension}`}`;
+  }
+
+  public async saveFile(
+    userId: number,
+    file: Express.Multer.File,
+    symbol: string,
+    type: ImageType,
+    name: string
+  ): Promise<FileSaveResponse> {
+    let originFileName = null;
+    let previewFileName = null;
+    if (type === ImageType.IMAGE) {
+      let saveRes = await this.saveImageFiles(file, name);
+      originFileName = saveRes.originFileName;
+      previewFileName = saveRes.previewFileName;
+    } else {
+      originFileName = await this.getName(name);
+      await writeFile(`${this.savePath}${originFileName}`, file.buffer, "binary");
+    }
+    this.logger.log(`Saved userId ${userId} ${type} to ${originFileName} ${previewFileName}`, "file");
+    return {originFileName, previewFileName};
+  }
+
+  private async saveImageFiles(
+    file: Express.Multer.File,
+    name: string,
+  ): Promise<FileSaveResponse> {
+    const origin = await sharp(file.buffer);
+    const meta: Metadata = await origin.metadata();
+    const proportion = Math.max(meta.width / 600, meta.height / 400); // Max 400x600
+    let previewFileName = null;
+    if (proportion > 1 || meta.format !== "webp") {
+      previewFileName = await this.getName(name, "webp");
+      await origin.
+        clone().
+        resize(Math.round(meta.width / proportion)).
+        webp().
+        toFile(`${this.savePath}${previewFileName}`);
+    }
+    const originFileName = await this.getName(name, meta.format);
+    await origin.toFile(`${this.savePath}${originFileName}`);
+    return {
+      originFileName,
+      previewFileName,
+    };
+  }
+}
diff --git a/newback/src/modules/api/websocket/interfaces/pubsub.ts b/newback/src/modules/api/websocket/interfaces/pubsub.ts
index f62924d74..c186af540 100644
--- a/newback/src/modules/api/websocket/interfaces/pubsub.ts
+++ b/newback/src/modules/api/websocket/interfaces/pubsub.ts
@@ -2,10 +2,6 @@ import type {
   DefaultWsInMessage,
   HandlerName,
 } from "@/data/types/frontend";
-import {
-  DefaultInMessage,
-} from "@/data/types/frontend";
-import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
 
 export interface PubSubMessage<A extends string, H extends HandlerName> {
   body: DefaultWsInMessage<A, H>;
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 79840b10c..9c57c05cc 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -4,12 +4,12 @@ import {
 } from "@nestjs/common";
 import {UserRepository} from "@/modules/rest/database/repository/user.repository";
 import {PasswordService} from "@/modules/rest/password/password.service";
-import type {
-  ShowITypeWsInMessage,
+import type {ShowITypeWsInMessage,
   ShowITypeWsOutMessage,
   SyncHistoryWsOutMessage,
   SyncHistoryWsInMessage,
-} from "@/data/types/frontend";
+
+  PrintMessageWsOutMessage} from "@/data/types/frontend";
 import {
   ImageType,
   MessageStatus,
@@ -22,6 +22,8 @@ import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 import type {WebSocketContextData} from "@/data/types/internal";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
 import {getSyncMessage} from "@/modules/api/websocket/transformers/ws.transformer";
+import {Sequelize} from "sequelize-typescript";
+import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 
 
 @Injectable()
@@ -36,6 +38,7 @@ export class MessageService {
     private readonly userRepository: UserRepository,
     private readonly pubsubService: PubsubService,
     private readonly messageRepository: MessageRepository,
+    private readonly sequelize: Sequelize,
   ) {
   }
 
@@ -57,11 +60,19 @@ export class MessageService {
 
   public async syncHistory(data: SyncHistoryWsOutMessage, context: WebSocketContextData) {
     // MessageStatus.ON_SERVER
-    const messages = await this.messageRepository.getNewOnServerMessages(data.roomIds, data.messagesIds, data.lastSynced);
+    const messages = await this.messageRepository.getNewOnServerMessages(
+      data.roomIds,
+      data.messagesIds,
+      data.lastSynced
+    );
 
     let receivedMessageIds = [];
     if (data.onServerMessageIds) {
-      receivedMessageIds = await this.messageRepository.getMessagesByIdsAndStatus(data.roomIds, data.onServerMessageIds, MessageStatus.RECEIVED);
+      receivedMessageIds = await this.messageRepository.getMessagesByIdsAndStatus(
+        data.roomIds,
+        data.onServerMessageIds,
+        MessageStatus.RECEIVED
+      );
     }
 
     let readmesageIds = [];
@@ -75,36 +86,20 @@ export class MessageService {
     const mentions = await this.messageRepository.getTagsByMessagesId(messageIdsWithSymbol);
 
     return getSyncMessage(readmesageIds, receivedMessageIds, messages, mentions, images);
+  }
 
-  /*
-   *
-   * If in_message[VarNames.ON_SERVER_MESSAGE_IDS]:
-   * 	on_server_to_received_ids = list(Message.objects.filter(
-   * 		Q(room_id__in=room_ids)
-   * 		& Q(id__in=in_message[VarNames.ON_SERVER_MESSAGE_IDS])
-   * 		& Q(message_status=Message.MessageStatus.received.value)
-   * 	).values_list('id', flat=True))
-   * else:
-   * 	on_server_to_received_ids = []
-   *
-   * if in_message[VarNames.RECEIVED_MESSAGE_IDS] or in_message[VarNames.ON_SERVER_MESSAGE_IDS]:
-   * 	ids_to_search = in_message[VarNames.RECEIVED_MESSAGE_IDS] + in_message[VarNames.ON_SERVER_MESSAGE_IDS]
-   * 	read_ids = list(Message.objects.filter(
-   * 		Q(room_id__in=room_ids)
-   * 		& Q(id__in=ids_to_search)
-   * 		& Q(message_status=Message.MessageStatus.read.value)
-   * 	).values_list('id', flat=True))
-   * else:
-   * 	read_ids = []
-   *
-   * content = MessagesCreator.message_models_to_dtos(messages)
-   * self.ws_write({
-   * 	VarNames.CONTENT: content,
-   * 	VarNames.RECEIVED_MESSAGE_IDS: on_server_to_received_ids,
-   * 	VarNames.READ_MESSAGE_IDS: read_ids,
-   * 	VarNames.JS_MESSAGE_ID: in_message[VarNames.JS_MESSAGE_ID],
-   * 	VarNames.HANDLER_NAME: HandlerNames.NULL
-   * })
-   */
+  public async printMessage(data: PrintMessageWsOutMessage, context: WebSocketContextData) {
+    return this.sequelize.transaction(async(transaction) => {
+      const files: UploadedFileModel[] = await this.messageRepository.getUploadedFiles(data.files, context.userId, transaction);
+      let symbol: number|null = Math.max(
+        0,
+        ...files.map((f) => f.symbol.charCodeAt(0)),
+        ...Object.keys(data.tags).map((k) => k.charCodeAt(0)),
+        ...data.giphies.map((g) => g.symbol.charCodeAt(0))
+      );
+      if (symbol === 0) {
+        symbol = null;
+      }
+    });
   }
 }
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index c2fa7b9f4..eacdfa569 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -6,10 +6,6 @@ import {
   WebSocketServer,
 } from "@nestjs/websockets";
 import {IncomingMessage} from "http";
-import {
-  CatchWsErrors,
-  WsContext,
-} from "@/utils/decorators";
 import {
   Server,
   WebSocket,
@@ -18,16 +14,17 @@ import {WebSocketContextData} from "@/data/types/internal";
 import {
   Logger,
   UseFilters,
+  UseGuards,
 } from "@nestjs/common";
 import type {
   GetCountryCodeWsInMessage,
   SyncHistoryWsInMessage,
 } from "@/data/types/frontend";
-import {
-  GetCountryCodeWsOutMessage,
+import {GetCountryCodeWsOutMessage,
   ShowITypeWsOutMessage,
   SyncHistoryWsOutMessage,
-} from "@/data/types/frontend";
+
+  PrintMessageWsOutMessage} from "@/data/types/frontend";
 import {SubscribePuBSub} from "@/modules/rest/pubsub/pubsub.service";
 import {SendToClientPubSubMessage} from "@/modules/api/websocket/interfaces/pubsub";
 import {WebsocketService} from "@/modules/api/websocket/websocket.service";
@@ -35,6 +32,12 @@ import type {OnWsClose} from "@/modules/api/websocket/interfaces/utils";
 import {WsDataService} from "@/modules/api/websocket/ws.data.service";
 import {WsExceptionFilter} from "@/modules/api/websocket/ws.exception.filter";
 import {MessageService} from "@/modules/api/websocket/message.service";
+import {WsContext} from "@/modules/app/decorators/ws.context.decorator";
+import {CatchWsErrors} from "@/modules/app/decorators/catch.ws.errors";
+import {
+  MessagesFromMyRoomGuard,
+  OwnMessageGuardMixin
+} from "@/modules/app/guards/own.message.guard";
 
 @WebSocketGateway({
   path: "/ws",
@@ -75,17 +78,37 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
     return this.messageService.syncHistory(data, context);
   }
 
+  @SubscribeMessage("setMessageStatus")
+  public async setMessageStatus(
+
+  ): Promise<void> {
+    // This.messageService.setStatus
+  }
+
+
+  @UseGuards(OwnMessageGuardMixin)
   @SubscribeMessage("printMessage")
-  public async printMessage(@MessageBody() data: SyncHistoryWsOutMessage, @WsContext() context: WebSocketContextData): Promise<any> {
+  // @UseGuards(MessagesFromMyRoomGuard((data: PrintMessageWsOutMessage) => [data.parentMessage]))
+  public async printMessage(
+    @MessageBody() data: PrintMessageWsOutMessage,
+      @WsContext() context: WebSocketContextData
+  ): Promise<any> {
+    await this.messageService.printMessage(data, context);
   }
 
   @SubscribeMessage("showIType")
-  public async showIType(@MessageBody() data: ShowITypeWsOutMessage, @WsContext() context: WebSocketContextData): Promise<void> {
+  public async showIType(
+    @MessageBody() data: ShowITypeWsOutMessage,
+      @WsContext() context: WebSocketContextData
+  ): Promise<void> {
     await this.messageService.showIType(data, context);
   }
 
   @SubscribeMessage("getCountryCode")
-  async getCountryCode(@MessageBody() data: GetCountryCodeWsOutMessage, @WsContext() context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, "action" | "handler">> {
+  public async getCountryCode(
+    @MessageBody() data: GetCountryCodeWsOutMessage,
+      @WsContext() context: WebSocketContextData
+  ): Promise<Omit<GetCountryCodeWsInMessage, "action" | "handler">> {
     return this.wsDataService.getCountryCodes(context);
   }
 }
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 9f8d65b71..d00ac0641 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -35,7 +35,7 @@ export class WebsocketService {
 
   public async handleConnection(urlString: string, context: WebSocketContextData, ip: any) {
     const url = new URLSearchParams(urlString);
-    const user: UserModel = await this.sessionService.getUserById(url.get("sessionId"));
+    const user: UserModel = await this.sessionService.getUserBySessionId(url.get("sessionId"));
     const id = await this.passwordService.createWsId(user.id, url.get("id"));
     context.userId = user.id;
     context.id = id;
@@ -77,7 +77,7 @@ export class WebsocketService {
   }
 
   public async closeConnection(context: WebSocketContextData) {
-    this.pubsubService.unsubscribe(context);
+    this.pubsubService.unsubscribeAll(context);
     if (context.id) {
       await this.redisService.removeOnline(context.id);
     }
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 4a3ab8545..1c17c41f7 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -9,6 +9,7 @@ import {ConfigModule} from "@/modules/rest/config/config.module";
 import {VerifyModule} from "@/modules/api/verify/verify.module";
 import {DatabaseModule} from "@/modules/rest/database/database.module";
 import {WebsocketModule} from "@/modules/api/websocket/websocket.module";
+import {FileModule} from '@/modules/api/file/file.module';
 
 
 /*
@@ -34,6 +35,7 @@ import {WebsocketModule} from "@/modules/api/websocket/websocket.module";
     LoggerModule,
     ConfigModule,
     VerifyModule,
+    FileModule,
     DatabaseModule,
     WebsocketModule,
     RedisModule.forRoot({
diff --git a/newback/src/utils/decorators.ts b/newback/src/modules/app/decorators/catch.ws.errors.ts
similarity index 67%
rename from newback/src/utils/decorators.ts
rename to newback/src/modules/app/decorators/catch.ws.errors.ts
index 01a23ae42..01a06d53b 100644
--- a/newback/src/utils/decorators.ts
+++ b/newback/src/modules/app/decorators/catch.ws.errors.ts
@@ -1,32 +1,9 @@
-import type {ExecutionContext,
-  Logger} from "@nestjs/common";
+import type {Logger} from "@nestjs/common";
 import {
-  createParamDecorator,
   UnauthorizedException,
 } from "@nestjs/common";
-import {WebSocket} from "ws";
-import type {WebSocketContextData} from "@/data/types/internal";
-import type {OnGatewayConnection} from "@nestjs/websockets";
 import {WS_SESSION_EXPIRED_CODE} from "@/data/types/frontend";
-
-
-export const WebsocketContext = createParamDecorator(
-  (data: unknown, ctx: ExecutionContext) => {
-    const handler = ctx.getArgs().find((a) => a instanceof WebSocket);
-    if (!handler.context) {
-      handler.context = {userId: Date.now()} as WebSocketContextData;
-    }
-    return handler.context;
-  },
-);
-
-export const WsContext = createParamDecorator(
-  (data: unknown, ctx: ExecutionContext) => {
-    const handler = ctx.getArgs().find((a) => a instanceof WebSocket);
-    return handler.context as WebSocketContextData;
-  },
-);
-
+import type {OnGatewayConnection} from "@nestjs/websockets";
 
 export function processErrors(e, socket, logger: Logger) {
   logger.error(`Ws error ${e.message}`, e.stack, "ws");
diff --git a/newback/src/modules/app/decorators/user.id.decorator.ts b/newback/src/modules/app/decorators/user.id.decorator.ts
new file mode 100644
index 000000000..3c373be13
--- /dev/null
+++ b/newback/src/modules/app/decorators/user.id.decorator.ts
@@ -0,0 +1,15 @@
+import type {ExecutionContext,} from "@nestjs/common";
+import {
+  createParamDecorator,
+  InternalServerErrorException,
+} from "@nestjs/common";
+
+export const UserId = createParamDecorator(
+  (data: unknown, ctx: ExecutionContext) => {
+    let userId = ctx.switchToHttp().getRequest().userId;
+    if (!userId) {
+      throw new InternalServerErrorException("Service should use auth guard");
+    }
+    return userId;
+  },
+);
diff --git a/newback/src/modules/app/decorators/ws.context.decorator.ts b/newback/src/modules/app/decorators/ws.context.decorator.ts
new file mode 100644
index 000000000..1dd9b49a6
--- /dev/null
+++ b/newback/src/modules/app/decorators/ws.context.decorator.ts
@@ -0,0 +1,16 @@
+import type {
+  ExecutionContext,
+} from "@nestjs/common";
+import {
+  createParamDecorator,
+} from "@nestjs/common";
+import {WebSocket} from "ws";
+import type {WebSocketContextData} from "@/data/types/internal";
+
+export const WsContext = createParamDecorator(
+  (data: unknown, ctx: ExecutionContext) => {
+    const handler = ctx.getArgs().find((a) => a instanceof WebSocket);
+    return handler.context as WebSocketContextData;
+  },
+);
+
diff --git a/newback/src/modules/app/guards/auth.guard.ts b/newback/src/modules/app/guards/auth.guard.ts
new file mode 100644
index 000000000..10e85fb76
--- /dev/null
+++ b/newback/src/modules/app/guards/auth.guard.ts
@@ -0,0 +1,28 @@
+import type {
+  CanActivate,
+  ExecutionContext
+} from "@nestjs/common";
+import {
+  Injectable,
+  Logger,
+} from "@nestjs/common";
+import {HttpService} from "@/modules/rest/http/http.service";
+import {SessionService} from "@/modules/rest/session/session.service";
+
+@Injectable()
+export class AuthGuard implements CanActivate {
+  constructor(
+    private readonly logger: Logger,
+    private readonly httpService: HttpService,
+    private readonly sessionService: SessionService,
+  ) {
+  }
+
+  public async canActivate(
+    context: ExecutionContext,
+  ): Promise<boolean> {
+    const request = context.switchToHttp().getRequest();
+    request.userId = this.sessionService.getUserIdBySession(request.headers['session-id']);
+    return true;
+  }
+}
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
new file mode 100644
index 000000000..617969e94
--- /dev/null
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -0,0 +1,50 @@
+import type {
+  CanActivate,
+  ExecutionContext,
+} from "@nestjs/common";
+import {
+  Injectable,
+  mixin,
+} from "@nestjs/common";
+import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+
+
+export const MessagesFromMyRoomGuard = (selector: (dto: any) => number[]) => {
+  @Injectable()
+  class OwnMessageGuardMixin implements CanActivate {
+    constructor(
+      private readonly messageRepository: MessageRepository,
+    ) {
+    }
+
+    public async canActivate(
+      context: ExecutionContext,
+    ): Promise<boolean> {
+      const ws = context.switchToWs();
+      await this.messageRepository.getMessagesById(selector(ws));
+      const request = context.switchToHttp().getRequest();
+      // Request.userId = this.sessionService.getUserIdBySession(request.headers["session-id"]);
+      return true;
+    }
+  }
+  return mixin(OwnMessageGuardMixin);
+};
+
+
+@Injectable()
+export class OwnMessageGuardMixin implements CanActivate {
+  constructor(
+    private readonly messageRepository: MessageRepository,
+  ) {
+  }
+
+  public async canActivate(
+    context: ExecutionContext,
+  ): Promise<boolean> {
+    const ws = context.switchToWs();
+    await this.messageRepository.getMessagesById([3]);
+    const request = context.switchToHttp().getRequest();
+    // Request.userId = this.sessionService.getUserIdBySession(request.headers["session-id"]);
+    return true;
+  }
+}
diff --git a/newback/src/modules/rest/database/repository/messages.repository.ts b/newback/src/modules/rest/database/repository/messages.repository.ts
index 167e976ff..131a86083 100644
--- a/newback/src/modules/rest/database/repository/messages.repository.ts
+++ b/newback/src/modules/rest/database/repository/messages.repository.ts
@@ -1,10 +1,22 @@
 import {Injectable} from "@nestjs/common";
 import {InjectModel} from "@nestjs/sequelize";
-import {Op} from "sequelize";
+import type {
+  Transaction,
+} from "sequelize";
+import {
+  Op,
+} from "sequelize";
 import {MessageModel} from "@/data/model/message.model";
-import {MessageStatus} from "@/data/types/frontend";
+import type {
+  ImageType,
+} from "@/data/types/frontend";
+import {
+  Gender,
+  MessageStatus,
+} from "@/data/types/frontend";
 import {ImageModel} from "@/data/model/image.model";
 import {MessageMentionModel} from "@/data/model/message.mention.model";
+import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 
 
 @Injectable()
@@ -12,6 +24,7 @@ export class MessageRepository {
   public constructor(
     @InjectModel(MessageModel) private readonly messageModel: typeof MessageModel,
     @InjectModel(ImageModel) private readonly imageModel: typeof ImageModel,
+    @InjectModel(UploadedFileModel) private readonly uploadedFileModel: typeof UploadedFileModel,
     @InjectModel(MessageMentionModel) private readonly messageMentionModel: typeof MessageMentionModel,
   ) {
   }
@@ -62,6 +75,53 @@ export class MessageRepository {
     });
   }
 
+   public async getMessagesById(messageIds: number[], ...attributes: (keyof MessageModel)[]): Promise<MessageModel[]> {
+    return this.messageModel.findAll({
+      where: {
+        id: {
+          [Op.in]: messageIds,
+        },
+      },
+      attributes,
+    });
+  }
+
+  public async saveUploadFile(data: {
+    type: ImageType;
+    symbol: string;
+    userId: number;
+    file: string;
+  }, transaction: Transaction): Promise<number> {
+    const result = await this.uploadedFileModel.create({
+      userId: data.userId,
+      symbol: data.symbol,
+      type: data.type,
+      file: data.file,
+    }, {
+      transaction,
+    });
+    return result.id;
+  }
+
+  public async getUploadedFiles(
+    ids: number[],
+    userId: number,
+    transaction: Transaction
+  ): Promise<UploadedFileModel[]> {
+    if (!ids.length) {
+      return [];
+    }
+    return this.uploadedFileModel.findAll({
+      where: {
+        userId,
+        id: {
+          [Op.in]: ids,
+        },
+      },
+      transaction,
+    });
+  }
+
   public async getTagsByMessagesId(messageIds: number[]): Promise<MessageMentionModel[]> {
     return this.messageMentionModel.findAll({
       where: {
diff --git a/newback/src/modules/rest/database/repository/room.repository.ts b/newback/src/modules/rest/database/repository/room.repository.ts
index 3afe37b2d..27d05cde4 100644
--- a/newback/src/modules/rest/database/repository/room.repository.ts
+++ b/newback/src/modules/rest/database/repository/room.repository.ts
@@ -30,8 +30,10 @@ export class RoomRepository {
       roomId,
       userId,
       notifications: false,
-    }, {transaction,
-      raw: true});
+    }, {
+      transaction,
+      raw: true,
+    });
   }
 
   public async getAllChannels(ids: number[]): Promise<ChannelModel[]> {
@@ -75,6 +77,15 @@ export class RoomRepository {
     });
   }
 
+  public async getUserRooms(userId: number): Promise<Pick<RoomUsersModel, "roomId" | "userId">[]> {
+    return this.roomUsersModel.findAll({
+      where: {
+        userId,
+      },
+      raw: true,
+      attributes: ["userId", "roomId"],
+    });
+  }
 
   public async getRoomsForUser(userId: number): Promise<GetRoomsForUser[]> {
     // We should select roomModel instead of romUserModel, otherwise it will ignore deletedAt from roomModel
diff --git a/newback/src/modules/rest/password/password.service.ts b/newback/src/modules/rest/password/password.service.ts
index 494075ac1..615892761 100644
--- a/newback/src/modules/rest/password/password.service.ts
+++ b/newback/src/modules/rest/password/password.service.ts
@@ -6,8 +6,6 @@ import {
 
 @Injectable()
 export class PasswordService {
-  public constructor() {
-  }
 
   public async createPassword(password: string): Promise<string> {
     return hash(password, 10);
diff --git a/newback/src/modules/rest/pubsub/pubsub.service.ts b/newback/src/modules/rest/pubsub/pubsub.service.ts
index 0117492e3..07a246d6e 100644
--- a/newback/src/modules/rest/pubsub/pubsub.service.ts
+++ b/newback/src/modules/rest/pubsub/pubsub.service.ts
@@ -6,7 +6,6 @@ import {
 import type {WebSocketContextData} from "@/data/types/internal";
 import type {PubSubMessage} from "@/modules/api/websocket/interfaces/pubsub";
 import type {HandlerName} from "@/data/types/frontend";
-import {DefaultWsInMessage} from "@/data/types/frontend";
 
 
 interface HandlerType {
@@ -69,8 +68,17 @@ export class PubsubService {
     });
   }
 
-  public unsubscribe(context: WebSocketContextData, ...channel: string[]) {
-    channel.forEach((channel) => {
+  public unsubscribeAll(context: WebSocketContextData) {
+    Object.values(receivers).forEach(contexts => {
+      const index = contexts.findIndex((c) => c.ctx = context);
+      if (index >= 0) {
+        contexts.splice(index, 1);
+      }
+    });
+  }
+
+  public unsubscribe(context: WebSocketContextData, ...channels: [string, ...string[]]) {
+    channels.forEach((channel) => {
       if (receivers[channel]) {
         const index = receivers[channel].findIndex((c) => c.ctx = context);
         if (index >= 0) {
diff --git a/newback/src/modules/rest/session/session.service.ts b/newback/src/modules/rest/session/session.service.ts
index 29ce950ee..d029bc07c 100644
--- a/newback/src/modules/rest/session/session.service.ts
+++ b/newback/src/modules/rest/session/session.service.ts
@@ -26,7 +26,17 @@ export class SessionService {
     return session;
   }
 
-  public async getUserById(sessionId: string): Promise<UserModel> {
+  public async getUserBySessionId(sessionId: string): Promise<UserModel> {
+    const userId = await this.getUserIdBySession(sessionId);
+    const user = await this.userRepository.getById(userId, ["userProfile", "userAuth", "userSettings"]);
+    if (!user) {
+      await this.redisService.removeSession(sessionId);
+      throw new InternalServerErrorException("Database has been cleared this user is removed");
+    }
+    return user;
+  }
+
+  public async getUserIdBySession(sessionId: string): Promise<number> {
     if (!sessionId) {
       throw new UnauthorizedException("sessionId is missing");
     }
@@ -34,11 +44,6 @@ export class SessionService {
     if (!userId) {
       throw new UnauthorizedException("Session id expired");
     }
-    const user = await this.userRepository.getById(userId, ["userProfile", "userAuth", "userSettings"]);
-    if (!user) {
-      await this.redisService.removeSession(sessionId);
-      throw new InternalServerErrorException("Database has been cleared this user is removed");
-    }
-    return user;
+    return userId;
   }
 }
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index c0e23cffa..30dbac097 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -22,12 +22,12 @@ import {
   WebSocket,
   WebSocketServer,
 } from "ws";
-import {processErrors} from "@/utils/decorators";
 import type {DefaultWsInMessage,
   DefaultWsOutMessage} from "@/data/types/frontend";
 import {
   GrowlMessage,
 } from "@/data/types/frontend";
+import {processErrors} from "@/modules/app/decorators/catch.ws.errors";
 
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
@@ -54,9 +54,9 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
             return;
           }
           if (message.length > 2000) {
-            this.logger.verbose(`WS:OUT ${message}`, "ws");
+            this.logger.verbose(message, `ws:out:${(ws as any)?.context?.id}`);
           } else {
-            this.logger.debug(`WS:OUT ${message}`, "ws");
+            this.logger.debug(message, `ws:out:${(ws as any)?.context?.id}`);
           }
           oldSend(message);
         },
@@ -113,7 +113,11 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
       let parsed: DefaultWsOutMessage<any>;
       try {
         const s = String(data);
-        this.logger.debug(`WS:IN ${s}`, "ws");
+        if (s.length > 2000) {
+          this.logger.verbose(s, `ws:in:${(client as any)?.context?.id}`);
+        } else {
+          this.logger.debug(s, `ws:in:${(client as any)?.context?.id}`);
+        }
         if (client.readyState !== client.OPEN) {
           throw new BadRequestException("Cannot process new messages, while opening a connection");
         }
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 8dad0190d..4938feb24 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -701,6 +701,13 @@
   dependencies:
     uuid "8.3.2"
 
+"@nestjs/serve-static@^2.2.2":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@nestjs/serve-static/-/serve-static-2.2.2.tgz#8e9dc2fc6c042ddac5133b957d6bc25d9f8fa225"
+  integrity sha512-3Mr+Q/npS3N7iGoF3Wd6Lj9QcjMGxbNrSqupi5cviM0IKrZ1BHl5qekW95rWYNATAVqoTmjGROAq+nKKpuUagQ==
+  dependencies:
+    path-to-regexp "0.1.7"
+
 "@nestjs/swagger@^5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@nestjs/swagger/-/swagger-5.2.1.tgz#0fbd5dbc84aeebc2912009cce1309d4bebe9a52c"
@@ -918,7 +925,7 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@^4.17.13":
+"@types/express@*", "@types/express@^4.17.13":
   version "4.17.13"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
   integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
@@ -987,6 +994,13 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
+"@types/multer@^1.4.7":
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.7.tgz#89cf03547c28c7bbcc726f029e2a76a7232cc79e"
+  integrity sha512-/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==
+  dependencies:
+    "@types/express" "*"
+
 "@types/node-fetch@^2.6.1":
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
@@ -1050,6 +1064,13 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
+"@types/sharp@^0.30.2":
+  version "0.30.2"
+  resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.30.2.tgz#df5ff34140b3bad165482e6f3d26b08e42a0503a"
+  integrity sha512-uLCBwjDg/BTcQit0dpNGvkIjvH3wsb8zpaJePCjvONBBSfaKHoxXBIuq1MT8DMQEfk2fKYnpC9QExCgFhkGkMQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
@@ -1517,6 +1538,11 @@ append-field@^1.0.0:
   resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
   integrity sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY=
 
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
 "aproba@^1.0.3 || ^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
@@ -1530,6 +1556,14 @@ are-we-there-yet@^2.0.0:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -1718,7 +1752,7 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bl@^4.1.0:
+bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -1949,6 +1983,11 @@ chokidar@3.5.3, chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -2070,16 +2109,32 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@~1.1.4:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-string@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa"
+  integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
 color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
+color@^4.2.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
+  dependencies:
+    color-convert "^2.0.1"
+    color-string "^1.9.0"
+
 colors@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@@ -2127,7 +2182,7 @@ consola@^2.15.0:
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
-console-control-strings@^1.0.0, console-control-strings@^1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
@@ -2321,6 +2376,13 @@ decimal.js@^10.2.1:
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
   integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
+decompress-response@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
+  dependencies:
+    mimic-response "^3.1.0"
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -2331,6 +2393,11 @@ deep-diff@^1.0.2:
   resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-1.0.2.tgz#afd3d1f749115be965e89c63edc7abb1506b9c26"
   integrity sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==
 
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -2400,7 +2467,7 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-detect-libc@^2.0.0:
+detect-libc@^2.0.0, detect-libc@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
   integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
@@ -2604,7 +2671,7 @@ encoding-japanese@1.0.30:
   resolved "https://registry.yarnpkg.com/encoding-japanese/-/encoding-japanese-1.0.30.tgz#537c4d62881767925d601acb4c79fb14db81703a"
   integrity sha512-bd/DFLAoJetvv7ar/KIpE3CNO8wEuyrt9Xuw6nSMiZ+Vrz/Q21BPsMHvARL2Wz6IKHKXgb+DWZqtRg1vql9cBg==
 
-end-of-stream@^1.1.0:
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -3026,6 +3093,11 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
+expand-template@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
+  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
+
 expect@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74"
@@ -3285,6 +3357,11 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs-extra@10.0.1, fs-extra@^10.0.0:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
@@ -3358,6 +3435,20 @@ gauge@^3.0.0:
     strip-ansi "^6.0.1"
     wide-align "^1.1.2"
 
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
 gaxios@^4.0.0:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22"
@@ -3440,6 +3531,11 @@ get-uri@3:
     fs-extra "^8.1.0"
     ftp "^0.3.10"
 
+github-from-package@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
+  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
+
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -3582,7 +3678,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.1:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
@@ -3784,6 +3880,11 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+ini@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
 inline-css@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/inline-css/-/inline-css-3.0.0.tgz#f8ddcffab5693ab15c7dd10b05d35aebda90f8c4"
@@ -3880,6 +3981,11 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -5060,6 +5166,11 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-response@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
 minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -5072,7 +5183,7 @@ minimatch@^3.0.4, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@1.2.6, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@1.2.6, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
@@ -5092,6 +5203,11 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
+mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
 mkdirp@^0.5.4:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -5176,6 +5292,11 @@ named-placeholders@^1.1.2:
   dependencies:
     lru-cache "^4.1.3"
 
+napi-build-utils@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
+  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -5206,11 +5327,23 @@ netmask@^2.0.1:
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
   integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
 
+node-abi@^3.3.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.8.0.tgz#679957dc8e7aa47b0a02589dbfde4f77b29ccb32"
+  integrity sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==
+  dependencies:
+    semver "^7.3.5"
+
 node-addon-api@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
+node-addon-api@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
+  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
+
 node-db-migration@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/node-db-migration/-/node-db-migration-1.4.0.tgz#5616cca04f315fcb15121d60616233adc86db3c6"
@@ -5286,6 +5419,16 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
+npmlog@^4.0.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
 npmlog@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
@@ -5313,7 +5456,7 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-object-assign@^4, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -5649,6 +5792,25 @@ polytype@^0.9.4:
   resolved "https://registry.yarnpkg.com/polytype/-/polytype-0.9.4.tgz#38082d6e345670ca1963a0ef58f72d564290fae1"
   integrity sha512-pkS84YcAEPHkIWEYKd9/QDmYPIhlmQeOUYwEO7IQRGEvlIkNIKCs6r4zhFSdTCNAEiCnfCgINHQNDfShlS2snw==
 
+prebuild-install@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870"
+  integrity sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg==
+  dependencies:
+    detect-libc "^2.0.0"
+    expand-template "^2.0.3"
+    github-from-package "0.0.0"
+    minimist "^1.2.3"
+    mkdirp-classic "^0.5.3"
+    napi-build-utils "^1.0.1"
+    node-abi "^3.3.0"
+    npmlog "^4.0.1"
+    pump "^3.0.0"
+    rc "^1.2.7"
+    simple-get "^4.0.0"
+    tar-fs "^2.0.0"
+    tunnel-agent "^0.6.0"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -5931,6 +6093,16 @@ raw-body@2.5.1, raw-body@^2.2.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 react-is@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
@@ -5946,7 +6118,7 @@ readable-stream@1.1.x:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.2.2:
+readable-stream@^2.0.6, readable-stream@^2.2.2:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -6235,7 +6407,7 @@ serve-static@1.14.2:
     parseurl "~1.3.3"
     send "0.17.2"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -6245,6 +6417,20 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
+sharp@^0.30.3:
+  version "0.30.3"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.3.tgz#315a1817423a4d1cde5119a21c99c234a7a6fb37"
+  integrity sha512-rjpfJFK58ZOFSG8sxYSo3/JQb4ej095HjXp9X7gVu7gEn1aqSG8TCW29h/Rr31+PXrFADo1H/vKfw0uhMQWFtg==
+  dependencies:
+    color "^4.2.1"
+    detect-libc "^2.0.1"
+    node-addon-api "^4.3.0"
+    prebuild-install "^7.0.1"
+    semver "^7.3.5"
+    simple-get "^4.0.1"
+    tar-fs "^2.1.1"
+    tunnel-agent "^0.6.0"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -6280,6 +6466,27 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+simple-concat@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
+  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
+
+simple-get@^4.0.0, simple-get@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
+  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
+  dependencies:
+    decompress-response "^6.0.0"
+    once "^1.3.1"
+    simple-concat "^1.0.0"
+
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  dependencies:
+    is-arrayish "^0.3.1"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -6526,6 +6733,11 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
 style-data@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/style-data/-/style-data-1.4.8.tgz#820d946812e4e8cdd3875a25cb839052e9059b92"
@@ -6629,6 +6841,27 @@ tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
+tar-fs@^2.0.0, tar-fs@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.1.4"
+
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
@@ -6860,6 +7093,13 @@ ttypescript@^1.5.10, ttypescript@^1.5.13:
   dependencies:
     resolve ">=1.9.0"
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -7190,7 +7430,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.2:
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==

From 55359e9b41af81eebb6e96af13496992ed0dda3c Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 17 Apr 2022 19:49:12 +0300
Subject: [PATCH 071/221] Optimized preview work

---
 common/dto.ts                                 |   2 +-
 .../ts/message_handlers/WsMessageHandler.ts   |  34 +++---
 frontend/src/ts/utils/htmlApi.ts              |   7 +-
 newback/src/modules/api/file/file.service.ts  |   2 +-
 .../modules/api/file/image.service.spec.ts    |  50 +++++++++
 newback/src/modules/api/file/image.service.ts | 100 +++++++++++-------
 .../api/websocket/websocket.gateway.ts        |   2 +-
 7 files changed, 139 insertions(+), 58 deletions(-)
 create mode 100644 newback/src/modules/api/file/image.service.spec.ts

diff --git a/common/dto.ts b/common/dto.ts
index dc8127354..444075053 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -137,7 +137,7 @@ export interface SaveFileResponse {
 
 export interface SaveFileRequest {
   file: Blob;
-  name: string;
+  name?: string;
   symbol: string;
   type: ImageType;
 }
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 93a70273f..11d7d5d54 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -20,18 +20,10 @@ import type {Logger} from "lines-logger";
 import type {
   GiphyDto,
   MessageModelDto,
-  SaveFileResponse,
-
   SaveFileRequest,
+  SaveFileResponse,
 } from "@/ts/types/dto";
-import {
-  ImageType,
-  MessageStatus,
-} from "@/ts/types/backend";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
-import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
-import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {
   DeleteMessage,
   EditMessage,
@@ -43,6 +35,14 @@ import type {
   SetMessageStatusWsInMessage,
   SyncHistoryWsInMessage,
 } from "@/ts/types/backend";
+import {
+  ImageType,
+  MessageStatus,
+} from "@/ts/types/backend";
+import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type {DefaultStore} from "@/ts/classes/DefaultStore";
+
+import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import {savedFiles} from "@/ts/utils/htmlApi";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import {
@@ -242,7 +242,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       roomId,
     };
     this.store.setUploadProgress(sup);
-    let responses: SaveFileResponse[] = [];
+    const responses: SaveFileResponse[] = [];
     try {
       let total = 0;
       for (let i = 0; i < files.length; i++) {
@@ -425,12 +425,16 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
           };
           uploadFiles.push(items);
           if (file.preview) {
-            uploadFiles.push({
-              file: savedFiles[file.preview],
-              name: savedFiles[file.url!].name!,
-              type: file.type,
+            const previewFile = savedFiles[file.preview];
+            const payload: SaveFileRequest = {
+              file: previewFile,
+              type: ImageType.PREVIEW,
               symbol: key,
-            });
+            };
+            if (previewFile.name) {
+              payload.name = previewFile.name;
+            }
+            uploadFiles.push(payload);
           }
         });
       if (uploadFiles.length > 0) {
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index 8a21b939b..d1b33e0df 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -525,7 +525,12 @@ export function pasteBlobVideoToTextArea(file: Blob, textArea: HTMLElement, vide
             } else {
               const url = URL.createObjectURL(blob);
               savedFiles[url] = blob;
-              blob.name = ".jpg";
+              if (file.name) {
+                blob.name = `${file.name}.jpg`;
+              } else {
+                blob.name = '.jpg';
+              }
+
               img.src = url;
             }
             img.className = PASTED_IMG_CLASS;
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index cd4af1a7e..d01781f06 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -30,7 +30,7 @@ export class FileService {
     file: Express.Multer.File,
     symbol: string,
     type: ImageType,
-    name: string
+    name?: string
   ): Promise<SaveFileResponse> {
     return this.sequelize.transaction(async(transaction) => {
       const fileSaveResponse: FileSaveResponse = await this.imageService.saveFile(userId, file, symbol, type, name);
diff --git a/newback/src/modules/api/file/image.service.spec.ts b/newback/src/modules/api/file/image.service.spec.ts
new file mode 100644
index 000000000..49d0a549a
--- /dev/null
+++ b/newback/src/modules/api/file/image.service.spec.ts
@@ -0,0 +1,50 @@
+import {Test} from "@nestjs/testing";
+import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {ConsoleLogger} from "@nestjs/common";
+import {ImageService} from "@/modules/api/file/image.service";
+import {PasswordService} from "@/modules/rest/password/password.service";
+
+describe("ImageService", () => {
+  let imgService: ImageService;
+  let passwordService: PasswordService;
+  let moduleFixture;
+  beforeAll(
+    async() => {
+      moduleFixture = await Test.createTestingModule({
+        imports: [LoggerModule],
+        providers: [
+          ImageService,
+          PasswordService,
+        ],
+      }).setLogger(new ConsoleLogger()).
+        compile();
+      imgService = moduleFixture.get(ImageService);
+      passwordService = moduleFixture.get(PasswordService);
+    }
+  );
+  afterAll(async() => {
+    await moduleFixture.close();
+  });
+
+
+  describe("getName", () => {
+    it("remove old ext", async() => {
+      passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
+      await expect(imgService.getName("name.jpeg", "webp", "jpeg")).
+        resolves.
+        toEqual("test_name.webp");
+    });
+    it("keep origin extension", async() => {
+      passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
+      await expect(imgService.getName("name.jpeg", "", "")).
+        resolves.
+        toEqual("test_name.jpeg");
+    });
+    it("keep origin esxtension", async() => {
+      passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
+      await expect(imgService.getName("name.jpeg", "jpeg", "jpeg")).
+        resolves.
+        toEqual("test_name.jpeg");
+    });
+  });
+});
diff --git a/newback/src/modules/api/file/image.service.ts b/newback/src/modules/api/file/image.service.ts
index 069415015..85b7bb03e 100644
--- a/newback/src/modules/api/file/image.service.ts
+++ b/newback/src/modules/api/file/image.service.ts
@@ -8,9 +8,9 @@ import {
 import type {Metadata} from "sharp";
 import * as sharp from "sharp";
 import {PasswordService} from "@/modules/rest/password/password.service";
-import {join} from "path";
-import {writeFile} from "fs/promises";
-import {FileSaveResponse} from '@/data/types/internal';
+import {join, sep} from "path";
+import {writeFile, stat, unlink} from "fs/promises";
+import type {FileSaveResponse} from "@/data/types/internal";
 
 @Injectable()
 export class ImageService {
@@ -23,16 +23,27 @@ export class ImageService {
 
   }
 
-  private async getName(origin: string, extension: string = "") {
-    let namUrl = origin;
-    if (namUrl?.endsWith(`.${extension}`)) { // exclude blah.jpeg.jpeg
-      namUrl = namUrl.substring(0, namUrl.length - extension.length -1)
+  public async getName(origin: string, newExtension: string) {
+    let ext = "";
+    let newName = origin || "";
+    if (newName) {
+      const res = (/\.([0-9a-z]+)$/i).exec(newName);
+      if (res) {
+        ext = res[1];
+        newName = newName.substring(0, newName.length - res[0].length);
+      }
     }
-    if (namUrl) {
-      namUrl = origin.replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, 20);
+    if (newName) {
+      newName = newName.replace(/[^0-9a-zA-Z-_\.]+/g, "-").substring(0, 20);
     }
-    let id = await this.passwordService.generateRandomString(8);
-    return `${id}_${namUrl}${extension ?? `.${extension}`}`;
+    const id = await this.passwordService.generateRandomString(8);
+    if (newExtension) {
+      return `${id}_${newName}.${newExtension}`;
+    }
+    if (ext) {
+      return `${id}_${newName}.${ext}`;
+    }
+    return `${id}_${newName}`;
   }
 
   public async saveFile(
@@ -40,43 +51,54 @@ export class ImageService {
     file: Express.Multer.File,
     symbol: string,
     type: ImageType,
-    name: string
+    name?: string
   ): Promise<FileSaveResponse> {
     let originFileName = null;
     let previewFileName = null;
+    let ext = "";
     if (type === ImageType.IMAGE) {
-      let saveRes = await this.saveImageFiles(file, name);
-      originFileName = saveRes.originFileName;
-      previewFileName = saveRes.previewFileName;
-    } else {
-      originFileName = await this.getName(name);
-      await writeFile(`${this.savePath}${originFileName}`, file.buffer, "binary");
+      const origin = await sharp(file.buffer);
+      const meta: Metadata = await origin.metadata();
+      ext = meta.format;
+      previewFileName = await this.savePreviewIfNeeded(meta, name, origin, file);
     }
+    originFileName = await this.getName(name, ext);
+    await writeFile(join(this.savePath, originFileName), file.buffer, "binary");
     this.logger.log(`Saved userId ${userId} ${type} to ${originFileName} ${previewFileName}`, "file");
-    return {originFileName, previewFileName};
-  }
-
-  private async saveImageFiles(
-    file: Express.Multer.File,
-    name: string,
-  ): Promise<FileSaveResponse> {
-    const origin = await sharp(file.buffer);
-    const meta: Metadata = await origin.metadata();
-    const proportion = Math.max(meta.width / 600, meta.height / 400); // Max 400x600
-    let previewFileName = null;
-    if (proportion > 1 || meta.format !== "webp") {
-      previewFileName = await this.getName(name, "webp");
-      await origin.
-        clone().
-        resize(Math.round(meta.width / proportion)).
-        webp().
-        toFile(`${this.savePath}${previewFileName}`);
-    }
-    const originFileName = await this.getName(name, meta.format);
-    await origin.toFile(`${this.savePath}${originFileName}`);
     return {
       originFileName,
       previewFileName,
     };
   }
+
+
+  private async savePreviewIfNeeded(meta: sharp.Metadata, name: string, origin: sharp.Sharp, file: Express.Multer.File) {
+    const proportion = Math.max(meta.width / 600, meta.height / 400); // Max 400x600
+    // If webp 30% bigger, dgaf
+    if (proportion < 1.3 && meta.format === "webp") {
+      return null;
+    }
+    const previewFileName = await this.getName(name, meta.format === "gif" ? "gif" : "webp");
+    let cloned = origin.clone();
+    if (proportion > 1) {
+      cloned = cloned.resize(Math.round(meta.width / proportion));
+    }
+    const webpPath = join(this.savePath, previewFileName);
+    if (meta.format === "gif") {
+      if (proportion < 1) {
+        return null;
+      }
+      await cloned.toFile(webpPath);
+    } else {
+      await cloned.webp().toFile(webpPath);
+    }
+
+    const {size} = await stat(webpPath);
+    // Don't waste space, if the difference is small, revert
+    if (size > file.size / 1.5) {
+      await unlink(webpPath);
+      return null;
+    }
+    return previewFileName;
+  }
 }
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index eacdfa569..0586c53ee 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -36,7 +36,7 @@ import {WsContext} from "@/modules/app/decorators/ws.context.decorator";
 import {CatchWsErrors} from "@/modules/app/decorators/catch.ws.errors";
 import {
   MessagesFromMyRoomGuard,
-  OwnMessageGuardMixin
+  OwnMessageGuardMixin,
 } from "@/modules/app/guards/own.message.guard";
 
 @WebSocketGateway({

From 7dd66787115fb033181511c808dc77e92b6a2779 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 14:08:51 +0300
Subject: [PATCH 072/221] Added print message

---
 newback/src/data/types/internal.ts            |  8 +-
 newback/src/modules/api/auth/auth.service.ts  |  7 +-
 .../src/modules/api/file/file.controller.ts   |  6 +-
 .../src/modules/api/verify/verify.service.ts  |  7 +-
 .../modules/api/websocket/message.service.ts  | 74 ++++++++++++++-----
 .../transformers/inner.transformer.ts         | 23 ++++++
 .../websocket/transformers/ws.transformer.ts  | 55 ++++++++++++++
 .../api/websocket/websocket.gateway.ts        | 43 ++++++++---
 .../modules/api/websocket/websocket.module.ts | 56 +++++---------
 .../modules/app/guards/own.message.guard.ts   | 39 ++++------
 .../src/modules/app/guards/own.room.guard.ts  | 39 ++++++++++
 .../repository/messages.repository.ts         | 31 +++++---
 .../repository/verification.repository.ts     | 12 +--
 .../src/modules/rest/pubsub/pubsub.service.ts | 10 ++-
 newback/src/utils/helpers.ts                  | 13 ++++
 15 files changed, 308 insertions(+), 115 deletions(-)
 create mode 100644 newback/src/modules/api/websocket/transformers/inner.transformer.ts
 create mode 100644 newback/src/modules/app/guards/own.room.guard.ts

diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 0eca75ac5..a9a8f83fb 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,4 +1,4 @@
-import type {DefaultWsInMessage} from "@/data/types/frontend";
+import type {DefaultWsInMessage, MessageStatus} from "@/data/types/frontend";
 
 export interface WebSocketContextData {
   userId: number;
@@ -14,3 +14,9 @@ export interface FileSaveResponse {
   originFileName: string;
   previewFileName: string;
 }
+
+// https://stackoverflow.com/a/49725198/3872976
+export type RequireAtLeastOne<T, Keys extends keyof T = keyof T> =
+    {
+      [K in Keys]-?: Partial<Pick<T, Exclude<Keys, K>>> & Required<Pick<T, K>>
+    }[Keys] & Pick<T, Exclude<keyof T, Keys>>;
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 6c851195a..532e29731 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -160,7 +160,12 @@ export class AuthService {
       await this.sequelize.transaction(async(t) => {
         const token = await this.passwordService.generateRandomString(32);
         this.logger.log(`Generated token for userId ${userId}: ${token}`, "auth.service");
-        await this.verificationRepository.createVerification(email, userId, token, VerificationType.REGISTER, t);
+        await this.verificationRepository.createVerification({
+          email,
+          userId,
+          token,
+          type: VerificationType.REGISTER,
+        }, t);
         const ipInfo = await this.ipCacheService.getIpString(ip);
         await this.emailService.sendSignUpEmail(username, userId, email, token, ip, ipInfo);
       });
diff --git a/newback/src/modules/api/file/file.controller.ts b/newback/src/modules/api/file/file.controller.ts
index 506d700aa..6fe4c02ba 100644
--- a/newback/src/modules/api/file/file.controller.ts
+++ b/newback/src/modules/api/file/file.controller.ts
@@ -23,7 +23,7 @@ import {
 })
 export class FileController {
   public constructor(
-    private readonly fileService: FileService,
+    // private readonly fileService: FileService,
   ) {
   }
 
@@ -35,6 +35,8 @@ export class FileController {
       @Body() body: SaveFileRequest,
       @UserId() userId: number,
   ): Promise<SaveFileResponse> {
-    return this.fileService.saveFile(userId, file, body.symbol, body.type, body.name);
+    console.log('asd');
+    return {} as any;
+    // return this.fileService.saveFile(userId, file, body.symbol, body.type, body.name);
   }
 }
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index c0ca79d5c..f79ade586 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -71,7 +71,12 @@ export class VerifyService {
       }
       const token: string = await this.passwordService.generateRandomString(32);
       this.logger.log(`Generated token='${token}' to restore user email='${email}'`);
-      await this.verificationRepository.createVerification(email, userId, token, VerificationType.PASSWORD, t);
+      await this.verificationRepository.createVerification({
+        email,
+        userId,
+        token,
+        type: VerificationType.PASSWORD,
+      }, t);
       const ipInfo = await this.ipCacheService.getIpString(ip);
       await this.emailService.sendRestorePasswordEmail(username, userId, email, token, ip, ipInfo);
     });
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 9c57c05cc..b3b27d09d 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -4,16 +4,15 @@ import {
 } from "@nestjs/common";
 import {UserRepository} from "@/modules/rest/database/repository/user.repository";
 import {PasswordService} from "@/modules/rest/password/password.service";
-import type {ShowITypeWsInMessage,
+import type {
+  GiphyDto,
+  PrintMessageWsInMessage,
+  PrintMessageWsOutMessage,
+  ShowITypeWsInMessage,
   ShowITypeWsOutMessage,
   SyncHistoryWsOutMessage,
-  SyncHistoryWsInMessage,
-
-  PrintMessageWsOutMessage} from "@/data/types/frontend";
-import {
-  ImageType,
-  MessageStatus,
 } from "@/data/types/frontend";
+import {MessageStatus} from "@/data/types/frontend";
 import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
 import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
 import {SessionService} from "@/modules/rest/session/session.service";
@@ -21,9 +20,18 @@ import {RedisService} from "@/modules/rest/redis/redis.service";
 import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 import type {WebSocketContextData} from "@/data/types/internal";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
-import {getSyncMessage} from "@/modules/api/websocket/transformers/ws.transformer";
+import {
+  getSyncMessage,
+  transformPrintMessage
+} from "@/modules/api/websocket/transformers/ws.transformer";
 import {Sequelize} from "sequelize-typescript";
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
+import type {MessageMentionModel} from "@/data/model/message.mention.model";
+import type {ImageModel} from "@/data/model/image.model";
+import {groupUploadedFileToImages} from "@/modules/api/websocket/transformers/inner.transformer";
+import {getMaxSymbol} from '@/utils/helpers';
+
+
 
 
 @Injectable()
@@ -78,10 +86,15 @@ export class MessageService {
     let readmesageIds = [];
     if (data.receivedMessageIds) {
       const ids = [...data.receivedMessageIds, ...data.onServerMessageIds];
-      readmesageIds = await this.messageRepository.getMessagesByIdsAndStatus(data.roomIds, ids, MessageStatus.READ);
+      readmesageIds = await this.messageRepository.getMessagesByIdsAndStatus(
+        data.roomIds,
+        ids,
+        MessageStatus.READ
+      );
     }
 
-    const messageIdsWithSymbol: number[] = messages.filter((m) => m.symbol).map((m) => m.id);
+    const messageIdsWithSymbol: number[] = messages.filter((m) => m.symbol).
+      map((m) => m.id);
     const images = await this.messageRepository.getImagesByMessagesId(messageIdsWithSymbol);
     const mentions = await this.messageRepository.getTagsByMessagesId(messageIdsWithSymbol);
 
@@ -90,16 +103,41 @@ export class MessageService {
 
   public async printMessage(data: PrintMessageWsOutMessage, context: WebSocketContextData) {
     return this.sequelize.transaction(async(transaction) => {
-      const files: UploadedFileModel[] = await this.messageRepository.getUploadedFiles(data.files, context.userId, transaction);
-      let symbol: number|null = Math.max(
-        0,
-        ...files.map((f) => f.symbol.charCodeAt(0)),
-        ...Object.keys(data.tags).map((k) => k.charCodeAt(0)),
-        ...data.giphies.map((g) => g.symbol.charCodeAt(0))
+      const files: UploadedFileModel[] = await this.messageRepository.getUploadedFiles(
+        data.files,
+        context.userId,
+        transaction
       );
-      if (symbol === 0) {
-        symbol = null;
+      const symbol = getMaxSymbol(files, data.tags, data.giphies);
+      const time = Date.now() - data.timeDiff;
+      const messageId = await this.messageRepository.createMessage({
+        roomId: data.roomId,
+        time,
+        messageStatus: MessageStatus.ON_SERVER,
+        senderId: context.userId,
+        symbol,
+        parentMessageId: data.parentMessage,
+        content: data.content,
+      }, transaction);
+      let tagsData: Partial<MessageMentionModel>[] = [];
+      if (data.tags && Object.keys(data.tags).length) {
+        tagsData = Object.entries(data.tags).map(([symbol, userId]) => ({
+          messageId,
+          userId,
+          symbol,
+        }));
+        await this.messageRepository.createMessageMentions(tagsData, transaction);
+      }
+      let resImages: Record<string, Partial<ImageModel>> = {};
+      if (files.length) {
+        const images: Partial<ImageModel>[] = groupUploadedFileToImages(files, messageId);
+        await this.messageRepository.createImages(images, transaction);
+        resImages = Object.fromEntries(images.map((i) => [i.symbol, i]));
       }
+      const response = transformPrintMessage(resImages, data, symbol, context.userId, time, messageId, tagsData);
+      this.pubsubService.emit("printPubSubMessage", {
+        body: response,
+      }, data.roomId);
     });
   }
 }
diff --git a/newback/src/modules/api/websocket/transformers/inner.transformer.ts b/newback/src/modules/api/websocket/transformers/inner.transformer.ts
new file mode 100644
index 000000000..3a4f99e9c
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/inner.transformer.ts
@@ -0,0 +1,23 @@
+import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
+import type {ImageModel} from "@/data/model/image.model";
+import {ImageType} from "@/data/types/frontend";
+
+export function groupUploadedFileToImages(files: UploadedFileModel[], messageId: number): Partial<ImageModel>[] {
+  const grouped: Record<string, Partial<ImageModel>> = files.reduce<Record<string, Partial<ImageModel>>>((previousValue, currentValue) => {
+    const existingElement = previousValue[currentValue.symbol];
+    if (!existingElement) {
+      previousValue[currentValue.symbol] = {
+        messageId,
+        symbol: currentValue.symbol,
+      };
+    }
+    if (currentValue.type === ImageType.PREVIEW) {
+      previousValue[currentValue.symbol].preview = currentValue.file;
+    } else {
+      previousValue[currentValue.symbol].type = currentValue.type;
+      previousValue[currentValue.symbol].img = currentValue.file;
+    }
+    return previousValue;
+  }, {});
+  return Object.values(grouped);
+}
diff --git a/newback/src/modules/api/websocket/transformers/ws.transformer.ts b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
index dfdf05f1e..2d6691666 100644
--- a/newback/src/modules/api/websocket/transformers/ws.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
@@ -10,6 +10,9 @@ import type {
   UserDto,
   UserProfileDto,
   UserSettingsDto,
+
+  PrintMessageWsInMessage,
+  PrintMessageWsOutMessage,
 } from "@/data/types/frontend";
 import type {UserModel} from "@/data/model/user.model";
 import type {
@@ -22,6 +25,9 @@ import type {GetRoomsForUser} from "@/modules/rest/database/repository/room.repo
 import type {MessageModel} from "@/data/model/message.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
+import {
+  MessageStatus,
+} from "@/data/types/frontend";
 
 export interface TransformSetWsIdDataParams {
   myRooms: GetRoomsForUser[];
@@ -212,3 +218,52 @@ export function getSyncMessage(
     content: messages.map((m) => getMessage(m, mentions, images)),
   };
 }
+
+function transformGetImages(resImages: Record<string, Partial<ImageModel>>): Record<number, FileModelDto> {
+  return Object.fromEntries(Object.entries(resImages).map(([symbol, value]) => [
+    symbol, {
+      id: value.id,
+      type: value.type,
+      url: value.img,
+      preview: value.preview,
+    },
+  ]));
+}
+
+function transformTags(tagsData: Partial<MessageMentionModel>[]): Record<string, number> {
+  return tagsData.reduce<Record<string, number>>((previousValue, currentValue) => {
+    previousValue[currentValue.symbol] = currentValue.userId;
+    return previousValue;
+  }, {});
+}
+
+export function transformPrintMessage(
+  resImages: Record<string, Partial<ImageModel>>,
+  data: {content: string; roomId: number; parentMessage: number | null},
+  symbol: string,
+  userId: number,
+  time: number,
+  messageId: number,
+  tagsData: Partial<MessageMentionModel>[]
+) {
+  const files = transformGetImages(resImages);
+  const tags: Record<string, number> = transformTags(tagsData);
+  const response: PrintMessageWsInMessage = {
+    content: data.content,
+    tags,
+    files,
+    symbol,
+    userId,
+    action: "printMessage",
+    handler: "ws-message",
+    roomId: data.roomId,
+    parentMessage: data.parentMessage,
+    time,
+    id: messageId,
+    status: MessageStatus.ON_SERVER,
+    threadMessagesCount: 0,
+    edited: 0,
+    deleted: false,
+  };
+  return response;
+}
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 0586c53ee..5c08deb89 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -1,5 +1,6 @@
 import type {OnGatewayConnection} from "@nestjs/websockets";
 import {
+  ConnectedSocket,
   MessageBody,
   SubscribeMessage,
   WebSocketGateway,
@@ -18,13 +19,15 @@ import {
 } from "@nestjs/common";
 import type {
   GetCountryCodeWsInMessage,
+  PrintMessageWsInMessage,
   SyncHistoryWsInMessage,
 } from "@/data/types/frontend";
-import {GetCountryCodeWsOutMessage,
+import {
+  GetCountryCodeWsOutMessage,
+  PrintMessageWsOutMessage,
   ShowITypeWsOutMessage,
   SyncHistoryWsOutMessage,
-
-  PrintMessageWsOutMessage} from "@/data/types/frontend";
+} from "@/data/types/frontend";
 import {SubscribePuBSub} from "@/modules/rest/pubsub/pubsub.service";
 import {SendToClientPubSubMessage} from "@/modules/api/websocket/interfaces/pubsub";
 import {WebsocketService} from "@/modules/api/websocket/websocket.service";
@@ -34,16 +37,15 @@ import {WsExceptionFilter} from "@/modules/api/websocket/ws.exception.filter";
 import {MessageService} from "@/modules/api/websocket/message.service";
 import {WsContext} from "@/modules/app/decorators/ws.context.decorator";
 import {CatchWsErrors} from "@/modules/app/decorators/catch.ws.errors";
-import {
-  MessagesFromMyRoomGuard,
-  OwnMessageGuardMixin,
-} from "@/modules/app/guards/own.message.guard";
+import {MessagesFromMyRoomGuard} from "@/modules/app/guards/own.message.guard";
+import type {NestGateway} from "@nestjs/websockets/interfaces/nest-gateway.interface";
+import {OwnRoomGuard} from "@/modules/app/guards/own.room.guard";
 
 @WebSocketGateway({
   path: "/ws",
 })
 @UseFilters(new WsExceptionFilter())
-export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
+export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGateway {
   @WebSocketServer()
   public readonly server!: Server;
 
@@ -71,6 +73,10 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
   }
 
   @SubscribeMessage("syncHistory")
+  @UseGuards(
+    // Messages ids are checked within roomsId
+    OwnRoomGuard((data: SyncHistoryWsOutMessage) => data.roomIds)
+  )
   public async syncHistory(
     @MessageBody() data: SyncHistoryWsOutMessage,
       @WsContext() context: WebSocketContextData
@@ -86,17 +92,31 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
   }
 
 
-  @UseGuards(OwnMessageGuardMixin)
+  // @UseGuards(OwnMessageGuard)
   @SubscribeMessage("printMessage")
-  // @UseGuards(MessagesFromMyRoomGuard((data: PrintMessageWsOutMessage) => [data.parentMessage]))
+  @UseGuards(
+    MessagesFromMyRoomGuard((data: PrintMessageWsOutMessage) => [data.parentMessage]),
+    OwnRoomGuard((data: PrintMessageWsOutMessage) => [data.roomId])
+  )
   public async printMessage(
     @MessageBody() data: PrintMessageWsOutMessage,
       @WsContext() context: WebSocketContextData
-  ): Promise<any> {
+  ): Promise<void> {
     await this.messageService.printMessage(data, context);
   }
 
+  @SubscribePuBSub("printPubSubMessage")
+  public printPubSubMessage(
+    ctx: WebSocketContextData,
+    data: SendToClientPubSubMessage<PrintMessageWsInMessage, "printMessage", "ws-message">
+  ): void {
+    ctx.sendToClient(data.body);
+  }
+
   @SubscribeMessage("showIType")
+  @UseGuards(
+    OwnRoomGuard((data: ShowITypeWsOutMessage) => [data.roomId])
+  )
   public async showIType(
     @MessageBody() data: ShowITypeWsOutMessage,
       @WsContext() context: WebSocketContextData
@@ -105,6 +125,7 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose {
   }
 
   @SubscribeMessage("getCountryCode")
+  // TODO add cache here
   public async getCountryCode(
     @MessageBody() data: GetCountryCodeWsOutMessage,
       @WsContext() context: WebSocketContextData
diff --git a/newback/src/modules/api/websocket/websocket.module.ts b/newback/src/modules/api/websocket/websocket.module.ts
index 797e42191..197bea167 100644
--- a/newback/src/modules/api/websocket/websocket.module.ts
+++ b/newback/src/modules/api/websocket/websocket.module.ts
@@ -1,46 +1,26 @@
-import {
-  ArgumentsHost,
-  Catch,
-  ExceptionFilter,
-  HttpException,
-  Module,
-} from "@nestjs/common";
-import {RedisModule} from "@nestjs-modules/ioredis";
-import {config} from "node-ts-config";
+import {Module} from "@nestjs/common";
 import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {SessionService} from "@/modules/rest/session/session.service";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import {DatabaseModule} from "@/modules/rest/database/database.module";
-import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 import {WebsocketService} from "@/modules/api/websocket/websocket.service";
-import {WsDataService} from "@/modules/api/websocket/ws.data.service";
-import {APP_FILTER} from "@nestjs/core";
-import {MessageService} from "@/modules/api/websocket/message.service";
+import {SessionService} from '@/modules/rest/session/session.service';
+import {PasswordService} from '@/modules/rest/password/password.service';
+import {RedisService} from '@/modules/rest/redis/redis.service';
+import {DatabaseModule} from '@/modules/rest/database/database.module';
+import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
+import {WsDataService} from '@/modules/api/websocket/ws.data.service';
+import {MessageService} from '@/modules/api/websocket/message.service';
 
 
 @Module({
-  imports: [
-    {
-      module: WebsocketGateway,
-      imports: [DatabaseModule],
-      providers: [
-        WebsocketService,
-        RedisService,
-        PubsubService,
-        MessageService,
-        SessionService,
-        WsDataService,
-        PasswordService,
-      ],
-    },
-    RedisModule.forRoot({
-      config: {
-        host: config.redis.host,
-        port: config.redis.port,
-        db: config.redis.database,
-      },
-    }),
+  imports:[DatabaseModule],
+  providers: [
+    SessionService,
+    WebsocketService,
+    PasswordService,
+    RedisService,
+    PubsubService,
+    WsDataService,
+    MessageService,
+    WebsocketGateway,
   ],
 })
 export class WebsocketModule {
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
index 617969e94..c5bb3b85c 100644
--- a/newback/src/modules/app/guards/own.message.guard.ts
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -7,44 +7,35 @@ import {
   mixin,
 } from "@nestjs/common";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {WebSocketContextData} from "@/data/types/internal";
+import {DefaultWsOutMessage} from '@/data/types/frontend';
 
 
-export const MessagesFromMyRoomGuard = (selector: (dto: any) => number[]) => {
+export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]) => {
   @Injectable()
   class OwnMessageGuardMixin implements CanActivate {
     constructor(
       private readonly messageRepository: MessageRepository,
+      private readonly pubsubService: PubsubService,
     ) {
     }
 
     public async canActivate(
       context: ExecutionContext,
     ): Promise<boolean> {
-      const ws = context.switchToWs();
-      await this.messageRepository.getMessagesById(selector(ws));
-      const request = context.switchToHttp().getRequest();
-      // Request.userId = this.sessionService.getUserIdBySession(request.headers["session-id"]);
-      return true;
+      const ws = context.getArgByIndex(0);
+      const body = context.getArgByIndex(1);
+      const messagesId: number[] = selector(body).filter((m) => m);
+      if (!messagesId.length) {
+        return true;
+      }
+      const channels = this.pubsubService.getMyChannels(ws.context);
+      const messages = await this.messageRepository.getMessagesById(messagesId, "roomId");
+      const roomIds: number[] = messages.map((m) => m.roomId);
+      return roomIds.every((id) => channels.includes(String(id)));
     }
   }
   return mixin(OwnMessageGuardMixin);
 };
 
-
-@Injectable()
-export class OwnMessageGuardMixin implements CanActivate {
-  constructor(
-    private readonly messageRepository: MessageRepository,
-  ) {
-  }
-
-  public async canActivate(
-    context: ExecutionContext,
-  ): Promise<boolean> {
-    const ws = context.switchToWs();
-    await this.messageRepository.getMessagesById([3]);
-    const request = context.switchToHttp().getRequest();
-    // Request.userId = this.sessionService.getUserIdBySession(request.headers["session-id"]);
-    return true;
-  }
-}
diff --git a/newback/src/modules/app/guards/own.room.guard.ts b/newback/src/modules/app/guards/own.room.guard.ts
new file mode 100644
index 000000000..99598f06d
--- /dev/null
+++ b/newback/src/modules/app/guards/own.room.guard.ts
@@ -0,0 +1,39 @@
+import type {
+  CanActivate,
+  ExecutionContext,
+} from "@nestjs/common";
+import {
+  Injectable,
+  mixin,
+} from "@nestjs/common";
+import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {WebSocketContextData} from "@/data/types/internal";
+import {DefaultWsOutMessage} from '@/data/types/frontend';
+
+
+export const OwnRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]) => {
+  @Injectable()
+  class OwnMessageGuardMixin implements CanActivate {
+    constructor(
+      private readonly messageRepository: MessageRepository,
+      private readonly pubsubService: PubsubService,
+    ) {
+    }
+
+    public async canActivate(
+      context: ExecutionContext,
+    ): Promise<boolean> {
+      const ws = context.getArgByIndex(0);
+      const body = context.getArgByIndex(1);
+      const roomIds: number[] = selector(body).filter((m) => m);
+      if (!roomIds.length) {
+        return true;
+      }
+      const channels = this.pubsubService.getMyChannels(ws.context);
+      return roomIds.every((id) => channels.includes(String(id)));
+    }
+  }
+  return mixin(OwnMessageGuardMixin);
+};
+
diff --git a/newback/src/modules/rest/database/repository/messages.repository.ts b/newback/src/modules/rest/database/repository/messages.repository.ts
index 131a86083..bb63138a4 100644
--- a/newback/src/modules/rest/database/repository/messages.repository.ts
+++ b/newback/src/modules/rest/database/repository/messages.repository.ts
@@ -75,7 +75,10 @@ export class MessageRepository {
     });
   }
 
-   public async getMessagesById(messageIds: number[], ...attributes: (keyof MessageModel)[]): Promise<MessageModel[]> {
+  public async getMessagesById(messageIds: number[], ...attributes: (keyof MessageModel)[]): Promise<MessageModel[]> {
+    if (!messageIds.length) {
+      return [];
+    }
     return this.messageModel.findAll({
       where: {
         id: {
@@ -92,14 +95,7 @@ export class MessageRepository {
     userId: number;
     file: string;
   }, transaction: Transaction): Promise<number> {
-    const result = await this.uploadedFileModel.create({
-      userId: data.userId,
-      symbol: data.symbol,
-      type: data.type,
-      file: data.file,
-    }, {
-      transaction,
-    });
+    const result = await this.uploadedFileModel.create(data, {transaction});
     return result.id;
   }
 
@@ -131,4 +127,21 @@ export class MessageRepository {
       },
     });
   }
+
+  public async createMessage(data: Partial<MessageModel>, transaction: Transaction): Promise<number> {
+    const messageModel = await this.messageModel.create(data, {transaction});
+    return messageModel.id;
+  }
+
+  public async createMessageMentions(data: Partial<MessageMentionModel>[], transaction: Transaction): Promise<void> {
+    await this.messageMentionModel.bulkCreate(data, {
+      transaction,
+    });
+  }
+
+  public async createImages(data: Partial<ImageModel>[], transaction: Transaction): Promise<void> {
+    await this.imageModel.bulkCreate(data, {
+      transaction,
+    });
+  }
 }
diff --git a/newback/src/modules/rest/database/repository/verification.repository.ts b/newback/src/modules/rest/database/repository/verification.repository.ts
index bd44198fd..dc133220b 100644
--- a/newback/src/modules/rest/database/repository/verification.repository.ts
+++ b/newback/src/modules/rest/database/repository/verification.repository.ts
@@ -4,6 +4,7 @@ import {UserAuthModel} from "@/data/model/user.auth.model";
 import type {VerificationType} from "@/data/types/frontend";
 import {VerificationModel} from "@/data/model/verification.model";
 import type {Transaction} from "sequelize";
+import {RequireAtLeastOne} from '@/data/types/internal';
 
 
 @Injectable()
@@ -38,13 +39,8 @@ export class VerificationRepository {
     });
   }
 
-  public async createVerification(email: string, userId: number, token: string, type: VerificationType, transaction: Transaction): Promise<void> {
-    const verification = await this.verificationModel.create({
-      type,
-      email,
-      userId,
-      token,
-    }, {
+  public async createVerification(data: RequireAtLeastOne<Partial<VerificationModel>, 'userId'>, transaction: Transaction): Promise<void> {
+    const verification = await this.verificationModel.create(data, {
       raw: true,
       transaction,
     });
@@ -52,7 +48,7 @@ export class VerificationRepository {
       emailVerificationId: verification.id,
     }, {
       where: {
-        id: userId,
+        id: data.userId,
       },
       transaction,
     });
diff --git a/newback/src/modules/rest/pubsub/pubsub.service.ts b/newback/src/modules/rest/pubsub/pubsub.service.ts
index 07a246d6e..5cf57d1bd 100644
--- a/newback/src/modules/rest/pubsub/pubsub.service.ts
+++ b/newback/src/modules/rest/pubsub/pubsub.service.ts
@@ -46,7 +46,7 @@ export class PubsubService {
 
   // A extends string,H extends HandlerName
 
-  public emit<PS extends PubSubMessage<A, H>, A extends string, H extends HandlerName>(handler: keyof WebsocketGateway, data: PS, ...channel: string[]) {
+  public emit<PS extends PubSubMessage<A, H>, A extends string, H extends HandlerName>(handler: keyof WebsocketGateway, data: PS, ...channel: (number | string)[]) {
     channel.forEach((channel) => {
       if (receivers[channel]) {
         receivers[channel].forEach((receiver) => {
@@ -69,7 +69,7 @@ export class PubsubService {
   }
 
   public unsubscribeAll(context: WebSocketContextData) {
-    Object.values(receivers).forEach(contexts => {
+    Object.values(receivers).forEach((contexts) => {
       const index = contexts.findIndex((c) => c.ctx = context);
       if (index >= 0) {
         contexts.splice(index, 1);
@@ -87,4 +87,10 @@ export class PubsubService {
       }
     });
   }
+
+  public getMyChannels(context: WebSocketContextData): string[] {
+    return Object.entries(receivers).
+      filter(([k, v]) => v.find((k) => k.ctx === context)).
+      map(([k, v]) => k);
+  }
 }
diff --git a/newback/src/utils/helpers.ts b/newback/src/utils/helpers.ts
index 824eec17a..6a9bd5962 100644
--- a/newback/src/utils/helpers.ts
+++ b/newback/src/utils/helpers.ts
@@ -2,6 +2,8 @@ import type {SequelizeModuleOptions} from "@nestjs/sequelize";
 
 import {MAX_USERNAME_LENGTH} from "@/utils/consts";
 import {config} from "node-ts-config";
+import {UploadedFileModel} from '@/data/model/uploaded.file.model';
+import {GiphyDto} from '@/data/types/frontend';
 
 export function generateUserName(email: string) {
   return email.split("@")[0].replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, MAX_USERNAME_LENGTH);
@@ -37,3 +39,14 @@ export function generateOrmConfig(logging: ((sql: string) => void)): Omit<Sequel
   };
 }
 
+
+export function getMaxSymbol(files: UploadedFileModel[], tags: Record<string, number>, giphies: GiphyDto[]) {
+  const maxSymInt: number = Math.max(
+    0,
+    ...files.map((f) => f.symbol.charCodeAt(0)),
+    ...Object.keys(tags).map((k) => k.charCodeAt(0)),
+    ...giphies.map((g) => g.symbol.charCodeAt(0))
+  );
+  const symbol: string | null = maxSymInt === 0 ? null : String.fromCharCode(maxSymInt);
+  return symbol;
+}

From c8d979537242e4ff1f72fae3def62d22a1e4a2f9 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 14:12:26 +0300
Subject: [PATCH 073/221] Fixed test

---
 newback/src/jest.config.ts                     |  1 -
 .../src/modules/api/file/image.service.spec.ts | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/newback/src/jest.config.ts b/newback/src/jest.config.ts
index 46ecc72a7..9e07e30f9 100644
--- a/newback/src/jest.config.ts
+++ b/newback/src/jest.config.ts
@@ -26,7 +26,6 @@ export default async(): Promise<Config.InitialOptions> => ({
   coveragePathIgnorePatterns: [
     "/node_modules/",
     "/coverage/",
-    "/ormconfig.ts",
     "/jest.config.ts",
     "/dist/",
     ".module.ts$",
diff --git a/newback/src/modules/api/file/image.service.spec.ts b/newback/src/modules/api/file/image.service.spec.ts
index 49d0a549a..ef63c1c0f 100644
--- a/newback/src/modules/api/file/image.service.spec.ts
+++ b/newback/src/modules/api/file/image.service.spec.ts
@@ -30,21 +30,33 @@ describe("ImageService", () => {
   describe("getName", () => {
     it("remove old ext", async() => {
       passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
-      await expect(imgService.getName("name.jpeg", "webp", "jpeg")).
+      await expect(imgService.getName("name.jpeg", "webp")).
         resolves.
         toEqual("test_name.webp");
     });
     it("keep origin extension", async() => {
       passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
-      await expect(imgService.getName("name.jpeg", "", "")).
+      await expect(imgService.getName("name.jpeg", "")).
         resolves.
         toEqual("test_name.jpeg");
     });
     it("keep origin esxtension", async() => {
       passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
-      await expect(imgService.getName("name.jpeg", "jpeg", "jpeg")).
+      await expect(imgService.getName("name.jpeg", "jpeg")).
         resolves.
         toEqual("test_name.jpeg");
     });
+    it("works with undefined", async() => {
+      passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
+      await expect(imgService.getName(undefined, "jpeg")).
+        resolves.
+        toEqual("test_.jpeg");
+    });
+    it("works with 2 undefined", async() => {
+      passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
+      await expect(imgService.getName(undefined, undefined)).
+        resolves.
+        toEqual("test_");
+    });
   });
 });

From 450d810699d1084825344100aacebae8b5d282b7 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 14:24:02 +0300
Subject: [PATCH 074/221] Added cache

---
 newback/src/modules/rest/html/html.service.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/newback/src/modules/rest/html/html.service.ts b/newback/src/modules/rest/html/html.service.ts
index 076d51654..f7a8169a4 100644
--- a/newback/src/modules/rest/html/html.service.ts
+++ b/newback/src/modules/rest/html/html.service.ts
@@ -5,6 +5,8 @@ import {sep} from "path";
 
 @Injectable()
 export class HtmlService {
+  private cache: Record<string, string> = {};
+
   public replaceTemplate(content: string, params: Record<string, number | string>): string {
     const replaceHtmlRegex = /\{\{\s?(\w+)\s?\}\}/g;
     return content.replace(replaceHtmlRegex, (_, v) => {
@@ -17,7 +19,9 @@ export class HtmlService {
 
   public async renderTemplate(template: string, params: Record<string, number | string>) {
     const filePath = ["src", "templates", `${template}`].join(sep);
-    const content = await promisify(readFile)(filePath, "utf-8");
-    return this.replaceTemplate(content, params);
+    if (!this.cache[filePath]) {
+      this.cache[filePath] = await promisify(readFile)(filePath, "utf-8");
+    }
+    return this.replaceTemplate(this.cache[filePath], params);
   }
 }

From ed10c1e4f5ad35b3b007e3adce4de202bc4710ac Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 14:26:36 +0300
Subject: [PATCH 075/221] promisify instead of util promis

---
 newback/src/main.ts                                  | 7 +++----
 newback/src/modules/rest/email/email.service.spec.ts | 7 +++----
 newback/src/modules/rest/html/html.service.ts        | 5 ++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/newback/src/main.ts b/newback/src/main.ts
index 3939d41da..14d6ea4dd 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -5,13 +5,12 @@ import {
   Logger,
   ValidationPipe,
 } from "@nestjs/common";
-import {readFile} from "fs";
-import {promisify} from "util";
+import {readFile} from "fs/promises";
 import {WsAdapter} from "@/modules/rest/ws.adapter/ws.adapter";
 
 async function bootstrap() {
-  const key = await promisify(readFile)(config.application.keyPath, "utf-8");
-  const cert = await promisify(readFile)(config.application.crtPath, "utf-8");
+  const key = await readFile(config.application.keyPath, "utf-8");
+  const cert = await readFile(config.application.crtPath, "utf-8");
 
   const app = await NestFactory.create(AppModule, {
     logger: ["log", "error", "warn", "debug"],
diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
index 6221ffedc..19c5865ae 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -9,8 +9,7 @@ import {
 import {LoggerModule} from "@/modules/rest/logger/logger.module";
 import {MailerService} from "@nestjs-modules/mailer";
 
-import {promisify} from "util";
-import {readFile} from "fs";
+import {readFile} from "fs/promises";
 import {resolve} from "path";
 import {ConsoleLogger} from "@nestjs/common";
 import {ConfigService} from "@/modules/rest/config/config.service";
@@ -68,7 +67,7 @@ describe("EmailSenderService", () => {
       jest.useFakeTimers("modern");
       jest.setSystemTime(new Date(2020, 3, 1));
       await sender.sendRestorePasswordEmail("a", 3, "a@a", "sfsd", "192.168.1.1", "Chernihiv");
-      const content = await promisify(readFile)(resolve(__dirname, "..", "..", "..", "fixtures", "rendered.send.restore.password.html"), "utf-8");
+      const content = await readFile(resolve(__dirname, "..", "..", "..", "fixtures", "rendered.send.restore.password.html"), "utf-8");
       expect(spy).toHaveBeenCalledWith(expect.objectContaining({
         html: content,
         subject: "Reset pychat password",
@@ -83,7 +82,7 @@ describe("EmailSenderService", () => {
       jest.useFakeTimers("modern");
       jest.setSystemTime(new Date(2020, 3, 1));
       await sender.sendSignUpEmail("a", 3, "a@a", "sfsd", "192.168.1.1", "Chernihiv");
-      const content = await promisify(readFile)(resolve(__dirname, "..", "..", "..", "fixtures", "send.sign.up.email.html"), "utf-8");
+      const content = await readFile(resolve(__dirname, "..", "..", "..", "fixtures", "send.sign.up.email.html"), "utf-8");
       expect(spy).toHaveBeenCalledWith(expect.objectContaining({
         html: content,
         subject: "Confirm Pychat registration",
diff --git a/newback/src/modules/rest/html/html.service.ts b/newback/src/modules/rest/html/html.service.ts
index f7a8169a4..f6cee204c 100644
--- a/newback/src/modules/rest/html/html.service.ts
+++ b/newback/src/modules/rest/html/html.service.ts
@@ -1,6 +1,5 @@
 import {Injectable} from "@nestjs/common";
-import {readFile} from "fs";
-import {promisify} from "util";
+import {readFile} from "fs/promises";
 import {sep} from "path";
 
 @Injectable()
@@ -20,7 +19,7 @@ export class HtmlService {
   public async renderTemplate(template: string, params: Record<string, number | string>) {
     const filePath = ["src", "templates", `${template}`].join(sep);
     if (!this.cache[filePath]) {
-      this.cache[filePath] = await promisify(readFile)(filePath, "utf-8");
+      this.cache[filePath] = await readFile(filePath, "utf-8");
     }
     return this.replaceTemplate(this.cache[filePath], params);
   }

From 51a3bb4dbe23230a7e288ee18eeb6453c802885f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 20:59:07 +0300
Subject: [PATCH 076/221] Added migration from scratch Added cache to
 getCountryCode Added Utility type

---
 newback/package.json                          |  5 +-
 newback/src/data/model/ip.address.model.ts    | 18 ++---
 newback/src/data/types/internal.ts            | 29 ++++++++
 newback/src/modules/api/auth/auth.service.ts  |  1 +
 .../src/modules/api/file/file.controller.ts   |  6 +-
 newback/src/modules/api/file/file.service.ts  |  8 +-
 .../src/modules/api/verify/verify.service.ts  |  1 +
 .../modules/api/websocket/message.service.ts  | 54 ++++++++------
 .../transformers/inner.transformer.ts         | 38 +++++++++-
 .../websocket/transformers/ws.transformer.ts  | 56 ++++++++------
 .../api/websocket/websocket.gateway.ts        |  8 --
 .../modules/api/websocket/ws.data.service.ts  | 35 ++-------
 .../rest/database/repository/ip.repository.ts | 27 ++++++-
 .../repository/messages.repository.ts         | 74 ++++++++++++++-----
 .../database/repository/room.repository.ts    |  7 +-
 .../database/repository/user.repository.ts    | 19 +++--
 .../repository/verification.repository.ts     |  7 +-
 .../src/modules/rest/ip/ip.cache.service.ts   | 41 ++++++++--
 newback/src/modules/rest/ip/ip.module.ts      |  3 +-
 .../src/modules/rest/redis/redis.service.ts   | 20 ++++-
 newback/src/utils/consts.ts                   |  1 +
 newback/src/utils/migration.old.ts            | 33 ++++++---
 22 files changed, 324 insertions(+), 167 deletions(-)

diff --git a/newback/package.json b/newback/package.json
index cbf7e0600..aad718900 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -13,7 +13,10 @@
     "test": "jest --config ./src/jest.config.ts --runInBand --coverage --coverageReporters text",
     "lint": "eslint --ext .ts --max-warnings=0 src",
     "lint:new": "eslint-find-rules -u ./.eslintrc.json",
-    "lint:fix": "eslint --fix --ext .ts src"
+    "lint:fix": "eslint --fix --ext .ts src",
+    "create:database": "echo \"drop database pychat2; create database pychat2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; GRANT ALL ON pychat2.* TO 'pychat'@'localhost';\" |sudo mysql -u root\n",
+    "create:migrate:prod": "ts-node --compiler ttypescript ./src/utils/migration.old.ts",
+    "db:flush:all": "yarn create:database && yarn migrate && yarn create:migrate:prod"
   },
   "engines": {
     "node": ">=16.0.0"
diff --git a/newback/src/data/model/ip.address.model.ts b/newback/src/data/model/ip.address.model.ts
index a69c32872..0e79c81d0 100644
--- a/newback/src/data/model/ip.address.model.ts
+++ b/newback/src/data/model/ip.address.model.ts
@@ -35,53 +35,53 @@ export class IpAddressModel extends Model<IpAddressModel> {
     type: DataType.STRING,
     allowNull: true,
   })
-  public isp: string;
+  public isp: string | null;
 
   @Column({
     type: DataType.STRING(16),
     allowNull: true,
   })
-  public countryCode: string;
+  public countryCode: string | null;
 
   @Column({
     type: DataType.STRING(64),
     allowNull: true,
   })
-  public country: string;
+  public country: string | null;
 
   @Column({
     type: DataType.STRING(64),
     allowNull: true,
   })
-  public region: string;
+  public region: string | null;
 
   @Column({
     type: DataType.STRING(64),
     allowNull: true,
   })
-  public city: string;
+  public city: string | null;
 
   @Column({
     type: DataType.DOUBLE,
     allowNull: true,
   })
-  public lat: number;
+  public lat: number | null;
 
   @Column({
     type: DataType.DOUBLE,
     allowNull: true,
   })
-  public lon: number;
+  public lon: number | null;
 
   @Column({
     type: DataType.STRING(32),
     allowNull: true,
   })
-  public zip: string;
+  public zip: string | null;
 
   @Column({
     type: DataType.STRING(32),
     allowNull: true,
   })
-  public timezone: string;
+  public timezone: string | null;
 }
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index a9a8f83fb..a6febadc9 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,4 +1,8 @@
 import type {DefaultWsInMessage, MessageStatus} from "@/data/types/frontend";
+import type {RoomModel} from "@/data/model/room.model";
+import type {RoomUsersModel} from "@/data/model/room.users.model";
+import {ChannelModel} from '@/data/model/channel.model';
+import {UserModel} from '@/data/model/user.model';
 
 export interface WebSocketContextData {
   userId: number;
@@ -15,8 +19,33 @@ export interface FileSaveResponse {
   previewFileName: string;
 }
 
+export interface TransformSetWsIdDataParams {
+  myRooms: GetRoomsForUser[];
+  allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[];
+  channels: ChannelModel[];
+  users: UserModel[];
+  online: UserOnlineData;
+  id: string;
+  time: number;
+  user: UserModel;
+}
+
+type RoomSingleRoomUser = Omit<RoomModel, "roomUsers">;
+
+export interface GetRoomsForUser extends RoomSingleRoomUser {
+  roomUsers: RoomUsersModel;
+}
+
 // https://stackoverflow.com/a/49725198/3872976
 export type RequireAtLeastOne<T, Keys extends keyof T = keyof T> =
     {
       [K in Keys]-?: Partial<Pick<T, Exclude<Keys, K>>> & Required<Pick<T, K>>
     }[Keys] & Pick<T, Exclude<keyof T, Keys>>;
+
+
+// Based on https://stackoverflow.com/a/69756175/3872976
+export type PureModel<T> = {
+  [P in keyof Omit<T, "isNewRecord" | "version"> as T[P] extends Date | number[] | boolean | number | string | undefined ? P : never]: T[P]
+};
+
+export type CreateModel<T> = Omit<PureModel<T>, "createdAt" | "deletedAt" | "id" | "updatedAt">;
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 532e29731..04507f2a6 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -164,6 +164,7 @@ export class AuthService {
           email,
           userId,
           token,
+          verified: false,
           type: VerificationType.REGISTER,
         }, t);
         const ipInfo = await this.ipCacheService.getIpString(ip);
diff --git a/newback/src/modules/api/file/file.controller.ts b/newback/src/modules/api/file/file.controller.ts
index 6fe4c02ba..506d700aa 100644
--- a/newback/src/modules/api/file/file.controller.ts
+++ b/newback/src/modules/api/file/file.controller.ts
@@ -23,7 +23,7 @@ import {
 })
 export class FileController {
   public constructor(
-    // private readonly fileService: FileService,
+    private readonly fileService: FileService,
   ) {
   }
 
@@ -35,8 +35,6 @@ export class FileController {
       @Body() body: SaveFileRequest,
       @UserId() userId: number,
   ): Promise<SaveFileResponse> {
-    console.log('asd');
-    return {} as any;
-    // return this.fileService.saveFile(userId, file, body.symbol, body.type, body.name);
+    return this.fileService.saveFile(userId, file, body.symbol, body.type, body.name);
   }
 }
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index d01781f06..337d0174d 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -2,10 +2,8 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import type {
-  SaveFileResponse,
-  ImageType,
-} from "@/data/types/frontend";
+import type {SaveFileResponse} from "@/data/types/frontend";
+import {ImageType} from "@/data/types/frontend";
 import {join} from "path";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
 import type {FileSaveResponse} from "@/data/types/internal";
@@ -46,7 +44,7 @@ export class FileService {
       };
       if (fileSaveResponse.previewFileName) {
         response.previewId = await this.messageRepository.saveUploadFile({
-          type,
+          type: ImageType.PREVIEW,
           file: fileSaveResponse.originFileName,
           symbol,
           userId,
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index f79ade586..84cc70292 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -75,6 +75,7 @@ export class VerifyService {
         email,
         userId,
         token,
+        verified: false,
         type: VerificationType.PASSWORD,
       }, t);
       const ipInfo = await this.ipCacheService.getIpString(ip);
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index b3b27d09d..50142a568 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -5,34 +5,39 @@ import {
 import {UserRepository} from "@/modules/rest/database/repository/user.repository";
 import {PasswordService} from "@/modules/rest/password/password.service";
 import type {
-  GiphyDto,
-  PrintMessageWsInMessage,
   PrintMessageWsOutMessage,
   ShowITypeWsInMessage,
   ShowITypeWsOutMessage,
   SyncHistoryWsOutMessage,
 } from "@/data/types/frontend";
-import {MessageStatus} from "@/data/types/frontend";
+import {
+  ImageType,
+  MessageStatus,
+} from "@/data/types/frontend";
 import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
 import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
 import {SessionService} from "@/modules/rest/session/session.service";
 import {RedisService} from "@/modules/rest/redis/redis.service";
 import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
-import type {WebSocketContextData} from "@/data/types/internal";
+import type {
+  CreateModel,
+  WebSocketContextData
+} from "@/data/types/internal";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
 import {
   getSyncMessage,
-  transformPrintMessage
+  transformPrintMessage,
 } from "@/modules/api/websocket/transformers/ws.transformer";
 import {Sequelize} from "sequelize-typescript";
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
-import {groupUploadedFileToImages} from "@/modules/api/websocket/transformers/inner.transformer";
-import {getMaxSymbol} from '@/utils/helpers';
-
-
-
+import {
+  getMentionsFromTags,
+  getUploadedGiphies,
+  groupUploadedFileToImages,
+} from "@/modules/api/websocket/transformers/inner.transformer";
+import {getMaxSymbol} from "@/utils/helpers";
 
 @Injectable()
 export class MessageService {
@@ -48,6 +53,7 @@ export class MessageService {
     private readonly messageRepository: MessageRepository,
     private readonly sequelize: Sequelize,
   ) {
+    this.messageRepository.attachHooks();
   }
 
   public showIType(data: ShowITypeWsOutMessage, context: WebSocketContextData): void {
@@ -118,24 +124,24 @@ export class MessageService {
         symbol,
         parentMessageId: data.parentMessage,
         content: data.content,
+        threadMessageCount: 0,
       }, transaction);
-      let tagsData: Partial<MessageMentionModel>[] = [];
-      if (data.tags && Object.keys(data.tags).length) {
-        tagsData = Object.entries(data.tags).map(([symbol, userId]) => ({
-          messageId,
-          userId,
-          symbol,
-        }));
-        await this.messageRepository.createMessageMentions(tagsData, transaction);
+      const tagsData: CreateModel<MessageMentionModel>[] = getMentionsFromTags(data, messageId);
+      await this.messageRepository.createMessageMentions(tagsData, transaction);
+      const images: CreateModel<ImageModel>[] = groupUploadedFileToImages(files, messageId);
+      const giphies: CreateModel<ImageModel>[] = getUploadedGiphies(data.giphies, messageId);
+      const totalMedia = [...images, ...giphies];
+      let media: ImageModel[] = [];
+      if (totalMedia.length) {
+        await this.messageRepository.createImages(totalMedia, transaction);
+        // We need to fetch images again, since on bulkCreate mysql doesnt return ids
+        media = await this.messageRepository.getImagesByMessagesId([messageId], transaction);
       }
-      let resImages: Record<string, Partial<ImageModel>> = {};
       if (files.length) {
-        const images: Partial<ImageModel>[] = groupUploadedFileToImages(files, messageId);
-        await this.messageRepository.createImages(images, transaction);
-        resImages = Object.fromEntries(images.map((i) => [i.symbol, i]));
+        await this.messageRepository.deleteUploadedFiles(files.map((f) => f.id), transaction);
       }
-      const response = transformPrintMessage(resImages, data, symbol, context.userId, time, messageId, tagsData);
-      this.pubsubService.emit("printPubSubMessage", {
+      const response = transformPrintMessage(media, data, symbol, context.userId, time, messageId, tagsData);
+      this.pubsubService.emit("sendToClient", {
         body: response,
       }, data.roomId);
     });
diff --git a/newback/src/modules/api/websocket/transformers/inner.transformer.ts b/newback/src/modules/api/websocket/transformers/inner.transformer.ts
index 3a4f99e9c..6cc9653b5 100644
--- a/newback/src/modules/api/websocket/transformers/inner.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/inner.transformer.ts
@@ -1,9 +1,39 @@
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {ImageModel} from "@/data/model/image.model";
-import {ImageType} from "@/data/types/frontend";
+import type {
+  GiphyDto,
+  PrintMessageWsOutMessage,
+} from "@/data/types/frontend";
+import {
+  ImageType,
+} from "@/data/types/frontend";
+import type {MessageMentionModel} from "@/data/model/message.mention.model";
+import {
+  CreateModel,
+  PureModel
+} from '@/data/types/internal';
 
-export function groupUploadedFileToImages(files: UploadedFileModel[], messageId: number): Partial<ImageModel>[] {
-  const grouped: Record<string, Partial<ImageModel>> = files.reduce<Record<string, Partial<ImageModel>>>((previousValue, currentValue) => {
+
+export function getUploadedGiphies(data: GiphyDto[], messageId: number): CreateModel<ImageModel>[] {
+  return data.map((g) => ({
+    messageId,
+    symbol: g.symbol,
+    img: g.symbol,
+    preview: g.webp,
+    type: ImageType.GIPHY,
+  }));
+}
+
+export function getMentionsFromTags(data: PrintMessageWsOutMessage, messageId: number): CreateModel<MessageMentionModel>[] {
+  return Object.entries(data.tags).map(([symbol, userId]) => ({
+    messageId,
+    userId,
+    symbol,
+  }));
+}
+
+export function groupUploadedFileToImages(files: UploadedFileModel[], messageId: number): CreateModel<ImageModel>[] {
+  const grouped: Record<number, CreateModel<ImageModel>> = files.reduce<Record<number, CreateModel<ImageModel>>>((previousValue, currentValue) => {
     const existingElement = previousValue[currentValue.symbol];
     if (!existingElement) {
       previousValue[currentValue.symbol] = {
@@ -18,6 +48,6 @@ export function groupUploadedFileToImages(files: UploadedFileModel[], messageId:
       previousValue[currentValue.symbol].img = currentValue.file;
     }
     return previousValue;
-  }, {});
+  }, {} as Record<number, CreateModel<ImageModel>>);
   return Object.values(grouped);
 }
diff --git a/newback/src/modules/api/websocket/transformers/ws.transformer.ts b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
index 2d6691666..2a0180466 100644
--- a/newback/src/modules/api/websocket/transformers/ws.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
@@ -1,5 +1,4 @@
-import type {
-  AddOnlineUserMessage,
+import type {AddOnlineUserMessage,
   ChannelDto,
   FileModelDto,
   MessageModelDto,
@@ -13,32 +12,26 @@ import type {
 
   PrintMessageWsInMessage,
   PrintMessageWsOutMessage,
-} from "@/data/types/frontend";
+
+  GetCountryCodeWsInMessage,
+  LocationDto} from "@/data/types/frontend";
 import type {UserModel} from "@/data/model/user.model";
 import type {
+  CreateModel,
+  GetRoomsForUser,
+  TransformSetWsIdDataParams,
   UserOnlineData,
   WebSocketContextData,
 } from "@/data/types/internal";
 import type {ChannelModel} from "@/data/model/channel.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
-import type {GetRoomsForUser} from "@/modules/rest/database/repository/room.repository";
 import type {MessageModel} from "@/data/model/message.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
 import {
   MessageStatus,
 } from "@/data/types/frontend";
-
-export interface TransformSetWsIdDataParams {
-  myRooms: GetRoomsForUser[];
-  allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[];
-  channels: ChannelModel[];
-  users: UserModel[];
-  online: UserOnlineData;
-  id: string;
-  time: number;
-  user: UserModel;
-}
+import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 
 /*
  * Function transformUserSettings(db: UserSettingsModel): UserSettingsDto {
@@ -219,9 +212,9 @@ export function getSyncMessage(
   };
 }
 
-function transformGetImages(resImages: Record<string, Partial<ImageModel>>): Record<number, FileModelDto> {
-  return Object.fromEntries(Object.entries(resImages).map(([symbol, value]) => [
-    symbol, {
+function transformGetImages(resImages: ImageModel[]): Record<number, FileModelDto> {
+  return Object.fromEntries(resImages.map((value) => [
+    value.symbol, {
       id: value.id,
       type: value.type,
       url: value.img,
@@ -230,7 +223,7 @@ function transformGetImages(resImages: Record<string, Partial<ImageModel>>): Rec
   ]));
 }
 
-function transformTags(tagsData: Partial<MessageMentionModel>[]): Record<string, number> {
+function transformTags(tagsData: CreateModel<MessageMentionModel>[]): Record<string, number> {
   return tagsData.reduce<Record<string, number>>((previousValue, currentValue) => {
     previousValue[currentValue.symbol] = currentValue.userId;
     return previousValue;
@@ -238,17 +231,17 @@ function transformTags(tagsData: Partial<MessageMentionModel>[]): Record<string,
 }
 
 export function transformPrintMessage(
-  resImages: Record<string, Partial<ImageModel>>,
+  resImages: ImageModel[],
   data: {content: string; roomId: number; parentMessage: number | null},
   symbol: string,
   userId: number,
   time: number,
   messageId: number,
-  tagsData: Partial<MessageMentionModel>[]
-) {
+  tagsData: CreateModel<MessageMentionModel>[]
+): PrintMessageWsInMessage {
   const files = transformGetImages(resImages);
   const tags: Record<string, number> = transformTags(tagsData);
-  const response: PrintMessageWsInMessage = {
+  return {
     content: data.content,
     tags,
     files,
@@ -265,5 +258,20 @@ export function transformPrintMessage(
     edited: 0,
     deleted: false,
   };
-  return response;
+}
+
+export function transformUserCountries(userInfo: UserJoinedInfoModel[]): Omit<GetCountryCodeWsInMessage, "action" | "handler"> {
+  const content: GetCountryCodeWsInMessage["content"] = userInfo.reduce((previousValue, currentValue) => {
+    if (currentValue.ip) {
+      const value: LocationDto = {
+        country: currentValue.ip.country,
+        region: currentValue.ip.region,
+        city: currentValue.ip.city,
+        countryCode: currentValue.ip.countryCode,
+      };
+      previousValue[currentValue.userId] = value;
+    }
+    return previousValue;
+  }, {});
+  return {content};
 }
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 5c08deb89..b3da1717f 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -105,14 +105,6 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
     await this.messageService.printMessage(data, context);
   }
 
-  @SubscribePuBSub("printPubSubMessage")
-  public printPubSubMessage(
-    ctx: WebSocketContextData,
-    data: SendToClientPubSubMessage<PrintMessageWsInMessage, "printMessage", "ws-message">
-  ): void {
-    ctx.sendToClient(data.body);
-  }
-
   @SubscribeMessage("showIType")
   @UseGuards(
     OwnRoomGuard((data: ShowITypeWsOutMessage) => [data.roomId])
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index 47c731f46..e1f1c1838 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -2,21 +2,14 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import type {
-  GetCountryCodeWsInMessage,
-  LocationDto,
-} from "@/data/types/frontend";
+import type {GetCountryCodeWsInMessage} from "@/data/types/frontend";
 import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
 import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
 import type {WebSocketContextData} from "@/data/types/internal";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 import {ConfigService} from "@/modules/rest/config/config.service";
 import {ValidationException} from "@/data/exceptions/validation.exception";
-import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
+import {transformUserCountries} from "@/modules/api/websocket/transformers/ws.transformer";
 
 
 @Injectable()
@@ -24,13 +17,8 @@ export class WsDataService {
   constructor(
     public readonly logger: Logger,
     private readonly configService: ConfigService,
-    private readonly passwordService: PasswordService,
     private readonly ipCacheService: IpCacheService,
-    private readonly redisService: RedisService,
-    private readonly ipRepository: IpRepository,
     private readonly roomRepository: RoomRepository,
-    private readonly userRepository: UserRepository,
-    private readonly pubsubService: PubsubService,
   ) {
   }
 
@@ -39,21 +27,8 @@ export class WsDataService {
       throw new ValidationException("Flags api is not enabled");
     }
     const usersId: number[] = await this.roomRepository.usersForUser(context.userId);
-    const userInfo: UserJoinedInfoModel[] = await this.ipRepository.getIpInfosForUsers(usersId);
-    const content: GetCountryCodeWsInMessage["content"] = userInfo.reduce((previousValue, currentValue) => {
-      if (currentValue.ip) {
-        const value: LocationDto = {
-          country: currentValue.ip.country,
-          region: currentValue.ip.region,
-          city: currentValue.ip.city,
-          countryCode: currentValue.ip.countryCode,
-        };
-        previousValue[currentValue.userId] = value;
-      }
-      return previousValue;
-    }, {});
-    return {
-      content,
-    };
+    const ips: UserJoinedInfoModel[] = await this.ipCacheService.getSavedIpsInfo();
+    const filteredUsers = ips.filter((userInfo) => usersId.includes(userInfo.userId));
+    return transformUserCountries(filteredUsers);
   }
 }
diff --git a/newback/src/modules/rest/database/repository/ip.repository.ts b/newback/src/modules/rest/database/repository/ip.repository.ts
index eecd03d67..890ce8d34 100644
--- a/newback/src/modules/rest/database/repository/ip.repository.ts
+++ b/newback/src/modules/rest/database/repository/ip.repository.ts
@@ -3,6 +3,7 @@ import {InjectModel} from "@nestjs/sequelize";
 import {IpAddressModel} from "@/data/model/ip.address.model";
 import {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 import {Op} from "sequelize";
+import {CreateModel} from '@/data/types/internal';
 
 
 @Injectable()
@@ -14,12 +15,23 @@ export class IpRepository {
   }
 
   public async saveIpToUser(userId: number, ipId: number) {
-    await this.userJoinedInfoModel.upsert({userId,
-      ipId},);
+    await this.userJoinedInfoModel.upsert({
+      userId,
+      ipId,
+    });
+  }
+
+  public connectCreateHook(cb: () => Promise<void>) {
+    this.ipAddressModel.afterBulkCreate(cb);
+    this.ipAddressModel.afterCreate(cb);
+    this.userJoinedInfoModel.afterBulkCreate(cb);
+    this.userJoinedInfoModel.afterBulkCreate(cb);
+    this.userJoinedInfoModel.afterUpdate(cb);
+    this.userJoinedInfoModel.afterBulkUpdate(cb);
   }
 
-  public async saveIP(model: Partial<IpAddressModel>) {
-    return this.ipAddressModel.upsert(model);
+  public saveIP(model: CreateModel<IpAddressModel>): Promise<IpAddressModel> {
+    return this.ipAddressModel.upsert(model)[0];
   }
 
   public async getIp(ip: string): Promise<IpAddressModel> {
@@ -31,6 +43,13 @@ export class IpRepository {
     });
   }
 
+  public async getAllIps(): Promise<UserJoinedInfoModel[]> {
+    return this.userJoinedInfoModel.findAll({
+      raw: true,
+      include: ["ip"],
+    });
+  }
+
   public async getIpInfosForUsers(userIds: number[]): Promise<UserJoinedInfoModel[]> {
     return this.userJoinedInfoModel.findAll({
       where: {
diff --git a/newback/src/modules/rest/database/repository/messages.repository.ts b/newback/src/modules/rest/database/repository/messages.repository.ts
index bb63138a4..3563b431a 100644
--- a/newback/src/modules/rest/database/repository/messages.repository.ts
+++ b/newback/src/modules/rest/database/repository/messages.repository.ts
@@ -1,22 +1,17 @@
 import {Injectable} from "@nestjs/common";
 import {InjectModel} from "@nestjs/sequelize";
 import type {
+  CreateOptions,
+  Model,
   Transaction,
 } from "sequelize";
-import {
-  Op,
-} from "sequelize";
+import {Op} from "sequelize";
 import {MessageModel} from "@/data/model/message.model";
-import type {
-  ImageType,
-} from "@/data/types/frontend";
-import {
-  Gender,
-  MessageStatus,
-} from "@/data/types/frontend";
+import {MessageStatus} from "@/data/types/frontend";
 import {ImageModel} from "@/data/model/image.model";
 import {MessageMentionModel} from "@/data/model/message.mention.model";
 import {UploadedFileModel} from "@/data/model/uploaded.file.model";
+import type {CreateModel} from "@/data/types/internal";
 
 
 @Injectable()
@@ -29,6 +24,11 @@ export class MessageRepository {
   ) {
   }
 
+  public attachHooks(): void {
+    this.messageModel.afterCreate(async(message, options) => this.incrementThreadMessageCount(options, message));
+    this.messageModel.afterBulkCreate(async(messages, options) => this.incrementThreadMessageCount(options, ...messages));
+  }
+
   public async getNewOnServerMessages(roomIds: number[], messageIds: number[], lastSynced: number): Promise<MessageModel[]> {
     return this.messageModel.findAll({
       where: {
@@ -65,13 +65,14 @@ export class MessageRepository {
     })).map((m) => m.id);
   }
 
-  public async getImagesByMessagesId(messageIds: number[]): Promise<ImageModel[]> {
+  public async getImagesByMessagesId(messageIds: number[], transaction?: Transaction): Promise<ImageModel[]> {
     return this.imageModel.findAll({
       where: {
         messageId: {
           [Op.in]: messageIds,
         },
       },
+      transaction,
     });
   }
 
@@ -89,12 +90,7 @@ export class MessageRepository {
     });
   }
 
-  public async saveUploadFile(data: {
-    type: ImageType;
-    symbol: string;
-    userId: number;
-    file: string;
-  }, transaction: Transaction): Promise<number> {
+  public async saveUploadFile(data: CreateModel<UploadedFileModel>, transaction: Transaction): Promise<number> {
     const result = await this.uploadedFileModel.create(data, {transaction});
     return result.id;
   }
@@ -118,6 +114,24 @@ export class MessageRepository {
     });
   }
 
+  public async deleteUploadedFiles(
+    ids: number[],
+    transaction: Transaction
+  ): Promise<UploadedFileModel[]> {
+    if (!ids.length) {
+      return [];
+    }
+    await this.uploadedFileModel.destroy({
+      where: {
+        id: {
+          [Op.in]: ids,
+        },
+      },
+      force: true,
+      transaction,
+    });
+  }
+
   public async getTagsByMessagesId(messageIds: number[]): Promise<MessageMentionModel[]> {
     return this.messageMentionModel.findAll({
       where: {
@@ -128,20 +142,40 @@ export class MessageRepository {
     });
   }
 
-  public async createMessage(data: Partial<MessageModel>, transaction: Transaction): Promise<number> {
+  public async createMessage(data: CreateModel<MessageModel>, transaction: Transaction): Promise<number> {
     const messageModel = await this.messageModel.create(data, {transaction});
     return messageModel.id;
   }
 
-  public async createMessageMentions(data: Partial<MessageMentionModel>[], transaction: Transaction): Promise<void> {
+  public async createMessageMentions(data: CreateModel<MessageMentionModel>[], transaction: Transaction): Promise<void> {
+    if (!data.length) {
+      return;
+    }
     await this.messageMentionModel.bulkCreate(data, {
       transaction,
     });
   }
 
-  public async createImages(data: Partial<ImageModel>[], transaction: Transaction): Promise<void> {
+  public async createImages(data: CreateModel<ImageModel>[], transaction: Transaction): Promise<void> {
     await this.imageModel.bulkCreate(data, {
       transaction,
     });
   }
+
+  /** This should not be called manually, only atomatically by messsage.hook */
+  private async incrementThreadMessageCount(options: CreateOptions<MessageModel>, ...messages: Model<MessageModel>[]): Promise<void> {
+    // Not null
+    const ids = messages.map((message) => message.getDataValue("parentMessageId")).filter((id) => id);
+    if (ids.length) {
+      await this.messageModel.increment("threadMessageCount", {
+        where: {
+          id: {
+            [Op.in]: ids,
+          },
+        },
+        by: 1,
+        transaction: options.transaction,
+      });
+    }
+  }
 }
diff --git a/newback/src/modules/rest/database/repository/room.repository.ts b/newback/src/modules/rest/database/repository/room.repository.ts
index 27d05cde4..23cf04382 100644
--- a/newback/src/modules/rest/database/repository/room.repository.ts
+++ b/newback/src/modules/rest/database/repository/room.repository.ts
@@ -9,12 +9,7 @@ import {
   Op,
 } from "sequelize";
 import {ChannelModel} from "@/data/model/channel.model";
-
-type RoomSingleRoomUser = Omit<RoomModel, "roomUsers">;
-
-export interface GetRoomsForUser extends RoomSingleRoomUser {
-  roomUsers: RoomUsersModel;
-}
+import {GetRoomsForUser} from '@/data/types/internal';
 
 @Injectable()
 export class RoomRepository {
diff --git a/newback/src/modules/rest/database/repository/user.repository.ts b/newback/src/modules/rest/database/repository/user.repository.ts
index 5dd96030a..ef27390ee 100644
--- a/newback/src/modules/rest/database/repository/user.repository.ts
+++ b/newback/src/modules/rest/database/repository/user.repository.ts
@@ -94,14 +94,14 @@ export class UserRepository {
       where: {username},
       raw: true,
       transaction,
-    }) != null;
+    }) !== null;
   }
 
   public async checkUserExistByEmail(email: string): Promise<boolean> {
     return await this.userAuthModel.findOne({
       where: {email},
       raw: true,
-    }) != null;
+    }) !== null;
   }
 
   public async getUserByEmail(email: string, transaction?: Transaction): Promise<UserAuthModel | null> {
@@ -109,12 +109,15 @@ export class UserRepository {
       where: {email},
       raw: true,
       transaction,
-      include: ["user", // LEFT OUTER JOIN "id" = "user"."id"
-      ],
+      // LEFT OUTER JOIN "id" = "user"."id"
+      include: ["user"],
     });
   }
 
-  public async getUserByUserName(username: string, includeFields: ("userAuth" | "userProfile")[] = [], transaction?: Transaction): Promise<UserModel | null> {
+  public async getUserByUserName(
+    username: string,
+    includeFields: ("userAuth" | "userProfile")[] = [], transaction?: Transaction
+  ): Promise<UserModel | null> {
     return this.userModel.findOne({
       where: {username},
       transaction,
@@ -123,7 +126,11 @@ export class UserRepository {
     });
   }
 
-  public async getById(id: number, includeFields: ("userAuth" | "userProfile" | "userSettings")[] = [], transaction?: Transaction): Promise<UserModel | null> {
+  public async getById(
+    id: number,
+    includeFields: ("userAuth" | "userProfile" | "userSettings")[] = [],
+    transaction?: Transaction
+  ): Promise<UserModel | null> {
     return this.userModel.findOne({
       where: {id},
       transaction,
diff --git a/newback/src/modules/rest/database/repository/verification.repository.ts b/newback/src/modules/rest/database/repository/verification.repository.ts
index dc133220b..d2afcf620 100644
--- a/newback/src/modules/rest/database/repository/verification.repository.ts
+++ b/newback/src/modules/rest/database/repository/verification.repository.ts
@@ -4,7 +4,10 @@ import {UserAuthModel} from "@/data/model/user.auth.model";
 import type {VerificationType} from "@/data/types/frontend";
 import {VerificationModel} from "@/data/model/verification.model";
 import type {Transaction} from "sequelize";
-import {RequireAtLeastOne} from '@/data/types/internal';
+import {
+  CreateModel,
+  RequireAtLeastOne
+} from '@/data/types/internal';
 
 
 @Injectable()
@@ -39,7 +42,7 @@ export class VerificationRepository {
     });
   }
 
-  public async createVerification(data: RequireAtLeastOne<Partial<VerificationModel>, 'userId'>, transaction: Transaction): Promise<void> {
+  public async createVerification(data: RequireAtLeastOne<CreateModel<VerificationModel>, 'userId'>, transaction: Transaction): Promise<void> {
     const verification = await this.verificationModel.create(data, {
       raw: true,
       transaction,
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/rest/ip/ip.cache.service.ts
index 375688bf0..0a2404338 100644
--- a/newback/src/modules/rest/ip/ip.cache.service.ts
+++ b/newback/src/modules/rest/ip/ip.cache.service.ts
@@ -6,16 +6,32 @@ import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
 import {IpService} from "@/modules/rest/ip/ip.service";
 import type {IpAddressModel} from "@/data/model/ip.address.model";
 
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
 import type {InvalidIpException} from "@/data/exceptions/invalid.ip.exception";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
+import type {CreateModel} from "@/data/types/internal";
 
 @Injectable()
 export class IpCacheService {
+  private inited: boolean = false;
+
   public constructor(
     private readonly ipService: IpService,
     private readonly ipRepository: IpRepository,
     private readonly logger: Logger,
+    private readonly redisService: RedisService
   ) {
+    this.ipRepository.connectCreateHook(async() => this.redisService.setIps(null));
+  }
+
+  public async getSavedIpsInfo(): Promise<UserJoinedInfoModel[]> {
+    let ips = await this.redisService.getIps();
+    if (!ips || !this.inited) {
+      ips = await this.ipRepository.getAllIps();
+      await this.redisService.setIps(ips);
+      this.inited = true;
+    }
+    return ips;
   }
 
   public async getIpString(ip: string): Promise<string> {
@@ -33,14 +49,14 @@ export class IpCacheService {
     }
   }
 
-  public async getIpInfo(ip: string): Promise<Partial<IpAddressModel>> {
+  public async getIpInfo(ip: string): Promise<IpAddressModel> {
     const response = await this.ipRepository.getIp(ip);
     if (response && !response.status) {
       return null;
     }
     try {
       const ipInfo = await this.ipService.getIpInfo(ip);
-      const model: Partial<IpAddressModel> = {
+      const model: CreateModel<IpAddressModel> = {
         ip,
         status: true,
         isp: ipInfo.isp,
@@ -51,14 +67,25 @@ export class IpCacheService {
         lon: ipInfo.lon,
         zip: ipInfo.zip,
         timezone: ipInfo.timezone,
+        countryCode: ipInfo.countryCode,
       };
-      await this.ipRepository.saveIP(model);
-      return model;
+      return await this.ipRepository.saveIP(model);
     } catch (e: any) {
       this.logger.error(`Unable to get Ip Address Info ${ip} ${e.error}`, e.stack, "ip.cache.service");
       if (!(e as InvalidIpException).networkError) {
-        await this.ipRepository.saveIP({ip,
-          status: false});
+        await this.ipRepository.saveIP({
+          ip,
+          status: false,
+          countryCode: null,
+          city: null,
+          isp: null,
+          lon: null,
+          region: null,
+          lat: null,
+          zip: null,
+          country: null,
+          timezone: null,
+        });
         return null;
       }
       return null;
diff --git a/newback/src/modules/rest/ip/ip.module.ts b/newback/src/modules/rest/ip/ip.module.ts
index 6e57be063..843a56bad 100644
--- a/newback/src/modules/rest/ip/ip.module.ts
+++ b/newback/src/modules/rest/ip/ip.module.ts
@@ -5,11 +5,12 @@ import {
 import {IpService} from "@/modules/rest/ip/ip.service";
 import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
 import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {RedisService} from "@/modules/rest/redis/redis.service";
 
 @Global()
 @Module({
   imports: [DatabaseModule],
-  providers: [IpService, IpCacheService],
+  providers: [IpService, IpCacheService, RedisService],
   exports: [IpCacheService],
 })
 export class IpModule {
diff --git a/newback/src/modules/rest/redis/redis.service.ts b/newback/src/modules/rest/redis/redis.service.ts
index 46e69a48a..6d5439e95 100644
--- a/newback/src/modules/rest/redis/redis.service.ts
+++ b/newback/src/modules/rest/redis/redis.service.ts
@@ -2,14 +2,13 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {
-  REDIS_KEYS,
-} from "@/utils/consts";
+import {REDIS_KEYS} from "@/utils/consts";
 import {
   InjectRedis,
   Redis,
 } from "@nestjs-modules/ioredis";
 import type {UserOnlineData} from "@/data/types/internal";
+import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 
 @Injectable()
 export class RedisService {
@@ -25,6 +24,21 @@ export class RedisService {
     await this.redis.hset(REDIS_KEYS.REDIS_SESSIONS_KEY, session, userId);
   }
 
+  public async getIps(): Promise<UserJoinedInfoModel[]> {
+    const newNow = await this.redis.get(REDIS_KEYS.REDIS_IPS_KEY);
+    if (newNow) {
+      try {
+        return JSON.parse(newNow);
+      } catch (e) {
+      }
+    }
+    return null;
+  }
+
+  public async setIps(value: UserJoinedInfoModel[]): Promise<void> {
+    await this.redis.set(REDIS_KEYS.REDIS_IPS_KEY, JSON.stringify(value));
+  }
+
   public async removeSession(session: string) {
     this.logger.debug(`hdel ${REDIS_KEYS.REDIS_SESSIONS_KEY}[${session}]`, "redis");
     await this.redis.hdel(REDIS_KEYS.REDIS_SESSIONS_KEY, session);
diff --git a/newback/src/utils/consts.ts b/newback/src/utils/consts.ts
index 8208bfa00..906486ded 100644
--- a/newback/src/utils/consts.ts
+++ b/newback/src/utils/consts.ts
@@ -4,4 +4,5 @@ export const MAX_USERNAME_LENGTH = 16;
 export enum REDIS_KEYS {
   REDIS_SESSIONS_KEY = "sessions",
   REDIS_ONLINE_KEY = "online",
+  REDIS_IPS_KEY = "ips",
 }
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index f8989efa8..1bc794369 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -1,5 +1,3 @@
-#!/usr/bin/yarn ts-node --compiler ttypescript ./src/utils/migration.old.ts
-
 import {DatabaseModule} from "@/modules/rest/database/database.module";
 import {ConsoleLogger} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
@@ -54,7 +52,8 @@ async function bootstrap() {
       },
 
     ],
-  }).setLogger(new ConsoleLogger()).compile();
+  }).setLogger(new ConsoleLogger()).
+    compile();
 
   const userModel: typeof UserModel = app.get(getModelToken(UserModel));
   const userJoinedInfoModel: typeof UserJoinedInfoModel = app.get(getModelToken(UserJoinedInfoModel));
@@ -74,6 +73,22 @@ async function bootstrap() {
   const ipAddressModel: typeof IpAddressModel = app.get(getModelToken(IpAddressModel));
   const sequelize = app.get(Sequelize);
   await sequelize.transaction(async(transaction) => {
+    await messageHistoryModel.destroy({where: {}, truncate: true,});
+    await imageModel.destroy({where: {}, truncate: true,});
+    await subscriptionMessageModel.destroy({where: {}, truncate: true,});
+    await messageMentionModel.destroy({where: {}, truncate: true,});
+    await userProfileModel.destroy({where: {}, truncate: true,});
+    await userAuthModel.destroy({where: {}, truncate: true,});
+    await verificationModel.destroy({where: {}, truncate: true,});
+    await userJoinedInfoModel.destroy({where: {}, truncate: true,});
+    await uploadedFileModel.destroy({where: {}, truncate: true,});
+    await subscriptionModel.destroy({where: {}, truncate: true,});
+    await roomUsersModel.destroy({where: {}, truncate: true,});
+    await messageModel.destroy({where: {}, truncate: true,});
+    await roomModel.destroy({where: {}, truncate: true,});
+    await ipAddressModel.destroy({where: {}, truncate: true,});
+    await channelModel.destroy({where: {}, truncate: true,});
+    await userModel.destroy({where: {}, truncate: true,});
     const users: UserModel[] = pychat_chat_user.map((a) => {
       const b: UserModel = {
         lastTimeOnline: a.last_time_online,
@@ -142,7 +157,7 @@ async function bootstrap() {
         messageStatus: {
           u: "ON_SERVER",
           r: "READ",
-          s: "RECEIVED"
+          s: "RECEIVED",
         }[key.message_status],
         threadMessageCount: key.thread_messages_count,
         parentMessageId: key.parent_message_id,
@@ -187,7 +202,7 @@ async function bootstrap() {
         type: {
           v: "VIDEO",
           i: "IMAGE",
-          f: "FILE"
+          f: "FILE",
         }[key.type],
         symbol: key.symbol,
         userId: key.user_id,
@@ -229,7 +244,7 @@ async function bootstrap() {
 
     const auth = pychat_chat_userprofile.map((u) => ({
       ...u,
-      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id)
+      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id),
     })).map((key) => {
       const result: UserAuthModel = {
         id: key.id,
@@ -246,7 +261,7 @@ async function bootstrap() {
 
     const userProf = pychat_chat_userprofile.map((u) => ({
       ...u,
-      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id)
+      ...pychat_chat_user.find((us) => us.id == u.user_ptr_id),
     })).map((key) => {
       const result: UserProfileModel = {
         id: key.id,
@@ -296,8 +311,8 @@ async function bootstrap() {
         }[key.type],
         symbol: key.symbol,
         messageId: key.message_id,
-        img: key.type === 'g' ? key.absolute_url : key.img,
-        preview: key.type === 'g' ? key.webp_absolute_url : key.preview,
+        img: key.type === "g" ? key.absolute_url : key.img,
+        preview: key.type === "g" ? key.webp_absolute_url : key.preview,
       } as any;
       return result;
     });

From 2f884b9b7fe1dc963bd89fc5b7f1e415e9d11c1a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 22:10:11 +0300
Subject: [PATCH 077/221] Structure transformers, continue working on
 printmesage and image support

---
 .excludeMAIN                                  |   2 +
 common/dto.ts                                 |  13 +-
 .../ts/message_handlers/WsMessageHandler.ts   |   5 +-
 newback/photos/.gitkeep                       |   0
 newback/src/config/Config.d.ts                |  13 +
 newback/src/data/types/internal.ts            |  21 +-
 .../src/modules/api/auth/auth.module.spec.ts  | 198 ++++++-------
 newback/src/modules/api/auth/auth.service.ts  |  44 ++-
 .../validators/sign.up.request.validator.ts   |   4 +-
 .../src/modules/api/file/file.controller.ts   |   8 +-
 newback/src/modules/api/file/file.service.ts  |   2 +-
 .../modules/api/file/image.service.spec.ts    |  20 +-
 newback/src/modules/api/file/image.service.ts |  12 +-
 .../modules/api/verify/verify.module.spec.ts  | 122 ++++----
 .../src/modules/api/verify/verify.service.ts  |   4 +-
 .../modules/api/websocket/message.service.ts  |  57 ++--
 .../add.online.user.transformer.ts            |  14 +
 .../transformers/channel.transformer.ts       |  10 +
 .../get.user.contries.transformer.ts          |  21 ++
 .../transformers/image.transformer.ts         |  26 ++
 .../transformers/inner.transformer.ts         |  11 +-
 .../transformers/mention.transformer.ts       |  20 ++
 .../transformers/message.transformer.ts       |  28 ++
 .../transformers/print.message.transformer.ts |  21 ++
 .../transformers/profile.transformer.ts       |  17 ++
 .../remove.online.user.transformer.ts         |  16 +
 .../transformers/room.transformer.ts          |  24 ++
 .../transformers/set.ws.id.transformer.ts     |  33 +++
 .../transformers/settings.transformer.ts      |  16 +
 .../transformers/sync.message.transformer.ts  |  19 ++
 .../transformers/user.transformer.ts          |  13 +
 .../websocket/transformers/ws.transformer.ts  | 277 ------------------
 .../websocket/websocket.gateway.e2e.spec.ts   |   8 +-
 .../api/websocket/websocket.gateway.ts        |   6 +-
 .../modules/api/websocket/websocket.module.ts |  16 +-
 .../api/websocket/websocket.service.ts        |   8 +-
 .../modules/api/websocket/ws.data.service.ts  |   2 +-
 .../api/websocket/ws.exception.filter.ts      |   4 +-
 newback/src/modules/app/app.module.ts         |   2 +-
 .../modules/app/decorators/catch.ws.errors.ts |   5 +-
 .../app/decorators/user.id.decorator.ts       |   4 +-
 .../app/decorators/ws.context.decorator.ts    |   8 +-
 newback/src/modules/app/guards/auth.guard.ts  |   4 +-
 .../src/modules/app/guards/captcha.guard.ts   |   6 +-
 .../modules/app/guards/own.message.guard.ts   |   4 +-
 .../src/modules/app/guards/own.room.guard.ts  |   4 +-
 .../rest/database/repository/ip.repository.ts |   4 +-
 .../repository/message.repository.e2e.spec.ts |   2 +-
 .../repository/messages.repository.ts         |   5 +-
 .../database/repository/room.repository.ts    |  10 +-
 .../database/repository/user.repository.ts    |  32 +-
 .../repository/verification.repository.ts     |   9 +-
 .../modules/rest/email/email.service.spec.ts  |  14 +-
 .../modules/rest/html/html.service.spec.ts    |   6 +-
 .../modules/rest/ip/ip.service.e2e.spec.ts    |   8 +-
 .../modules/rest/password/password.service.ts |   1 -
 .../src/modules/rest/pubsub/pubsub.service.ts |   3 +-
 .../src/modules/rest/ws.adapter/ws.adapter.ts |  16 +-
 .../src/templates/change.password.start.html  |   3 +-
 newback/src/utils/helpers.ts                  |   4 +-
 newback/src/utils/migration.old.ts            |  48 ++-
 61 files changed, 658 insertions(+), 679 deletions(-)
 create mode 100644 newback/photos/.gitkeep
 create mode 100644 newback/src/modules/api/websocket/transformers/add.online.user.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/channel.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/get.user.contries.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/image.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/mention.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/message.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/print.message.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/profile.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/remove.online.user.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/room.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/set.ws.id.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/settings.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/sync.message.transformer.ts
 create mode 100644 newback/src/modules/api/websocket/transformers/user.transformer.ts
 delete mode 100644 newback/src/modules/api/websocket/transformers/ws.transformer.ts

diff --git a/.excludeMAIN b/.excludeMAIN
index 1f6536db9..0ace84135 100644
--- a/.excludeMAIN
+++ b/.excludeMAIN
@@ -20,5 +20,7 @@ backend/chat/production.py
 backend/chat/settings.py
 backend/photos/*
 !backend/photos/.gitkeep
+newback/photos/*
+!newback/photos/.gitkeep
 frontend/build/production.json
 newback/src/config/env/default.json
diff --git a/common/dto.ts b/common/dto.ts
index 444075053..115e27ed2 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -373,7 +373,8 @@ export interface PrintMessageWsOutMessage extends DefaultMessage<"printMessage">
   giphies: GiphyDto[];
 }
 
-export interface PrintMessageWsInMessage extends DefaultWsInMessage<"printMessage", "ws-message">, MessageModelDto {
+export interface PrintMessageWsInMessage extends DefaultWsInMessage<"printMessage", "ws-message"> {
+  message: MessageModelDto;
 }
 
 export interface AddOnlineUserMessage extends DefaultWsInMessage<"addOnlineUser", "room">, ChangeUserOnlineBase {
@@ -589,7 +590,15 @@ export interface UserProfileDtoWoImage {
   id: number;
 }
 
-export declare type LogLevel = "debug" | "disable" | "error" | "info" | "log_raise_error" | "log_with_warnings" | "trace" | "warn";
+export declare type LogLevel =
+  "debug"
+  | "disable"
+  | "error"
+  | "info"
+  | "log_raise_error"
+  | "log_with_warnings"
+  | "trace"
+  | "warn";
 
 export interface UserSettingsDto {
   embeddedYoutube: boolean;
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 11d7d5d54..c5c8051fc 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -217,7 +217,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       const rmMes: RoomMessageIds = {
         messageId: storeMessage.id,
         roomId: storeMessage.roomId,
-        newMessageId: a.id,
+        newMessageId: a.message.id,
       };
       this.store.deleteMessage(rmMes);
     } else if (storeMessage.id > 0) {
@@ -353,7 +353,8 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     }
   }
 
-  public async printMessage(inMessage: PrintMessageWsInMessage) {
+  public async printMessage(request: PrintMessageWsInMessage) {
+    let inMessage: MessageModelDto = request.message;
     const message: MessageModel = convertMessageModelDtoToModel(inMessage, null, (time) => this.ws.convertServerTimeToPC(time));
     this.messageHelper.processUnknownP2pMessage(message);
     if (inMessage.userId !== this.store.myId) {
diff --git a/newback/photos/.gitkeep b/newback/photos/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/newback/src/config/Config.d.ts b/newback/src/config/Config.d.ts
index 7010d50fa..44fe71045 100644
--- a/newback/src/config/Config.d.ts
+++ b/newback/src/config/Config.d.ts
@@ -11,30 +11,37 @@ declare module "node-ts-config" {
     recaptcha: Recaptcha
     email: Email
   }
+
   interface Email {
     host: string
     port: number
     secure: boolean
     auth: Auth2
   }
+
   interface Auth2 {
     user: string
     pass: string
   }
+
   interface Recaptcha {
     publicKey: string
     privateKey: string
   }
+
   interface Auth {
     google: Google
     facebook: Facebook
   }
+
   interface Facebook {
     accessToken: string
   }
+
   interface Google {
     clientId: string
   }
+
   interface Mysql {
     host: string
     port: number
@@ -44,6 +51,7 @@ declare module "node-ts-config" {
     synchronize: boolean
     logging: boolean
   }
+
   interface Frontend {
     address: string
     jsConsoleLogs: string
@@ -51,15 +59,18 @@ declare module "node-ts-config" {
     issueReportLink: string
     chromeExtension: ChromeExtension
   }
+
   interface ChromeExtension {
     id: string
     url: string
   }
+
   interface Redis {
     host: string
     port: number
     database: number
   }
+
   interface Settings {
     wsIdCharLength: number
     allRedisRoom: string
@@ -70,6 +81,7 @@ declare module "node-ts-config" {
     pingInterval: number
     clientNoServerPingCloseTimeout: number
   }
+
   interface Application {
     env: string
     port: number
@@ -78,6 +90,7 @@ declare module "node-ts-config" {
     crtPath: string
     keyPath: string
   }
+
   export const config: Config
   export type Config = IConfig
 }
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index a6febadc9..c2082bc0b 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,18 +1,24 @@
-import type {DefaultWsInMessage, MessageStatus} from "@/data/types/frontend";
+import type {DefaultWsInMessage} from "@/data/types/frontend";
 import type {RoomModel} from "@/data/model/room.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
-import {ChannelModel} from '@/data/model/channel.model';
-import {UserModel} from '@/data/model/user.model';
+import type {ChannelModel} from "@/data/model/channel.model";
+import type {UserModel} from "@/data/model/user.model";
 
 export interface WebSocketContextData {
   userId: number;
   id: string;
+
   sendToClient(data: DefaultWsInMessage<any, any>);
 }
+
 export type UserOnlineData = Record<string, string[]>;
 
 // https://stackoverflow.com/questions/48881009/convert-tinyint-field-as-boolean-in-result-using-sequelize-raw-query-node-js
-export type MysqlBool = 0 | 1 | false | true;
+export type MysqlBool =
+  0
+  | 1
+  | false
+  | true;
 
 export interface FileSaveResponse {
   originFileName: string;
@@ -38,9 +44,10 @@ export interface GetRoomsForUser extends RoomSingleRoomUser {
 
 // https://stackoverflow.com/a/49725198/3872976
 export type RequireAtLeastOne<T, Keys extends keyof T = keyof T> =
-    {
-      [K in Keys]-?: Partial<Pick<T, Exclude<Keys, K>>> & Required<Pick<T, K>>
-    }[Keys] & Pick<T, Exclude<keyof T, Keys>>;
+  {
+    [K in Keys]-?: Partial<Pick<T, Exclude<Keys, K>>> & Required<Pick<T, K>>
+  }[Keys]
+  & Pick<T, Exclude<keyof T, Keys>>;
 
 
 // Based on https://stackoverflow.com/a/69756175/3872976
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 670722249..d732bd201 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -26,12 +26,8 @@ import * as googleResponseFixture from "@/fixtures/google.response.fixture.json"
 import * as facebookGetTokenResponseFixture from "@/fixtures/facebook.get.token.response.json";
 import * as facebookGetUserResponseFixture from "@/fixtures/facebook.get.user.response.json";
 import {ConfigService} from "@/modules/rest/config/config.service";
-import type {
-  IConfig,
-} from "node-ts-config";
-import {
-  config,
-} from "node-ts-config";
+import type {IConfig} from "node-ts-config";
+import {config} from "node-ts-config";
 import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
 import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
 import {IpService} from "@/modules/rest/ip/ip.service";
@@ -155,11 +151,10 @@ describe("AuthModule", () => {
   describe("sign-in", () => {
     it("should throw if user not exists", async() => {
       userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request.
-        post("/api/auth/sign-in").send({
-          username: "a",
-          password: "as$",
-        }).
+      await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "as$",
+      }).
         expect(409, {
           error: "Conflict",
           message: "User with login doesn't exists",
@@ -173,11 +168,10 @@ describe("AuthModule", () => {
           privateKey: "a",
         },
       } as IConfig);
-      const {body} = await request.
-        post("/api/auth/sign-in").send({
-          username: "a",
-          password: "as$",
-        }).
+      const {body} = await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "as$",
+      }).
         expect(400, {
           statusCode: 400,
           message: "Captcha is missing",
@@ -201,12 +195,11 @@ describe("AuthModule", () => {
         },
       } as IConfig);
       nodeApply = jest.fn().mockReturnValue({json: jest.fn().mockResolvedValue({success: true})});
-      const {body} = await request.
-        post("/api/auth/sign-in").send({
-          username: "a",
-          password: "koko",
-          captcha: "asd",
-        });
+      const {body} = await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "koko",
+        captcha: "asd",
+      });
       expect(body).toMatchObject({session: expect.any(String)});
     });
 
@@ -217,11 +210,10 @@ describe("AuthModule", () => {
         },
         id: 3,
       });
-      const {body} = await request.
-        post("/api/auth/sign-in").send({
-          username: "a",
-          password: "as$",
-        }).
+      const {body} = await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "as$",
+      }).
         expect(401, {
           error: "Unauthorized",
           message: "Invalid password",
@@ -238,11 +230,10 @@ describe("AuthModule", () => {
         },
         id: 3,
       });
-      const {body} = await request.
-        post("/api/auth/sign-in").send({
-          username: "a",
-          password: "koko",
-        });
+      const {body} = await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "koko",
+      });
       expect(body).toMatchObject({session: expect.any(String)});
     });
   });
@@ -260,10 +251,9 @@ describe("AuthModule", () => {
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
         getPayload: jest.fn().mockReturnValue(googleResponseFixture),
       });
-      const {body} = await request.
-        post("/api/auth/google-sign-in").send({
-          token: "aasdasd",
-        }).
+      const {body} = await request.post("/api/auth/google-sign-in").send({
+        token: "aasdasd",
+      }).
         expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
@@ -282,10 +272,9 @@ describe("AuthModule", () => {
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
         getPayload: jest.fn().mockReturnValue(googleResponseFixture),
       });
-      const {body} = await request.
-        post("/api/auth/google-sign-in").send({
-          token: "aasdasd",
-        }).
+      const {body} = await request.post("/api/auth/google-sign-in").send({
+        token: "aasdasd",
+      }).
         expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
@@ -317,10 +306,9 @@ describe("AuthModule", () => {
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
         getPayload: jest.fn().mockReturnValue(googleResponseFixture),
       });
-      const {body} = await request.
-        post("/api/auth/google-sign-in").send({
-          token: "aasdasd",
-        }).
+      const {body} = await request.post("/api/auth/google-sign-in").send({
+        token: "aasdasd",
+      }).
         expect(409);
       expect(body).toMatchObject({
         error: "Conflict",
@@ -335,8 +323,7 @@ describe("AuthModule", () => {
     it("should login if user exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      nodeApply = jest.fn().
-        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
+      nodeApply = jest.fn().mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
         mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
       configService.getConfig = jest.fn().mockReturnValue({
         auth: {
@@ -351,10 +338,9 @@ describe("AuthModule", () => {
           username: "as",
         },
       });
-      const {body} = await request.
-        post("/api/auth/facebook-sign-in").send({
-          token: "aasdasd",
-        }).
+      const {body} = await request.post("/api/auth/facebook-sign-in").send({
+        token: "aasdasd",
+      }).
         expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
@@ -365,8 +351,7 @@ describe("AuthModule", () => {
       sequelize.transaction = (resolve) => resolve("transaction");
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
 
-      nodeApply = jest.fn().
-        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
+      nodeApply = jest.fn().mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
         mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
       configService.getConfig = jest.fn().mockReturnValue({
         auth: {
@@ -384,10 +369,9 @@ describe("AuthModule", () => {
       oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
         getPayload: jest.fn().mockReturnValue(googleResponseFixture),
       });
-      const {body} = await request.
-        post("/api/auth/facebook-sign-in").send({
-          token: "aasdasd",
-        }).
+      const {body} = await request.post("/api/auth/facebook-sign-in").send({
+        token: "aasdasd",
+      }).
         expect(201);
       expect(body).toMatchObject({
         session: expect.any(String),
@@ -412,18 +396,19 @@ describe("AuthModule", () => {
       userRepository.createUser = jest.fn().mockResolvedValue(3);
       roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      const {body} = await request.
-        post("/api/auth/sign-up").send({
-          username: "a",
-          password: "as$",
-        }).
+      const {body} = await request.post("/api/auth/sign-up").send({
+        username: "a",
+        password: "as$",
+      }).
         expect(201);
 
       expect(body).toMatchObject({session: expect.any(String)});
     });
     it("sends an email", async() => {
-      configService.getConfig = jest.fn().mockReturnValue({...config,
-        email: {}});
+      configService.getConfig = jest.fn().mockReturnValue({
+        ...config,
+        email: {},
+      });
       sequelize.transaction = (resolve) => resolve();
       verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
@@ -438,12 +423,11 @@ describe("AuthModule", () => {
       } as IpAddressModel);
       const spy = jest.spyOn(mailerService, "sendMail").mockResolvedValue(true);
       redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      const {body} = await request.
-        post("/api/auth/sign-up").send({
-          username: "a",
-          password: "as$",
-          email: "death@gmail.com",
-        }).
+      const {body} = await request.post("/api/auth/sign-up").send({
+        username: "a",
+        password: "as$",
+        email: "death@gmail.com",
+      }).
         expect(201);
 
       expect(body).toMatchObject({session: expect.any(String)});
@@ -455,11 +439,10 @@ describe("AuthModule", () => {
     it("throws an error if user exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
-      const {body} = await request.
-        post("/api/auth/sign-up").send({
-          username: "a",
-          password: "as$",
-        }).
+      const {body} = await request.post("/api/auth/sign-up").send({
+        username: "a",
+        password: "as$",
+      }).
         expect(409, {
           error: "Conflict",
           message: "User with this username already exist",
@@ -470,12 +453,11 @@ describe("AuthModule", () => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
-      const {body} = await request.
-        post("/api/auth/sign-up").send({
-          username: "a",
-          password: "as$",
-          email: "death@gmail.com",
-        }).
+      const {body} = await request.post("/api/auth/sign-up").send({
+        username: "a",
+        password: "as$",
+        email: "death@gmail.com",
+      }).
         expect(409, {
           error: "Conflict",
           message: "User with this email already exist",
@@ -487,18 +469,16 @@ describe("AuthModule", () => {
   describe("validate-email", () => {
     it("should return ok", async() => {
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
-      await request.
-        post("/api/auth/validate-email").send({
-          email: "blah@gmail.com",
-        }).
+      await request.post("/api/auth/validate-email").send({
+        email: "blah@gmail.com",
+      }).
         expect(201, {ok: true});
     });
     it("should error if email exists", async() => {
       userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
-      await request.
-        post("/api/auth/validate-email").send({
-          email: "exist@gmail.com",
-        }).
+      await request.post("/api/auth/validate-email").send({
+        email: "exist@gmail.com",
+      }).
         expect(409, {
           error: "Conflict",
           message: "User with this email already exist",
@@ -506,10 +486,9 @@ describe("AuthModule", () => {
         });
     });
     it("should give error on invalid email", async() => {
-      await request.
-        post("/api/auth/validate-email").send({
-          email: "invalidemail",
-        }).
+      await request.post("/api/auth/validate-email").send({
+        email: "invalidemail",
+      }).
         expect(400, {
           error: "Bad Request",
           message: ["email must be an email"],
@@ -520,18 +499,16 @@ describe("AuthModule", () => {
   describe("validate-user", () => {
     it("should return ok", async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      await request.
-        post("/api/auth/validate-user").send({
-          username: "a",
-        }).
+      await request.post("/api/auth/validate-user").send({
+        username: "a",
+      }).
         expect(201, {ok: true});
     });
     it("should error if user exists", async() => {
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
-      await request.
-        post("/api/auth/validate-user").send({
-          username: "a",
-        }).
+      await request.post("/api/auth/validate-user").send({
+        username: "a",
+      }).
         expect(409, {
           error: "Conflict",
           message: "User with this username already exist",
@@ -539,10 +516,9 @@ describe("AuthModule", () => {
         });
     });
     it("should give error on invalid character for username", async() => {
-      await request.
-        post("/api/auth/validate-user").send({
-          username: "%",
-        }).
+      await request.post("/api/auth/validate-user").send({
+        username: "%",
+      }).
         expect(400, {
           error: "Bad Request",
           message: ["Username can only contain latin characters, numbers and symbols '-' '_'"],
@@ -550,10 +526,9 @@ describe("AuthModule", () => {
         });
     });
     it("should give error on invalid and also correct ones", async() => {
-      await request.
-        post("/api/auth/validate-user").send({
-          username: "%asfasdf",
-        }).
+      await request.post("/api/auth/validate-user").send({
+        username: "%asfasdf",
+      }).
         expect(400, {
           error: "Bad Request",
           message: ["Username can only contain latin characters, numbers and symbols '-' '_'"],
@@ -561,10 +536,9 @@ describe("AuthModule", () => {
         });
     });
     it("should give error if username has great length", async() => {
-      await request.
-        post("/api/auth/validate-user").send({
-          username: "1234567890123456789",
-        }).
+      await request.post("/api/auth/validate-user").send({
+        username: "1234567890123456789",
+      }).
         expect(400, {
           error: "Bad Request",
           message: ["Username should be 1-16 characters"],
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 04507f2a6..c7b7fccbc 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -6,14 +6,16 @@ import {
 } from "@nestjs/common";
 import {UserRepository} from "@/modules/rest/database/repository/user.repository";
 import {PasswordService} from "@/modules/rest/password/password.service";
-import type {FaceBookAuthRequest,
+import type {
+  FaceBookAuthRequest,
   FacebookSignInResponse,
   GoogleAuthRequest,
   GoogleSignInResponse,
   SignInRequest,
   SignInResponse,
   SignUpRequest,
-  SignUpResponse} from "@/data/types/frontend";
+  SignUpResponse,
+} from "@/data/types/frontend";
 import {
   Gender,
   VerificationType,
@@ -59,8 +61,10 @@ export class AuthService {
       const userAuth = await this.userRepository.getUserMyAuthFacebook(fbResponse.id, t);
       if (userAuth) {
         const session = await this.sessionService.createAndSaveSession(userAuth.id);
-        const response: FacebookSignInResponse = {session,
-          isNewAccount: false};
+        const response: FacebookSignInResponse = {
+          session,
+          isNewAccount: false,
+        };
         return response;
       }
       let username = generateUserName(`${fbResponse.first_name}_${fbResponse.last_name}`);
@@ -82,9 +86,11 @@ export class AuthService {
       await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
 
       const session = await this.sessionService.createAndSaveSession(userId);
-      const response: FacebookSignInResponse = {session,
+      const response: FacebookSignInResponse = {
+        session,
         isNewAccount: true,
-        username};
+        username,
+      };
       return response;
     });
   }
@@ -96,14 +102,16 @@ export class AuthService {
       const userAuth = await this.userRepository.getUserMyAuthGoogle(googleResponse.email, t);
       if (userAuth) {
         const session = await this.sessionService.createAndSaveSession(userAuth.id);
-        const response: GoogleSignInResponse = {session,
-          isNewAccount: false};
+        const response: GoogleSignInResponse = {
+          session,
+          isNewAccount: false,
+        };
         return response;
       }
       let username = generateUserName(googleResponse.email);
       if (await this.userRepository.checkUserExistByEmail(googleResponse.email)) {
         throw new ConflictException("User with this email already exist, but has no connected google account." +
-            " If this is you, please login as this user and connect this google profile in profile settings");
+          " If this is you, please login as this user and connect this google profile in profile settings");
       }
       if (await this.userRepository.checkUserExistByUserName(username)) {
         // The chance that there will be a user with same id is insignificant
@@ -125,9 +133,11 @@ export class AuthService {
       await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, t);
 
       const session = await this.sessionService.createAndSaveSession(userId);
-      const response: GoogleSignInResponse = {session,
+      const response: GoogleSignInResponse = {
+        session,
         isNewAccount: true,
-        username};
+        username,
+      };
       return response;
     });
   }
@@ -179,8 +189,10 @@ export class AuthService {
     const {session, userId} = await this.sequelize.transaction(async(t) => {
       const userId = await this.createUser(data, t);
       const session = await this.sessionService.createAndSaveSession(userId);
-      return {session,
-        userId};
+      return {
+        session,
+        userId,
+      };
     });
     if (data.email) {
       void this.sendVerificationEmail(data.email, userId, data.username, ip);
@@ -208,8 +220,10 @@ export class AuthService {
       await this.validateEmail(data.email);
     }
     const password = await this.passwordService.createPassword(data.password);
-    const userId = await this.userRepository.createUser({...data,
-      password}, transaction);
+    const userId = await this.userRepository.createUser({
+      ...data,
+      password,
+    }, transaction);
     await this.roomRepository.createRoomUser(ALL_ROOM_ID, userId, transaction);
     return userId;
   }
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index d166e0259..037ff2763 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -7,9 +7,7 @@ import {
   Matches,
 } from "class-validator";
 import type {SignUpRequest} from "@/data/types/frontend";
-import {
-  Gender,
-} from "@/data/types/frontend";
+import {Gender} from "@/data/types/frontend";
 import {MAX_USERNAME_LENGTH} from "@/utils/consts";
 
 export class SignUpRequestValidator implements SignUpRequest {
diff --git a/newback/src/modules/api/file/file.controller.ts b/newback/src/modules/api/file/file.controller.ts
index 506d700aa..d2d49b653 100644
--- a/newback/src/modules/api/file/file.controller.ts
+++ b/newback/src/modules/api/file/file.controller.ts
@@ -10,12 +10,8 @@ import {FileInterceptor} from "@nestjs/platform-express";
 import {AuthGuard} from "@/modules/app/guards/auth.guard";
 import {UserId} from "@/modules/app/decorators/user.id.decorator";
 import {FileService} from "@/modules/api/file/file.service";
-import type {
-  SaveFileResponse,
-} from "@/data/types/frontend";
-import {
-  SaveFileRequest,
-} from "@/data/types/frontend";
+import type {SaveFileResponse} from "@/data/types/frontend";
+import {SaveFileRequest} from "@/data/types/frontend";
 
 
 @Controller({
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index 337d0174d..32aa2a709 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -45,7 +45,7 @@ export class FileService {
       if (fileSaveResponse.previewFileName) {
         response.previewId = await this.messageRepository.saveUploadFile({
           type: ImageType.PREVIEW,
-          file: fileSaveResponse.originFileName,
+          file: fileSaveResponse.previewFileName,
           symbol,
           userId,
         }, transaction);
diff --git a/newback/src/modules/api/file/image.service.spec.ts b/newback/src/modules/api/file/image.service.spec.ts
index ef63c1c0f..9f45ef1ba 100644
--- a/newback/src/modules/api/file/image.service.spec.ts
+++ b/newback/src/modules/api/file/image.service.spec.ts
@@ -30,33 +30,23 @@ describe("ImageService", () => {
   describe("getName", () => {
     it("remove old ext", async() => {
       passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
-      await expect(imgService.getName("name.jpeg", "webp")).
-        resolves.
-        toEqual("test_name.webp");
+      await expect(imgService.getName("name.jpeg", "webp")).resolves.toEqual("test_name.webp");
     });
     it("keep origin extension", async() => {
       passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
-      await expect(imgService.getName("name.jpeg", "")).
-        resolves.
-        toEqual("test_name.jpeg");
+      await expect(imgService.getName("name.jpeg", "")).resolves.toEqual("test_name.jpeg");
     });
     it("keep origin esxtension", async() => {
       passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
-      await expect(imgService.getName("name.jpeg", "jpeg")).
-        resolves.
-        toEqual("test_name.jpeg");
+      await expect(imgService.getName("name.jpeg", "jpeg")).resolves.toEqual("test_name.jpeg");
     });
     it("works with undefined", async() => {
       passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
-      await expect(imgService.getName(undefined, "jpeg")).
-        resolves.
-        toEqual("test_.jpeg");
+      await expect(imgService.getName(undefined, "jpeg")).resolves.toEqual("test_.jpeg");
     });
     it("works with 2 undefined", async() => {
       passwordService.generateRandomString = jest.fn().mockResolvedValue("test");
-      await expect(imgService.getName(undefined, undefined)).
-        resolves.
-        toEqual("test_");
+      await expect(imgService.getName(undefined, undefined)).resolves.toEqual("test_");
     });
   });
 });
diff --git a/newback/src/modules/api/file/image.service.ts b/newback/src/modules/api/file/image.service.ts
index 85b7bb03e..b98c517b7 100644
--- a/newback/src/modules/api/file/image.service.ts
+++ b/newback/src/modules/api/file/image.service.ts
@@ -2,14 +2,16 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {
-  ImageType,
-} from "@/data/types/frontend";
+import {ImageType} from "@/data/types/frontend";
 import type {Metadata} from "sharp";
 import * as sharp from "sharp";
 import {PasswordService} from "@/modules/rest/password/password.service";
-import {join, sep} from "path";
-import {writeFile, stat, unlink} from "fs/promises";
+import {join} from "path";
+import {
+  stat,
+  unlink,
+  writeFile,
+} from "fs/promises";
 import type {FileSaveResponse} from "@/data/types/internal";
 
 @Injectable()
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index ac6b459d6..15d7507db 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -127,8 +127,10 @@ describe("VerifyModule", () => {
 
   describe("send-restore-password", () => {
     it("sends password when by username", async() => {
-      configService.getConfig = jest.fn().mockReturnValue({...config,
-        email: {}});
+      configService.getConfig = jest.fn().mockReturnValue({
+        ...config,
+        email: {},
+      });
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByUserName = jest.fn().mockResolvedValue({
         userAuth: {
@@ -146,16 +148,17 @@ describe("VerifyModule", () => {
         isp: "AZOV",
       } as IpAddressModel);
 
-      await request.
-        post("/api/verify/send-restore-password").send({
-          username: "a",
-        }).
+      await request.post("/api/verify/send-restore-password").send({
+        username: "a",
+      }).
         expect(201, {ok: true});
       expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining("You have requested to change password on")}));
     });
     it("sends password when by email", async() => {
-      configService.getConfig = jest.fn().mockReturnValue({...config,
-        email: {}});
+      configService.getConfig = jest.fn().mockReturnValue({
+        ...config,
+        email: {},
+      });
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByEmail = jest.fn().mockResolvedValue({
         email: "asd",
@@ -173,36 +176,37 @@ describe("VerifyModule", () => {
         isp: "AZOV",
       } as IpAddressModel);
 
-      await request.
-        post("/api/verify/send-restore-password").send({
-          email: "a@gmail.com",
-        }).
+      await request.post("/api/verify/send-restore-password").send({
+        email: "a@gmail.com",
+      }).
         expect(201, {ok: true});
       expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.stringContaining("You have requested to change password on")}));
     });
     it("throws an error if user doesnt exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request.
-        post("/api/verify/send-restore-password").send({
-          username: "a@gmail.com",
-        }).
-        expect(400, {statusCode: 400,
+      await request.post("/api/verify/send-restore-password").send({
+        username: "a@gmail.com",
+      }).
+        expect(400, {
+          statusCode: 400,
           message: "User with this username doesnt exit",
-          error: "Bad Request"});
+          error: "Bad Request",
+        });
     });
   });
   describe("verify-token", () => {
     it("should return error when token doesnt exist", async() => {
       verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
-      await request.
-        post("/api/verify/verify-token").send({
-          token: "a",
-        }).
-        expect(400, {statusCode: 400,
+      await request.post("/api/verify/verify-token").send({
+        token: "a",
+      }).
+        expect(400, {
+          statusCode: 400,
           message: "Invalid token",
-          error: "Bad Request"});
+          error: "Bad Request",
+        });
     });
     it("should return ok when token valid", async() => {
       verificationRepository.getVerification = jest.fn().mockResolvedValue({
@@ -213,23 +217,25 @@ describe("VerifyModule", () => {
         },
       });
 
-      await request.
-        post("/api/verify/verify-token").send({
-          token: "a",
-        }).
-        expect(201, {ok: true,
-          username: "a"});
+      await request.post("/api/verify/verify-token").send({
+        token: "a",
+      }).
+        expect(201, {
+          ok: true,
+          username: "a",
+        });
     });
     it("throws an error if user doesnt exists", async() => {
       sequelize.transaction = (resolve) => resolve();
       userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request.
-        post("/api/verify/send-restore-password").send({
-          username: "a@gmail.com",
-        }).
-        expect(400, {statusCode: 400,
+      await request.post("/api/verify/send-restore-password").send({
+        username: "a@gmail.com",
+      }).
+        expect(400, {
+          statusCode: 400,
           message: "User with this username doesnt exit",
-          error: "Bad Request"});
+          error: "Bad Request",
+        });
     });
   });
 
@@ -238,13 +244,14 @@ describe("VerifyModule", () => {
       sequelize.transaction = (resolve) => resolve();
       verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
-      await request.
-        post("/api/verify/confirm-email").send({
-          token: "a",
-        }).
-        expect(400, {statusCode: 400,
+      await request.post("/api/verify/confirm-email").send({
+        token: "a",
+      }).
+        expect(400, {
+          statusCode: 400,
           message: "Invalid token",
-          error: "Bad Request"});
+          error: "Bad Request",
+        });
     });
     it("should set email confirmed", async() => {
       sequelize.transaction = (resolve) => resolve();
@@ -258,10 +265,9 @@ describe("VerifyModule", () => {
         },
       });
 
-      await request.
-        post("/api/verify/confirm-email").send({
-          token: "a",
-        }).
+      await request.post("/api/verify/confirm-email").send({
+        token: "a",
+      }).
         expect(201, {ok: true});
     });
   });
@@ -270,14 +276,15 @@ describe("VerifyModule", () => {
       sequelize.transaction = (resolve) => resolve();
       verificationRepository.getVerification = jest.fn().mockResolvedValue(undefined);
 
-      await request.
-        post("/api/verify/accept-token").send({
-          token: "a",
-          password: "asd",
-        }).
-        expect(400, {statusCode: 400,
+      await request.post("/api/verify/accept-token").send({
+        token: "a",
+        password: "asd",
+      }).
+        expect(400, {
+          statusCode: 400,
           message: "Invalid token",
-          error: "Bad Request"});
+          error: "Bad Request",
+        });
     });
     it("should set email confirmed", async() => {
       sequelize.transaction = (resolve) => resolve();
@@ -294,11 +301,10 @@ describe("VerifyModule", () => {
         },
       });
 
-      const {body} = await request.
-        post("/api/verify/accept-token").send({
-          token: "a",
-          password: "asd",
-        }).
+      const {body} = await request.post("/api/verify/accept-token").send({
+        token: "a",
+        password: "asd",
+      }).
         expect(201);
       expect(body).toMatchObject({session: expect.any(String)});
     });
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index 84cc70292..59ec7b91e 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -12,9 +12,7 @@ import type {
   SendRestorePasswordRequest,
   VerifyTokenResponse,
 } from "@/data/types/frontend";
-import {
-  VerificationType,
-} from "@/data/types/frontend";
+import {VerificationType} from "@/data/types/frontend";
 import {EmailService} from "@/modules/rest/email/email.service";
 import {Sequelize} from "sequelize-typescript";
 import type {VerificationModel} from "@/data/model/verification.model";
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 50142a568..57bc8cb6e 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -2,32 +2,19 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
-import {PasswordService} from "@/modules/rest/password/password.service";
 import type {
   PrintMessageWsOutMessage,
   ShowITypeWsInMessage,
   ShowITypeWsOutMessage,
   SyncHistoryWsOutMessage,
 } from "@/data/types/frontend";
-import {
-  ImageType,
-  MessageStatus,
-} from "@/data/types/frontend";
-import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
-import {SessionService} from "@/modules/rest/session/session.service";
-import {RedisService} from "@/modules/rest/redis/redis.service";
+import {MessageStatus} from "@/data/types/frontend";
 import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 import type {
   CreateModel,
-  WebSocketContextData
+  WebSocketContextData,
 } from "@/data/types/internal";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
-import {
-  getSyncMessage,
-  transformPrintMessage,
-} from "@/modules/api/websocket/transformers/ws.transformer";
 import {Sequelize} from "sequelize-typescript";
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
@@ -38,17 +25,13 @@ import {
   groupUploadedFileToImages,
 } from "@/modules/api/websocket/transformers/inner.transformer";
 import {getMaxSymbol} from "@/utils/helpers";
+import {getSyncMessage} from "@/modules/api/websocket/transformers/sync.message.transformer";
+import {transformPrintMessage} from "@/modules/api/websocket/transformers/print.message.transformer";
 
 @Injectable()
 export class MessageService {
   public constructor(
     public readonly logger: Logger,
-    private readonly sessionService: SessionService,
-    private readonly passwordService: PasswordService,
-    private readonly ipCacheService: IpCacheService,
-    private readonly redisService: RedisService,
-    private readonly roomRepository: RoomRepository,
-    private readonly userRepository: UserRepository,
     private readonly pubsubService: PubsubService,
     private readonly messageRepository: MessageRepository,
     private readonly sequelize: Sequelize,
@@ -99,16 +82,15 @@ export class MessageService {
       );
     }
 
-    const messageIdsWithSymbol: number[] = messages.filter((m) => m.symbol).
-      map((m) => m.id);
+    const messageIdsWithSymbol: number[] = messages.filter((m) => m.symbol).map((m) => m.id);
     const images = await this.messageRepository.getImagesByMessagesId(messageIdsWithSymbol);
     const mentions = await this.messageRepository.getTagsByMessagesId(messageIdsWithSymbol);
 
     return getSyncMessage(readmesageIds, receivedMessageIds, messages, mentions, images);
   }
 
-  public async printMessage(data: PrintMessageWsOutMessage, context: WebSocketContextData) {
-    return this.sequelize.transaction(async(transaction) => {
+  public async printMessage(data: PrintMessageWsOutMessage, context: WebSocketContextData): Promise<void> {
+    await this.sequelize.transaction(async(transaction) => {
       const files: UploadedFileModel[] = await this.messageRepository.getUploadedFiles(
         data.files,
         context.userId,
@@ -116,7 +98,7 @@ export class MessageService {
       );
       const symbol = getMaxSymbol(files, data.tags, data.giphies);
       const time = Date.now() - data.timeDiff;
-      const messageId = await this.messageRepository.createMessage({
+      const messageModel = await this.messageRepository.createMessage({
         roomId: data.roomId,
         time,
         messageStatus: MessageStatus.ON_SERVER,
@@ -126,24 +108,21 @@ export class MessageService {
         content: data.content,
         threadMessageCount: 0,
       }, transaction);
-      const tagsData: CreateModel<MessageMentionModel>[] = getMentionsFromTags(data, messageId);
-      await this.messageRepository.createMessageMentions(tagsData, transaction);
-      const images: CreateModel<ImageModel>[] = groupUploadedFileToImages(files, messageId);
-      const giphies: CreateModel<ImageModel>[] = getUploadedGiphies(data.giphies, messageId);
-      const totalMedia = [...images, ...giphies];
-      let media: ImageModel[] = [];
+
+      const mentions: CreateModel<MessageMentionModel>[] = getMentionsFromTags(data, messageModel.id);
+      await this.messageRepository.createMessageMentions(mentions, transaction);
+      const imagesToCreate: CreateModel<ImageModel>[] = groupUploadedFileToImages(files, messageModel.id);
+      const giphies: CreateModel<ImageModel>[] = getUploadedGiphies(data.giphies, messageModel.id);
+      const totalMedia = [...imagesToCreate, ...giphies];
+      let images: ImageModel[] = [];
       if (totalMedia.length) {
         await this.messageRepository.createImages(totalMedia, transaction);
         // We need to fetch images again, since on bulkCreate mysql doesnt return ids
-        media = await this.messageRepository.getImagesByMessagesId([messageId], transaction);
-      }
-      if (files.length) {
+        images = await this.messageRepository.getImagesByMessagesId([messageModel.id], transaction);
         await this.messageRepository.deleteUploadedFiles(files.map((f) => f.id), transaction);
       }
-      const response = transformPrintMessage(media, data, symbol, context.userId, time, messageId, tagsData);
-      this.pubsubService.emit("sendToClient", {
-        body: response,
-      }, data.roomId);
+      const body = transformPrintMessage(messageModel, mentions, images);
+      this.pubsubService.emit("sendToClient", {body}, data.roomId);
     });
   }
 }
diff --git a/newback/src/modules/api/websocket/transformers/add.online.user.transformer.ts b/newback/src/modules/api/websocket/transformers/add.online.user.transformer.ts
new file mode 100644
index 000000000..425fc48a0
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/add.online.user.transformer.ts
@@ -0,0 +1,14 @@
+import {UserModel} from '@/data/model/user.model';
+import {AddOnlineUserMessage} from '@/data/types/frontend';
+
+export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
+  return {
+    action: "addOnlineUser",
+    handler: "room",
+    online,
+    userId: user.id,
+    lastTimeOnline: user.lastTimeOnline,
+    time: Date.now(),
+    opponentWsId,
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/channel.transformer.ts b/newback/src/modules/api/websocket/transformers/channel.transformer.ts
new file mode 100644
index 000000000..fb22241ab
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/channel.transformer.ts
@@ -0,0 +1,10 @@
+import {ChannelModel} from '@/data/model/channel.model';
+import {ChannelDto} from '@/data/types/frontend';
+
+export function transformChannelsDto(c: ChannelModel): ChannelDto {
+  return {
+    name: c.name,
+    id: c.id,
+    creatorId: c.creatorId,
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/get.user.contries.transformer.ts b/newback/src/modules/api/websocket/transformers/get.user.contries.transformer.ts
new file mode 100644
index 000000000..895aa65b0
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/get.user.contries.transformer.ts
@@ -0,0 +1,21 @@
+import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
+import {
+  GetCountryCodeWsInMessage,
+  LocationDto
+} from '@/data/types/frontend';
+
+export function transformUserCountries(userInfo: UserJoinedInfoModel[]): Omit<GetCountryCodeWsInMessage, "action" | "handler"> {
+  const content: GetCountryCodeWsInMessage["content"] = userInfo.reduce((previousValue, currentValue) => {
+    if (currentValue.ip) {
+      const value: LocationDto = {
+        country: currentValue.ip.country,
+        region: currentValue.ip.region,
+        city: currentValue.ip.city,
+        countryCode: currentValue.ip.countryCode,
+      };
+      previousValue[currentValue.userId] = value;
+    }
+    return previousValue;
+  }, {});
+  return {content};
+}
diff --git a/newback/src/modules/api/websocket/transformers/image.transformer.ts b/newback/src/modules/api/websocket/transformers/image.transformer.ts
new file mode 100644
index 000000000..ec91cba07
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/image.transformer.ts
@@ -0,0 +1,26 @@
+import type {ImageModel} from "@/data/model/image.model";
+import type {MessageModel} from "@/data/model/message.model";
+import type {FileModelDto} from "@/data/types/frontend";
+import type {PureModel,} from "@/data/types/internal";
+
+export function getFiles(images: PureModel<ImageModel>[], mess: PureModel<MessageModel>): Record<number, FileModelDto> {
+  return Object.fromEntries(images.filter((img) => img.messageId === mess.id).map((img) => [
+    img.symbol, {
+      url: img.img,
+      type: img.type,
+      preview: img.preview,
+      id: img.id,
+    },
+  ]));
+}
+
+export function transformGetImages(resImages: PureModel<ImageModel>[]): Record<number, FileModelDto> {
+  return Object.fromEntries(resImages.map((value) => [
+    value.symbol, {
+      id: value.id,
+      type: value.type,
+      url: value.img,
+      preview: value.preview,
+    },
+  ]));
+}
diff --git a/newback/src/modules/api/websocket/transformers/inner.transformer.ts b/newback/src/modules/api/websocket/transformers/inner.transformer.ts
index 6cc9653b5..33a44f775 100644
--- a/newback/src/modules/api/websocket/transformers/inner.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/inner.transformer.ts
@@ -4,14 +4,9 @@ import type {
   GiphyDto,
   PrintMessageWsOutMessage,
 } from "@/data/types/frontend";
-import {
-  ImageType,
-} from "@/data/types/frontend";
+import {ImageType} from "@/data/types/frontend";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
-import {
-  CreateModel,
-  PureModel
-} from '@/data/types/internal';
+import type {CreateModel} from "@/data/types/internal";
 
 
 export function getUploadedGiphies(data: GiphyDto[], messageId: number): CreateModel<ImageModel>[] {
@@ -48,6 +43,6 @@ export function groupUploadedFileToImages(files: UploadedFileModel[], messageId:
       previousValue[currentValue.symbol].img = currentValue.file;
     }
     return previousValue;
-  }, {} as Record<number, CreateModel<ImageModel>>);
+  }, {});
   return Object.values(grouped);
 }
diff --git a/newback/src/modules/api/websocket/transformers/mention.transformer.ts b/newback/src/modules/api/websocket/transformers/mention.transformer.ts
new file mode 100644
index 000000000..cae359b41
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/mention.transformer.ts
@@ -0,0 +1,20 @@
+import type {MessageMentionModel} from "@/data/model/message.mention.model";
+import type {MessageModel} from "@/data/model/message.model";
+import type {
+  CreateModel,
+  PureModel
+} from "@/data/types/internal";
+
+export function getTags(mentions: CreateModel<MessageMentionModel>[], m: PureModel<MessageModel>): Record<string, number> {
+  return mentions.filter((mention) => mention.messageId === m.id).reduce((mentions, mention) => {
+    mentions[mention.symbol] = mention.userId;
+    return mentions;
+  }, {});
+}
+
+export function transformTags(mentions: CreateModel<MessageMentionModel>[]): Record<string, number> {
+  return mentions.reduce<Record<string, number>>((previousValue, currentValue) => {
+    previousValue[currentValue.symbol] = currentValue.userId;
+    return previousValue;
+  }, {});
+}
diff --git a/newback/src/modules/api/websocket/transformers/message.transformer.ts b/newback/src/modules/api/websocket/transformers/message.transformer.ts
new file mode 100644
index 000000000..ef89416c5
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/message.transformer.ts
@@ -0,0 +1,28 @@
+import type {MessageModel} from "@/data/model/message.model";
+import type {MessageMentionModel} from "@/data/model/message.mention.model";
+import type {ImageModel} from "@/data/model/image.model";
+import type {MessageModelDto} from "@/data/types/frontend";
+import {getTags} from "@/modules/api/websocket/transformers/mention.transformer";
+import {getFiles} from "@/modules/api/websocket/transformers/image.transformer";
+import type {
+  CreateModel,
+  PureModel,
+} from "@/data/types/internal";
+
+export function getMessage(message: PureModel<MessageModel>, mentions: CreateModel<MessageMentionModel>[], images: PureModel<ImageModel>[]): MessageModelDto {
+  return {
+    id: message.id,
+    content: message.content,
+    tags: getTags(mentions, message),
+    roomId: message.roomId,
+    userId: message.senderId,
+    parentMessage: message.parentMessageId,
+    deleted: Boolean(message.deletedAt),
+    threadMessagesCount: message.threadMessageCount,
+    symbol: message.symbol,
+    status: message.messageStatus,
+    time: message.time,
+    edited: message.updatedAt.getTime(),
+    files: getFiles(images, message),
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/print.message.transformer.ts b/newback/src/modules/api/websocket/transformers/print.message.transformer.ts
new file mode 100644
index 000000000..10f2bfa73
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/print.message.transformer.ts
@@ -0,0 +1,21 @@
+import type {ImageModel} from "@/data/model/image.model";
+import type {
+  CreateModel,
+  PureModel,
+} from "@/data/types/internal";
+import type {MessageMentionModel} from "@/data/model/message.mention.model";
+import type {PrintMessageWsInMessage} from "@/data/types/frontend";
+import type {MessageModel} from "@/data/model/message.model";
+import {getMessage} from "@/modules/api/websocket/transformers/message.transformer";
+
+export function transformPrintMessage(
+  message: PureModel<MessageModel>,
+  mentions: CreateModel<MessageMentionModel>[],
+  images: PureModel<ImageModel>[]
+): PrintMessageWsInMessage {
+  return {
+    action: "printMessage",
+    handler: "ws-message",
+    message: getMessage(message, mentions, images),
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/profile.transformer.ts b/newback/src/modules/api/websocket/transformers/profile.transformer.ts
new file mode 100644
index 000000000..c45c312ae
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/profile.transformer.ts
@@ -0,0 +1,17 @@
+import {UserModel} from '@/data/model/user.model';
+import {UserProfileDto} from '@/data/types/frontend';
+
+export function transformProfile(user: UserModel): UserProfileDto {
+  return {
+    username: user.username,
+    name: user.userProfile.name,
+    sex: user.sex,
+    id: user.id,
+    city: user.userProfile.city,
+    email: user.userAuth.email,
+    birthday: user.userProfile.birthday,
+    contacts: user.userProfile.contacts,
+    surname: user.userProfile.surname,
+    thumbnail: user.thumbnail,
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/remove.online.user.transformer.ts b/newback/src/modules/api/websocket/transformers/remove.online.user.transformer.ts
new file mode 100644
index 000000000..b2ed987bd
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/remove.online.user.transformer.ts
@@ -0,0 +1,16 @@
+import {
+  UserOnlineData,
+  WebSocketContextData
+} from '@/data/types/internal';
+import {RemoveOnlineUserMessage} from '@/data/types/frontend';
+
+export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage {
+  return {
+    online,
+    action: "removeOnlineUser",
+    lastTimeOnline,
+    time,
+    handler: "room",
+    userId: context.userId,
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/room.transformer.ts b/newback/src/modules/api/websocket/transformers/room.transformer.ts
new file mode 100644
index 000000000..eab28d5ce
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/room.transformer.ts
@@ -0,0 +1,24 @@
+import {RoomUsersModel} from '@/data/model/room.users.model';
+import {GetRoomsForUser} from '@/data/types/internal';
+import {RoomDto} from '@/data/types/frontend';
+
+export function getTransformRoomFn(allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[]): (r: GetRoomsForUser) => RoomDto {
+  const roomUsersIdInfoDict: Record<string, number[]> = allUsersInTheseRooms.reduce<Record<string, number[]>>((previousValue, currentValue) => {
+    if (!previousValue[currentValue.roomId]) {
+      previousValue[currentValue.roomId] = [];
+    }
+    previousValue[currentValue.roomId].push(currentValue.userId);
+    return previousValue;
+  }, {});
+  return (room: GetRoomsForUser) => ({
+    name: room.name,
+    id: room.id,
+    channelId: room.channelId,
+    p2p: Boolean(room.p2p),
+    notifications: Boolean(room.roomUsers.notifications),
+    users: roomUsersIdInfoDict[room.id],
+    isMainInChannel: Boolean(room.isMainInChannel),
+    creatorId: room.creatorId,
+    volume: room.roomUsers.volume,
+  });
+}
diff --git a/newback/src/modules/api/websocket/transformers/set.ws.id.transformer.ts b/newback/src/modules/api/websocket/transformers/set.ws.id.transformer.ts
new file mode 100644
index 000000000..2c32722fa
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/set.ws.id.transformer.ts
@@ -0,0 +1,33 @@
+import {TransformSetWsIdDataParams} from '@/data/types/internal';
+import {SetWsIdMessage} from '@/data/types/frontend';
+import {getTransformRoomFn} from '@/modules/api/websocket/transformers/room.transformer';
+import {transformChannelsDto} from '@/modules/api/websocket/transformers/channel.transformer';
+import {transformUserDto} from '@/modules/api/websocket/transformers/user.transformer';
+import {transformProfile} from '@/modules/api/websocket/transformers/profile.transformer';
+import {transformSettings} from '@/modules/api/websocket/transformers/settings.transformer';
+
+export function transformSetWsId(
+  {
+    myRooms,
+    allUsersInTheseRooms,
+    channels,
+    users,
+    online,
+    id,
+    user,
+    time,
+  }: TransformSetWsIdDataParams
+): SetWsIdMessage {
+  return {
+    action: "setWsId",
+    channels: channels.map(transformChannelsDto),
+    rooms: myRooms.map(getTransformRoomFn(allUsersInTheseRooms)),
+    handler: "ws",
+    time,
+    users: users.map(transformUserDto),
+    online,
+    opponentWsId: id,
+    profile: transformProfile(user),
+    settings: transformSettings(user),
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/settings.transformer.ts b/newback/src/modules/api/websocket/transformers/settings.transformer.ts
new file mode 100644
index 000000000..adc8a0cac
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/settings.transformer.ts
@@ -0,0 +1,16 @@
+import {UserModel} from '@/data/model/user.model';
+import {UserSettingsDto} from '@/data/types/frontend';
+
+export function transformSettings(user: UserModel): UserSettingsDto {
+  return {
+    embeddedYoutube: Boolean(user.userSettings.embeddedYoutube),
+    highlightCode: Boolean(user.userSettings.highlightCode),
+    incomingFileCallSound: Boolean(user.userSettings.incomingFileCallSound),
+    messageSound: Boolean(user.userSettings.messageSound),
+    onlineChangeSound: Boolean(user.userSettings.onlineChangeSound),
+    showWhenITyping: Boolean(user.userSettings.showWhenITyping),
+    suggestions: Boolean(user.userSettings.suggestions),
+    theme: user.userSettings.theme,
+    logs: user.userSettings.logs,
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/sync.message.transformer.ts b/newback/src/modules/api/websocket/transformers/sync.message.transformer.ts
new file mode 100644
index 000000000..f0ca92975
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/sync.message.transformer.ts
@@ -0,0 +1,19 @@
+import {MessageModel} from '@/data/model/message.model';
+import {MessageMentionModel} from '@/data/model/message.mention.model';
+import {ImageModel} from '@/data/model/image.model';
+import {SyncHistoryWsInMessage} from '@/data/types/frontend';
+import {getMessage} from '@/modules/api/websocket/transformers/message.transformer';
+
+export function getSyncMessage(
+  readMessageIds: number[],
+  receivedMessageIds: number[],
+  messages: MessageModel[],
+  mentions: MessageMentionModel[],
+  images: ImageModel[]
+): SyncHistoryWsInMessage {
+  return {
+    readMessageIds,
+    receivedMessageIds,
+    content: messages.map((m) => getMessage(m, mentions, images)),
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/user.transformer.ts b/newback/src/modules/api/websocket/transformers/user.transformer.ts
new file mode 100644
index 000000000..d9b87bd39
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/user.transformer.ts
@@ -0,0 +1,13 @@
+import {UserModel} from '@/data/model/user.model';
+import {UserDto} from '@/data/types/frontend';
+
+
+export function transformUserDto(u: UserModel): UserDto {
+  return {
+    username: u.username,
+    id: u.id,
+    thumbnail: u.thumbnail,
+    sex: u.sex,
+    lastTimeOnline: u.lastTimeOnline,
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/ws.transformer.ts b/newback/src/modules/api/websocket/transformers/ws.transformer.ts
deleted file mode 100644
index 2a0180466..000000000
--- a/newback/src/modules/api/websocket/transformers/ws.transformer.ts
+++ /dev/null
@@ -1,277 +0,0 @@
-import type {AddOnlineUserMessage,
-  ChannelDto,
-  FileModelDto,
-  MessageModelDto,
-  RemoveOnlineUserMessage,
-  RoomDto,
-  SetWsIdMessage,
-  SyncHistoryWsInMessage,
-  UserDto,
-  UserProfileDto,
-  UserSettingsDto,
-
-  PrintMessageWsInMessage,
-  PrintMessageWsOutMessage,
-
-  GetCountryCodeWsInMessage,
-  LocationDto} from "@/data/types/frontend";
-import type {UserModel} from "@/data/model/user.model";
-import type {
-  CreateModel,
-  GetRoomsForUser,
-  TransformSetWsIdDataParams,
-  UserOnlineData,
-  WebSocketContextData,
-} from "@/data/types/internal";
-import type {ChannelModel} from "@/data/model/channel.model";
-import type {RoomUsersModel} from "@/data/model/room.users.model";
-import type {MessageModel} from "@/data/model/message.model";
-import type {MessageMentionModel} from "@/data/model/message.mention.model";
-import type {ImageModel} from "@/data/model/image.model";
-import {
-  MessageStatus,
-} from "@/data/types/frontend";
-import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
-
-/*
- * Function transformUserSettings(db: UserSettingsModel): UserSettingsDto {
- *   return Object.keys(convert<UserSettingsDto>()).reduce((previousValue, currentValue) => {
- *     previousValue[currentValue] = db[currentValue];
- *     return previousValue;
- *   }, {} as UserSettingsDto)
- * }
- */
-
-function transformProfile(user: UserModel): UserProfileDto {
-  return {
-    username: user.username,
-    name: user.userProfile.name,
-    sex: user.sex,
-    id: user.id,
-    city: user.userProfile.city,
-    email: user.userAuth.email,
-    birthday: user.userProfile.birthday,
-    contacts: user.userProfile.contacts,
-    surname: user.userProfile.surname,
-    thumbnail: user.thumbnail,
-  };
-}
-
-function transformSettings(user: UserModel): UserSettingsDto {
-  return {
-    embeddedYoutube: Boolean(user.userSettings.embeddedYoutube),
-    highlightCode: Boolean(user.userSettings.highlightCode),
-    incomingFileCallSound: Boolean(user.userSettings.incomingFileCallSound),
-    messageSound: Boolean(user.userSettings.messageSound),
-    onlineChangeSound: Boolean(user.userSettings.onlineChangeSound),
-    showWhenITyping: Boolean(user.userSettings.showWhenITyping),
-    suggestions: Boolean(user.userSettings.suggestions),
-    theme: user.userSettings.theme,
-    logs: user.userSettings.logs,
-  };
-}
-
-function transformUserDto(u: UserModel): UserDto {
-  return {
-    username: u.username,
-    id: u.id,
-    thumbnail: u.thumbnail,
-    sex: u.sex,
-    lastTimeOnline: u.lastTimeOnline,
-  };
-}
-
-function transformChannelsDto(c: ChannelModel): ChannelDto {
-  return {
-    name: c.name,
-    id: c.id,
-    creatorId: c.creatorId,
-  };
-}
-
-function getTransformRoomFn(allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[]): (r: GetRoomsForUser) => RoomDto {
-  const roomUsersIdInfoDict: Record<string, number[]> = allUsersInTheseRooms.reduce<Record<string, number[]>>((previousValue, currentValue) => {
-    if (!previousValue[currentValue.roomId]) {
-      previousValue[currentValue.roomId] = [];
-    }
-    previousValue[currentValue.roomId].push(currentValue.userId);
-    return previousValue;
-  }, {});
-  return (room: GetRoomsForUser) => ({
-    name: room.name,
-    id: room.id,
-    channelId: room.channelId,
-    p2p: Boolean(room.p2p),
-    notifications: Boolean(room.roomUsers.notifications),
-    users: roomUsersIdInfoDict[room.id],
-    isMainInChannel: Boolean(room.isMainInChannel),
-    creatorId: room.creatorId,
-    volume: room.roomUsers.volume,
-  });
-}
-
-
-export function transformSetWsId(
-  {
-    myRooms,
-    allUsersInTheseRooms,
-    channels,
-    users,
-    online,
-    id,
-    user,
-    time,
-  }: TransformSetWsIdDataParams
-): SetWsIdMessage {
-  return {
-    action: "setWsId",
-    channels: channels.map(transformChannelsDto),
-    rooms: myRooms.map(getTransformRoomFn(allUsersInTheseRooms)),
-    handler: "ws",
-    time,
-    users: users.map(transformUserDto),
-    online,
-    opponentWsId: id,
-    profile: transformProfile(user),
-    settings: transformSettings(user),
-  };
-}
-
-export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
-  return {
-    action: "addOnlineUser",
-    handler: "room",
-    online,
-    userId: user.id,
-    lastTimeOnline: user.lastTimeOnline,
-    time: Date.now(),
-    opponentWsId,
-  };
-}
-
-
-export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage {
-  return {
-    online,
-    action: "removeOnlineUser",
-    lastTimeOnline,
-    time,
-    handler: "room",
-    userId: context.userId,
-  };
-}
-
-
-export function getTags(mentions: MessageMentionModel[], m: MessageModel): Record<string, number> {
-  return mentions.filter((mention) => mention.messageId === m.id).reduce((mentions, mention) => {
-    mentions[mention.symbol] = mention.userId;
-    return mentions;
-  }, {});
-}
-
-export function getFiles(images: ImageModel[], mess: MessageModel): Record<number, FileModelDto> {
-  return Object.fromEntries(images.filter((img) => img.messageId === mess.id).map((img) => [
-    img.symbol, {
-      url: img.img,
-      type: img.type,
-      preview: img.preview,
-      id: img.id,
-    },
-  ]));
-}
-
-export function getMessage(message: MessageModel, mentions: MessageMentionModel[], images: ImageModel[]): MessageModelDto {
-  return {
-    id: message.id,
-    content: message.content,
-    tags: getTags(mentions, message),
-    roomId: message.roomId,
-    userId: message.senderId,
-    parentMessage: message.parentMessageId,
-    deleted: Boolean(message.deletedAt),
-    threadMessagesCount: message.threadMessageCount,
-    symbol: message.symbol,
-    status: message.messageStatus,
-    time: message.time,
-    edited: message.updatedAt.getTime(),
-    files: getFiles(images, message),
-  };
-}
-
-export function getSyncMessage(
-  readMessageIds: number[],
-  receivedMessageIds: number[],
-  messages: MessageModel[],
-  mentions: MessageMentionModel[],
-  images: ImageModel[]
-): SyncHistoryWsInMessage {
-  return {
-    readMessageIds,
-    receivedMessageIds,
-    content: messages.map((m) => getMessage(m, mentions, images)),
-  };
-}
-
-function transformGetImages(resImages: ImageModel[]): Record<number, FileModelDto> {
-  return Object.fromEntries(resImages.map((value) => [
-    value.symbol, {
-      id: value.id,
-      type: value.type,
-      url: value.img,
-      preview: value.preview,
-    },
-  ]));
-}
-
-function transformTags(tagsData: CreateModel<MessageMentionModel>[]): Record<string, number> {
-  return tagsData.reduce<Record<string, number>>((previousValue, currentValue) => {
-    previousValue[currentValue.symbol] = currentValue.userId;
-    return previousValue;
-  }, {});
-}
-
-export function transformPrintMessage(
-  resImages: ImageModel[],
-  data: {content: string; roomId: number; parentMessage: number | null},
-  symbol: string,
-  userId: number,
-  time: number,
-  messageId: number,
-  tagsData: CreateModel<MessageMentionModel>[]
-): PrintMessageWsInMessage {
-  const files = transformGetImages(resImages);
-  const tags: Record<string, number> = transformTags(tagsData);
-  return {
-    content: data.content,
-    tags,
-    files,
-    symbol,
-    userId,
-    action: "printMessage",
-    handler: "ws-message",
-    roomId: data.roomId,
-    parentMessage: data.parentMessage,
-    time,
-    id: messageId,
-    status: MessageStatus.ON_SERVER,
-    threadMessagesCount: 0,
-    edited: 0,
-    deleted: false,
-  };
-}
-
-export function transformUserCountries(userInfo: UserJoinedInfoModel[]): Omit<GetCountryCodeWsInMessage, "action" | "handler"> {
-  const content: GetCountryCodeWsInMessage["content"] = userInfo.reduce((previousValue, currentValue) => {
-    if (currentValue.ip) {
-      const value: LocationDto = {
-        country: currentValue.ip.country,
-        region: currentValue.ip.region,
-        city: currentValue.ip.city,
-        countryCode: currentValue.ip.countryCode,
-      };
-      previousValue[currentValue.userId] = value;
-    }
-    return previousValue;
-  }, {});
-  return {content};
-}
diff --git a/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts b/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
index 490c19f0a..f1d743153 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
@@ -1,9 +1,5 @@
-import type {
-  TestingModule,
-} from "@nestjs/testing";
-import {
-  Test,
-} from "@nestjs/testing";
+import type {TestingModule} from "@nestjs/testing";
+import {Test} from "@nestjs/testing";
 import {IpService} from "@/modules/rest/ip/ip.service";
 import {HttpModule} from "@/modules/rest/http/http.module";
 import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index b3da1717f..636c55e02 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -1,6 +1,5 @@
 import type {OnGatewayConnection} from "@nestjs/websockets";
 import {
-  ConnectedSocket,
   MessageBody,
   SubscribeMessage,
   WebSocketGateway,
@@ -19,7 +18,6 @@ import {
 } from "@nestjs/common";
 import type {
   GetCountryCodeWsInMessage,
-  PrintMessageWsInMessage,
   SyncHistoryWsInMessage,
 } from "@/data/types/frontend";
 import {
@@ -85,9 +83,7 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
   }
 
   @SubscribeMessage("setMessageStatus")
-  public async setMessageStatus(
-
-  ): Promise<void> {
+  public async setMessageStatus(): Promise<void> {
     // This.messageService.setStatus
   }
 
diff --git a/newback/src/modules/api/websocket/websocket.module.ts b/newback/src/modules/api/websocket/websocket.module.ts
index 197bea167..fc17c373b 100644
--- a/newback/src/modules/api/websocket/websocket.module.ts
+++ b/newback/src/modules/api/websocket/websocket.module.ts
@@ -1,17 +1,17 @@
 import {Module} from "@nestjs/common";
 import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
 import {WebsocketService} from "@/modules/api/websocket/websocket.service";
-import {SessionService} from '@/modules/rest/session/session.service';
-import {PasswordService} from '@/modules/rest/password/password.service';
-import {RedisService} from '@/modules/rest/redis/redis.service';
-import {DatabaseModule} from '@/modules/rest/database/database.module';
-import {PubsubService} from '@/modules/rest/pubsub/pubsub.service';
-import {WsDataService} from '@/modules/api/websocket/ws.data.service';
-import {MessageService} from '@/modules/api/websocket/message.service';
+import {SessionService} from "@/modules/rest/session/session.service";
+import {PasswordService} from "@/modules/rest/password/password.service";
+import {RedisService} from "@/modules/rest/redis/redis.service";
+import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {WsDataService} from "@/modules/api/websocket/ws.data.service";
+import {MessageService} from "@/modules/api/websocket/message.service";
 
 
 @Module({
-  imports:[DatabaseModule],
+  imports: [DatabaseModule],
   providers: [
     SessionService,
     WebsocketService,
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index d00ac0641..98658b39c 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -9,14 +9,12 @@ import {RoomRepository} from "@/modules/rest/database/repository/room.repository
 import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
 import {SessionService} from "@/modules/rest/session/session.service";
 import type {UserModel} from "@/data/model/user.model";
-import {
-  getLogoutMessage,
-  transformAddUserOnline,
-  transformSetWsId,
-} from "@/modules/api/websocket/transformers/ws.transformer";
 import type {WebSocketContextData} from "@/data/types/internal";
 import {RedisService} from "@/modules/rest/redis/redis.service";
 import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {transformSetWsId} from '@/modules/api/websocket/transformers/set.ws.id.transformer';
+import {transformAddUserOnline} from '@/modules/api/websocket/transformers/add.online.user.transformer';
+import {getLogoutMessage} from '@/modules/api/websocket/transformers/remove.online.user.transformer';
 
 
 @Injectable()
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index e1f1c1838..e986a8511 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -9,7 +9,7 @@ import type {WebSocketContextData} from "@/data/types/internal";
 import {ConfigService} from "@/modules/rest/config/config.service";
 import {ValidationException} from "@/data/exceptions/validation.exception";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
-import {transformUserCountries} from "@/modules/api/websocket/transformers/ws.transformer";
+import {transformUserCountries} from '@/modules/api/websocket/transformers/get.user.contries.transformer';
 
 
 @Injectable()
diff --git a/newback/src/modules/api/websocket/ws.exception.filter.ts b/newback/src/modules/api/websocket/ws.exception.filter.ts
index 2c91666b6..e1085e1ef 100644
--- a/newback/src/modules/api/websocket/ws.exception.filter.ts
+++ b/newback/src/modules/api/websocket/ws.exception.filter.ts
@@ -3,9 +3,7 @@ import type {
   ExceptionFilter,
   HttpException,
 } from "@nestjs/common";
-import {
-  Catch,
-} from "@nestjs/common";
+import {Catch} from "@nestjs/common";
 import type {WebSocket} from "ws";
 import type {GrowlMessage} from "@/data/types/frontend";
 
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 1c17c41f7..38671e946 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -9,7 +9,7 @@ import {ConfigModule} from "@/modules/rest/config/config.module";
 import {VerifyModule} from "@/modules/api/verify/verify.module";
 import {DatabaseModule} from "@/modules/rest/database/database.module";
 import {WebsocketModule} from "@/modules/api/websocket/websocket.module";
-import {FileModule} from '@/modules/api/file/file.module';
+import {FileModule} from "@/modules/api/file/file.module";
 
 
 /*
diff --git a/newback/src/modules/app/decorators/catch.ws.errors.ts b/newback/src/modules/app/decorators/catch.ws.errors.ts
index 01a06d53b..51e9af421 100644
--- a/newback/src/modules/app/decorators/catch.ws.errors.ts
+++ b/newback/src/modules/app/decorators/catch.ws.errors.ts
@@ -1,7 +1,5 @@
 import type {Logger} from "@nestjs/common";
-import {
-  UnauthorizedException,
-} from "@nestjs/common";
+import {UnauthorizedException} from "@nestjs/common";
 import {WS_SESSION_EXPIRED_CODE} from "@/data/types/frontend";
 import type {OnGatewayConnection} from "@nestjs/websockets";
 
@@ -15,6 +13,7 @@ export function processErrors(e, socket, logger: Logger) {
     socket.close(1011, `Error during opening a socket ${e.message}`.substr(0, 123)); // Message cannot be greather 123 bytes
   }
 }
+
 interface TargetCatchErrors extends OnGatewayConnection {
   logger: Logger;
 }
diff --git a/newback/src/modules/app/decorators/user.id.decorator.ts b/newback/src/modules/app/decorators/user.id.decorator.ts
index 3c373be13..1de145db2 100644
--- a/newback/src/modules/app/decorators/user.id.decorator.ts
+++ b/newback/src/modules/app/decorators/user.id.decorator.ts
@@ -1,4 +1,4 @@
-import type {ExecutionContext,} from "@nestjs/common";
+import type {ExecutionContext} from "@nestjs/common";
 import {
   createParamDecorator,
   InternalServerErrorException,
@@ -6,7 +6,7 @@ import {
 
 export const UserId = createParamDecorator(
   (data: unknown, ctx: ExecutionContext) => {
-    let userId = ctx.switchToHttp().getRequest().userId;
+    const {userId} = ctx.switchToHttp().getRequest();
     if (!userId) {
       throw new InternalServerErrorException("Service should use auth guard");
     }
diff --git a/newback/src/modules/app/decorators/ws.context.decorator.ts b/newback/src/modules/app/decorators/ws.context.decorator.ts
index 1dd9b49a6..0a1c1e0c5 100644
--- a/newback/src/modules/app/decorators/ws.context.decorator.ts
+++ b/newback/src/modules/app/decorators/ws.context.decorator.ts
@@ -1,9 +1,5 @@
-import type {
-  ExecutionContext,
-} from "@nestjs/common";
-import {
-  createParamDecorator,
-} from "@nestjs/common";
+import type {ExecutionContext} from "@nestjs/common";
+import {createParamDecorator} from "@nestjs/common";
 import {WebSocket} from "ws";
 import type {WebSocketContextData} from "@/data/types/internal";
 
diff --git a/newback/src/modules/app/guards/auth.guard.ts b/newback/src/modules/app/guards/auth.guard.ts
index 10e85fb76..c6a1f6a2f 100644
--- a/newback/src/modules/app/guards/auth.guard.ts
+++ b/newback/src/modules/app/guards/auth.guard.ts
@@ -1,6 +1,6 @@
 import type {
   CanActivate,
-  ExecutionContext
+  ExecutionContext,
 } from "@nestjs/common";
 import {
   Injectable,
@@ -22,7 +22,7 @@ export class AuthGuard implements CanActivate {
     context: ExecutionContext,
   ): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
-    request.userId = this.sessionService.getUserIdBySession(request.headers['session-id']);
+    request.userId = this.sessionService.getUserIdBySession(request.headers["session-id"]);
     return true;
   }
 }
diff --git a/newback/src/modules/app/guards/captcha.guard.ts b/newback/src/modules/app/guards/captcha.guard.ts
index ece98eb35..3bcdc3736 100644
--- a/newback/src/modules/app/guards/captcha.guard.ts
+++ b/newback/src/modules/app/guards/captcha.guard.ts
@@ -1,5 +1,7 @@
-import type {CanActivate,
-  ExecutionContext} from "@nestjs/common";
+import type {
+  CanActivate,
+  ExecutionContext,
+} from "@nestjs/common";
 import {
   BadRequestException,
   Injectable,
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
index c5bb3b85c..f0118f0e5 100644
--- a/newback/src/modules/app/guards/own.message.guard.ts
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -8,8 +8,7 @@ import {
 } from "@nestjs/common";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
 import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
-import {WebSocketContextData} from "@/data/types/internal";
-import {DefaultWsOutMessage} from '@/data/types/frontend';
+import type {DefaultWsOutMessage} from "@/data/types/frontend";
 
 
 export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]) => {
@@ -36,6 +35,7 @@ export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>
       return roomIds.every((id) => channels.includes(String(id)));
     }
   }
+
   return mixin(OwnMessageGuardMixin);
 };
 
diff --git a/newback/src/modules/app/guards/own.room.guard.ts b/newback/src/modules/app/guards/own.room.guard.ts
index 99598f06d..cd37ca7eb 100644
--- a/newback/src/modules/app/guards/own.room.guard.ts
+++ b/newback/src/modules/app/guards/own.room.guard.ts
@@ -8,8 +8,7 @@ import {
 } from "@nestjs/common";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
 import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
-import {WebSocketContextData} from "@/data/types/internal";
-import {DefaultWsOutMessage} from '@/data/types/frontend';
+import type {DefaultWsOutMessage} from "@/data/types/frontend";
 
 
 export const OwnRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]) => {
@@ -34,6 +33,7 @@ export const OwnRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number
       return roomIds.every((id) => channels.includes(String(id)));
     }
   }
+
   return mixin(OwnMessageGuardMixin);
 };
 
diff --git a/newback/src/modules/rest/database/repository/ip.repository.ts b/newback/src/modules/rest/database/repository/ip.repository.ts
index 890ce8d34..e61e64208 100644
--- a/newback/src/modules/rest/database/repository/ip.repository.ts
+++ b/newback/src/modules/rest/database/repository/ip.repository.ts
@@ -3,7 +3,7 @@ import {InjectModel} from "@nestjs/sequelize";
 import {IpAddressModel} from "@/data/model/ip.address.model";
 import {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 import {Op} from "sequelize";
-import {CreateModel} from '@/data/types/internal';
+import type {CreateModel} from "@/data/types/internal";
 
 
 @Injectable()
@@ -30,7 +30,7 @@ export class IpRepository {
     this.userJoinedInfoModel.afterBulkUpdate(cb);
   }
 
-  public saveIP(model: CreateModel<IpAddressModel>): Promise<IpAddressModel> {
+  public async saveIP(model: CreateModel<IpAddressModel>): Promise<IpAddressModel> {
     return this.ipAddressModel.upsert(model)[0];
   }
 
diff --git a/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts b/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
index 86f26451a..f66e9b382 100644
--- a/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
+++ b/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
@@ -5,7 +5,7 @@ import {Test} from "@nestjs/testing";
 import {LoggerModule} from "@/modules/rest/logger/logger.module";
 import {ConfigModule} from "@/modules/rest/config/config.module";
 import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
-import {MessageStatus} from "../common/dto";
+import {MessageStatus} from '@/data/types/frontend';
 
 describe("MessageRepository", () => {
   let app: TestingModule;
diff --git a/newback/src/modules/rest/database/repository/messages.repository.ts b/newback/src/modules/rest/database/repository/messages.repository.ts
index 3563b431a..4a7dfc415 100644
--- a/newback/src/modules/rest/database/repository/messages.repository.ts
+++ b/newback/src/modules/rest/database/repository/messages.repository.ts
@@ -142,9 +142,8 @@ export class MessageRepository {
     });
   }
 
-  public async createMessage(data: CreateModel<MessageModel>, transaction: Transaction): Promise<number> {
-    const messageModel = await this.messageModel.create(data, {transaction});
-    return messageModel.id;
+  public async createMessage(data: CreateModel<MessageModel>, transaction: Transaction): Promise<MessageModel> {
+    return this.messageModel.create(data, {transaction});
   }
 
   public async createMessageMentions(data: CreateModel<MessageMentionModel>[], transaction: Transaction): Promise<void> {
diff --git a/newback/src/modules/rest/database/repository/room.repository.ts b/newback/src/modules/rest/database/repository/room.repository.ts
index 23cf04382..a2ba44535 100644
--- a/newback/src/modules/rest/database/repository/room.repository.ts
+++ b/newback/src/modules/rest/database/repository/room.repository.ts
@@ -2,14 +2,10 @@ import {Injectable} from "@nestjs/common";
 import {InjectModel} from "@nestjs/sequelize";
 import {RoomModel} from "@/data/model/room.model";
 import {RoomUsersModel} from "@/data/model/room.users.model";
-import type {
-  Transaction,
-} from "sequelize";
-import {
-  Op,
-} from "sequelize";
+import type {Transaction} from "sequelize";
+import {Op} from "sequelize";
 import {ChannelModel} from "@/data/model/channel.model";
-import {GetRoomsForUser} from '@/data/types/internal';
+import type {GetRoomsForUser} from "@/data/types/internal";
 
 @Injectable()
 export class RoomRepository {
diff --git a/newback/src/modules/rest/database/repository/user.repository.ts b/newback/src/modules/rest/database/repository/user.repository.ts
index ef27390ee..a32043446 100644
--- a/newback/src/modules/rest/database/repository/user.repository.ts
+++ b/newback/src/modules/rest/database/repository/user.repository.ts
@@ -5,12 +5,8 @@ import {UserAuthModel} from "@/data/model/user.auth.model";
 import type {Gender} from "@/data/types/frontend";
 import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
-import type {
-  Transaction,
-} from "sequelize";
-import {
-  Op,
-} from "sequelize";
+import type {Transaction} from "sequelize";
+import {Op} from "sequelize";
 
 
 @Injectable()
@@ -46,25 +42,33 @@ export class UserRepository {
       lastTimeOnline: Date.now(),
       sex: data.sex,
       thumbnail: data.thumbnail,
-    }, {transaction,
-      raw: true});
+    }, {
+      transaction,
+      raw: true,
+    });
     await Promise.all([
       this.userProfileModel.create({
         id: userModel.id,
-      }, {transaction,
-        raw: true}),
+      }, {
+        transaction,
+        raw: true,
+      }),
       this.userAuthModel.create({
         password: data.password,
         email: data.email,
         id: userModel.id,
         googleId: data.googleId,
         facebookId: data.facebookId,
-      }, {transaction,
-        raw: true}),
+      }, {
+        transaction,
+        raw: true,
+      }),
       this.userSettingsModel.create({
         id: userModel.id,
-      }, {transaction,
-        raw: true}),
+      }, {
+        transaction,
+        raw: true,
+      }),
     ]);
     return userModel.id;
   }
diff --git a/newback/src/modules/rest/database/repository/verification.repository.ts b/newback/src/modules/rest/database/repository/verification.repository.ts
index d2afcf620..fc69b0f5b 100644
--- a/newback/src/modules/rest/database/repository/verification.repository.ts
+++ b/newback/src/modules/rest/database/repository/verification.repository.ts
@@ -1,13 +1,12 @@
 import {Injectable} from "@nestjs/common";
 import {InjectModel} from "@nestjs/sequelize";
 import {UserAuthModel} from "@/data/model/user.auth.model";
-import type {VerificationType} from "@/data/types/frontend";
 import {VerificationModel} from "@/data/model/verification.model";
 import type {Transaction} from "sequelize";
-import {
+import type {
   CreateModel,
-  RequireAtLeastOne
-} from '@/data/types/internal';
+  RequireAtLeastOne,
+} from "@/data/types/internal";
 
 
 @Injectable()
@@ -42,7 +41,7 @@ export class VerificationRepository {
     });
   }
 
-  public async createVerification(data: RequireAtLeastOne<CreateModel<VerificationModel>, 'userId'>, transaction: Transaction): Promise<void> {
+  public async createVerification(data: RequireAtLeastOne<CreateModel<VerificationModel>, "userId">, transaction: Transaction): Promise<void> {
     const verification = await this.verificationModel.create(data, {
       raw: true,
       transaction,
diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/rest/email/email.service.spec.ts
index 19c5865ae..fa912ac68 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/rest/email/email.service.spec.ts
@@ -1,11 +1,7 @@
 import {HtmlService} from "@/modules/rest/html/html.service";
 import {EmailService} from "@/modules/rest/email/email.service";
-import type {
-  TestingModule,
-} from "@nestjs/testing";
-import {
-  Test,
-} from "@nestjs/testing";
+import type {TestingModule} from "@nestjs/testing";
+import {Test} from "@nestjs/testing";
 import {LoggerModule} from "@/modules/rest/logger/logger.module";
 import {MailerService} from "@nestjs-modules/mailer";
 
@@ -61,8 +57,10 @@ describe("EmailSenderService", () => {
       expect(new Date().getTimezoneOffset()).toBe(0);
     });
     it("should render an email", async() => {
-      configService.getConfig = jest.fn().mockReturnValue({...config,
-        email: {}});
+      configService.getConfig = jest.fn().mockReturnValue({
+        ...config,
+        email: {},
+      });
       const spy = jest.spyOn(mailer, "sendMail");
       jest.useFakeTimers("modern");
       jest.setSystemTime(new Date(2020, 3, 1));
diff --git a/newback/src/modules/rest/html/html.service.spec.ts b/newback/src/modules/rest/html/html.service.spec.ts
index e626ebf14..fc7f22a04 100644
--- a/newback/src/modules/rest/html/html.service.spec.ts
+++ b/newback/src/modules/rest/html/html.service.spec.ts
@@ -10,8 +10,10 @@ describe("HtmlService", () => {
 
     it("should replace multiple params", () => {
       const service = new HtmlService();
-      const result = service.replaceTemplate("aa {{ blah }} {{koko}}", {blah: 3,
-        koko: 4});
+      const result = service.replaceTemplate("aa {{ blah }} {{koko}}", {
+        blah: 3,
+        koko: 4,
+      });
       expect(result).toEqual("aa 3 4");
     });
 
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
index 6bc4803e6..4718d1e0e 100644
--- a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
+++ b/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
@@ -1,9 +1,5 @@
-import type {
-  TestingModule,
-} from "@nestjs/testing";
-import {
-  Test,
-} from "@nestjs/testing";
+import type {TestingModule} from "@nestjs/testing";
+import {Test} from "@nestjs/testing";
 import {IpService} from "@/modules/rest/ip/ip.service";
 import {HttpModule} from "@/modules/rest/http/http.module";
 import * as pychatIpAddressFixture from "@/fixtures/ip.134.249.113.11.json";
diff --git a/newback/src/modules/rest/password/password.service.ts b/newback/src/modules/rest/password/password.service.ts
index 615892761..8814420eb 100644
--- a/newback/src/modules/rest/password/password.service.ts
+++ b/newback/src/modules/rest/password/password.service.ts
@@ -6,7 +6,6 @@ import {
 
 @Injectable()
 export class PasswordService {
-
   public async createPassword(password: string): Promise<string> {
     return hash(password, 10);
   }
diff --git a/newback/src/modules/rest/pubsub/pubsub.service.ts b/newback/src/modules/rest/pubsub/pubsub.service.ts
index 5cf57d1bd..03f61be1d 100644
--- a/newback/src/modules/rest/pubsub/pubsub.service.ts
+++ b/newback/src/modules/rest/pubsub/pubsub.service.ts
@@ -89,8 +89,7 @@ export class PubsubService {
   }
 
   public getMyChannels(context: WebSocketContextData): string[] {
-    return Object.entries(receivers).
-      filter(([k, v]) => v.find((k) => k.ctx === context)).
+    return Object.entries(receivers).filter(([k, v]) => v.find((k) => k.ctx === context)).
       map(([k, v]) => k);
   }
 }
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
index 30dbac097..847ec8a37 100644
--- a/newback/src/modules/rest/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/rest/ws.adapter/ws.adapter.ts
@@ -6,7 +6,7 @@ import {
   BadRequestException,
   InternalServerErrorException,
 } from "@nestjs/common";
-import type {BaseWsInstance} from "@nestjs/websockets";
+import type {BaseWsInstance, MessageMappingProperties} from "@nestjs/websockets";
 import {
   CLOSE_EVENT,
   CONNECTION_EVENT,
@@ -14,18 +14,18 @@ import {
   ERROR_EVENT,
   MESSAGE_METADATA,
 } from "@nestjs/websockets/constants";
-import type {MessageMappingProperties} from "@nestjs/websockets/gateway-metadata-explorer";
 import {isFunction} from "@nestjs/common/utils/shared.utils";
-import type {Server,
-  ServerOptions} from "ws";
+import type {
+  Server,
+  ServerOptions,
+} from "ws";
 import {
   WebSocket,
   WebSocketServer,
 } from "ws";
-import type {DefaultWsInMessage,
-  DefaultWsOutMessage} from "@/data/types/frontend";
-import {
-  GrowlMessage,
+import type {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
 } from "@/data/types/frontend";
 import {processErrors} from "@/modules/app/decorators/catch.ws.errors";
 
diff --git a/newback/src/templates/change.password.start.html b/newback/src/templates/change.password.start.html
index bcaba769b..f878efd36 100644
--- a/newback/src/templates/change.password.start.html
+++ b/newback/src/templates/change.password.start.html
@@ -1,5 +1,6 @@
 <h2 style="color: #102a80">Hello, {{ username }}!</h2>
-<p><p>You have requested to change password on  <b>Pychat</b>. To proceed click on the link below. If you didn't request the password change just ignore this mail</p></p>
+<p><p>You have requested to change password on <b>Pychat</b>. To proceed click on the link below. If you didn't request
+  the password change just ignore this mail</p></p>
 <div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
   <a href="{{ magicLink }}" style="font-size: 20px;
     line-height: 26px;
diff --git a/newback/src/utils/helpers.ts b/newback/src/utils/helpers.ts
index 6a9bd5962..50abcc4d3 100644
--- a/newback/src/utils/helpers.ts
+++ b/newback/src/utils/helpers.ts
@@ -2,8 +2,8 @@ import type {SequelizeModuleOptions} from "@nestjs/sequelize";
 
 import {MAX_USERNAME_LENGTH} from "@/utils/consts";
 import {config} from "node-ts-config";
-import {UploadedFileModel} from '@/data/model/uploaded.file.model';
-import {GiphyDto} from '@/data/types/frontend';
+import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
+import type {GiphyDto} from "@/data/types/frontend";
 
 export function generateUserName(email: string) {
   return email.split("@")[0].replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, MAX_USERNAME_LENGTH);
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index 1bc794369..af09aee56 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -73,22 +73,38 @@ async function bootstrap() {
   const ipAddressModel: typeof IpAddressModel = app.get(getModelToken(IpAddressModel));
   const sequelize = app.get(Sequelize);
   await sequelize.transaction(async(transaction) => {
-    await messageHistoryModel.destroy({where: {}, truncate: true,});
-    await imageModel.destroy({where: {}, truncate: true,});
-    await subscriptionMessageModel.destroy({where: {}, truncate: true,});
-    await messageMentionModel.destroy({where: {}, truncate: true,});
-    await userProfileModel.destroy({where: {}, truncate: true,});
-    await userAuthModel.destroy({where: {}, truncate: true,});
-    await verificationModel.destroy({where: {}, truncate: true,});
-    await userJoinedInfoModel.destroy({where: {}, truncate: true,});
-    await uploadedFileModel.destroy({where: {}, truncate: true,});
-    await subscriptionModel.destroy({where: {}, truncate: true,});
-    await roomUsersModel.destroy({where: {}, truncate: true,});
-    await messageModel.destroy({where: {}, truncate: true,});
-    await roomModel.destroy({where: {}, truncate: true,});
-    await ipAddressModel.destroy({where: {}, truncate: true,});
-    await channelModel.destroy({where: {}, truncate: true,});
-    await userModel.destroy({where: {}, truncate: true,});
+    await messageHistoryModel.destroy({where: {},
+      truncate: true});
+    await imageModel.destroy({where: {},
+      truncate: true});
+    await subscriptionMessageModel.destroy({where: {},
+      truncate: true});
+    await messageMentionModel.destroy({where: {},
+      truncate: true});
+    await userProfileModel.destroy({where: {},
+      truncate: true});
+    await userAuthModel.destroy({where: {},
+      truncate: true});
+    await verificationModel.destroy({where: {},
+      truncate: true});
+    await userJoinedInfoModel.destroy({where: {},
+      truncate: true});
+    await uploadedFileModel.destroy({where: {},
+      truncate: true});
+    await subscriptionModel.destroy({where: {},
+      truncate: true});
+    await roomUsersModel.destroy({where: {},
+      truncate: true});
+    await messageModel.destroy({where: {},
+      truncate: true});
+    await roomModel.destroy({where: {},
+      truncate: true});
+    await ipAddressModel.destroy({where: {},
+      truncate: true});
+    await channelModel.destroy({where: {},
+      truncate: true});
+    await userModel.destroy({where: {},
+      truncate: true});
     const users: UserModel[] = pychat_chat_user.map((a) => {
       const b: UserModel = {
         lastTimeOnline: a.last_time_online,

From cdfe480c3eacb48de876671ebe49f65db7d06ceb Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 22:17:02 +0300
Subject: [PATCH 078/221] Fix test

---
 newback/src/modules/api/auth/auth.module.spec.ts     | 2 ++
 newback/src/modules/api/verify/verify.module.spec.ts | 2 ++
 newback/src/templates/change.password.start.html     | 3 +--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index d732bd201..a18073e78 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -42,6 +42,7 @@ describe("AuthModule", () => {
   const userRepository: UserRepository = {} as UserRepository;
   const verificationRepository: VerificationRepository = {} as VerificationRepository;
   const ipRepository: IpRepository = {} as IpRepository;
+  ipRepository.connectCreateHook = jest.fn().mockReturnValue(undefined);
   const roomRepository: RoomRepository = {} as RoomRepository;
   const redisService: RedisService = {} as RedisService;
   const sequelize: Sequelize = {} as Sequelize;
@@ -140,6 +141,7 @@ describe("AuthModule", () => {
     Object.keys(ipRepository).forEach((key) => delete ipRepository[key]);
     nodeApply = () => {
     };
+    ipRepository.connectCreateHook = jest.fn().mockReturnValue(undefined);
     Object.keys(configService).forEach((key) => delete configService[key]);
     Object.keys(verificationRepository).forEach((key) => delete configService[key]);
   });
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index 15d7507db..faf5a0c60 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -35,6 +35,7 @@ describe("VerifyModule", () => {
   const userRepository: UserRepository = {} as UserRepository;
   const verificationRepository: VerificationRepository = {} as VerificationRepository;
   const ipRepository: IpRepository = {} as IpRepository;
+  ipRepository.connectCreateHook = jest.fn().mockReturnValue(undefined);
   const roomRepository: RoomRepository = {} as RoomRepository;
   const redisService: RedisService = {} as RedisService;
   const sequelize: Sequelize = {} as Sequelize;
@@ -119,6 +120,7 @@ describe("VerifyModule", () => {
     Object.keys(ipRepository).forEach((key) => delete ipRepository[key]);
     Object.keys(configService).forEach((key) => delete configService[key]);
     Object.keys(verificationRepository).forEach((key) => delete configService[key]);
+    ipRepository.connectCreateHook = jest.fn().mockReturnValue(undefined);
   });
 
   afterAll(async() => {
diff --git a/newback/src/templates/change.password.start.html b/newback/src/templates/change.password.start.html
index f878efd36..bcaba769b 100644
--- a/newback/src/templates/change.password.start.html
+++ b/newback/src/templates/change.password.start.html
@@ -1,6 +1,5 @@
 <h2 style="color: #102a80">Hello, {{ username }}!</h2>
-<p><p>You have requested to change password on <b>Pychat</b>. To proceed click on the link below. If you didn't request
-  the password change just ignore this mail</p></p>
+<p><p>You have requested to change password on  <b>Pychat</b>. To proceed click on the link below. If you didn't request the password change just ignore this mail</p></p>
 <div style="width: 100%; width: calc(100% - 20px); text-align: center; margin: auto">
   <a href="{{ magicLink }}" style="font-size: 20px;
     line-height: 26px;

From 29e1703e7fe47156e361252ca91ec9ba5995486a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 22:55:29 +0300
Subject: [PATCH 079/221] Refactored transformers

---
 newback/src/data/types/internal.ts            |  4 ++
 .../modules/api/websocket/message.service.ts  | 10 ++---
 .../transformers/image.transformer.ts         | 26 -------------
 .../{ => model}/channel.transformer.ts        |  2 +-
 .../transformers/model/image.transformer.ts   | 26 +++++++++++++
 .../{ => model}/mention.transformer.ts        |  4 +-
 .../{ => model}/message.transformer.ts        | 10 ++---
 .../{ => model}/profile.transformer.ts        |  2 +-
 .../transformers/model/room.transformer.ts    | 27 +++++++++++++
 .../{ => model}/settings.transformer.ts       |  0
 .../{ => model}/user.transformer.ts           |  0
 .../add.online.user.transformer.ts            |  0
 .../get.user.contries.transformer.ts          |  0
 .../{ => out.message}/inner.transformer.ts    |  0
 .../print.message.transformer.ts              |  4 +-
 .../remove.online.user.transformer.ts         |  0
 .../out.message/set.ws.id.transformer.ts      | 39 +++++++++++++++++++
 .../sync.message.transformer.ts               |  4 +-
 .../transformers/room.transformer.ts          | 24 ------------
 .../transformers/set.ws.id.transformer.ts     | 33 ----------------
 .../api/websocket/websocket.service.ts        |  6 +--
 .../modules/api/websocket/ws.data.service.ts  |  2 +-
 22 files changed, 118 insertions(+), 105 deletions(-)
 delete mode 100644 newback/src/modules/api/websocket/transformers/image.transformer.ts
 rename newback/src/modules/api/websocket/transformers/{ => model}/channel.transformer.ts (73%)
 create mode 100644 newback/src/modules/api/websocket/transformers/model/image.transformer.ts
 rename newback/src/modules/api/websocket/transformers/{ => model}/mention.transformer.ts (69%)
 rename newback/src/modules/api/websocket/transformers/{ => model}/message.transformer.ts (59%)
 rename newback/src/modules/api/websocket/transformers/{ => model}/profile.transformer.ts (86%)
 create mode 100644 newback/src/modules/api/websocket/transformers/model/room.transformer.ts
 rename newback/src/modules/api/websocket/transformers/{ => model}/settings.transformer.ts (100%)
 rename newback/src/modules/api/websocket/transformers/{ => model}/user.transformer.ts (100%)
 rename newback/src/modules/api/websocket/transformers/{ => out.message}/add.online.user.transformer.ts (100%)
 rename newback/src/modules/api/websocket/transformers/{ => out.message}/get.user.contries.transformer.ts (100%)
 rename newback/src/modules/api/websocket/transformers/{ => out.message}/inner.transformer.ts (100%)
 rename newback/src/modules/api/websocket/transformers/{ => out.message}/print.message.transformer.ts (78%)
 rename newback/src/modules/api/websocket/transformers/{ => out.message}/remove.online.user.transformer.ts (100%)
 create mode 100644 newback/src/modules/api/websocket/transformers/out.message/set.ws.id.transformer.ts
 rename newback/src/modules/api/websocket/transformers/{ => out.message}/sync.message.transformer.ts (74%)
 delete mode 100644 newback/src/modules/api/websocket/transformers/room.transformer.ts
 delete mode 100644 newback/src/modules/api/websocket/transformers/set.ws.id.transformer.ts

diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index c2082bc0b..a619676bf 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -55,4 +55,8 @@ export type PureModel<T> = {
   [P in keyof Omit<T, "isNewRecord" | "version"> as T[P] extends Date | number[] | boolean | number | string | undefined ? P : never]: T[P]
 };
 
+export type PickByType<T, Value> = {
+  [P in keyof T as T[P] extends Value | undefined ? P : never]: T[P]
+};
+
 export type CreateModel<T> = Omit<PureModel<T>, "createdAt" | "deletedAt" | "id" | "updatedAt">;
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 57bc8cb6e..812bf379a 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -19,14 +19,14 @@ import {Sequelize} from "sequelize-typescript";
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
+import {getMaxSymbol} from "@/utils/helpers";
+import {getSyncMessage} from '@/modules/api/websocket/transformers/out.message/sync.message.transformer';
 import {
   getMentionsFromTags,
   getUploadedGiphies,
-  groupUploadedFileToImages,
-} from "@/modules/api/websocket/transformers/inner.transformer";
-import {getMaxSymbol} from "@/utils/helpers";
-import {getSyncMessage} from "@/modules/api/websocket/transformers/sync.message.transformer";
-import {transformPrintMessage} from "@/modules/api/websocket/transformers/print.message.transformer";
+  groupUploadedFileToImages
+} from '@/modules/api/websocket/transformers/out.message/inner.transformer';
+import {transformPrintMessage} from '@/modules/api/websocket/transformers/out.message/print.message.transformer';
 
 @Injectable()
 export class MessageService {
diff --git a/newback/src/modules/api/websocket/transformers/image.transformer.ts b/newback/src/modules/api/websocket/transformers/image.transformer.ts
deleted file mode 100644
index ec91cba07..000000000
--- a/newback/src/modules/api/websocket/transformers/image.transformer.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type {ImageModel} from "@/data/model/image.model";
-import type {MessageModel} from "@/data/model/message.model";
-import type {FileModelDto} from "@/data/types/frontend";
-import type {PureModel,} from "@/data/types/internal";
-
-export function getFiles(images: PureModel<ImageModel>[], mess: PureModel<MessageModel>): Record<number, FileModelDto> {
-  return Object.fromEntries(images.filter((img) => img.messageId === mess.id).map((img) => [
-    img.symbol, {
-      url: img.img,
-      type: img.type,
-      preview: img.preview,
-      id: img.id,
-    },
-  ]));
-}
-
-export function transformGetImages(resImages: PureModel<ImageModel>[]): Record<number, FileModelDto> {
-  return Object.fromEntries(resImages.map((value) => [
-    value.symbol, {
-      id: value.id,
-      type: value.type,
-      url: value.img,
-      preview: value.preview,
-    },
-  ]));
-}
diff --git a/newback/src/modules/api/websocket/transformers/channel.transformer.ts b/newback/src/modules/api/websocket/transformers/model/channel.transformer.ts
similarity index 73%
rename from newback/src/modules/api/websocket/transformers/channel.transformer.ts
rename to newback/src/modules/api/websocket/transformers/model/channel.transformer.ts
index fb22241ab..41688419e 100644
--- a/newback/src/modules/api/websocket/transformers/channel.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/model/channel.transformer.ts
@@ -1,7 +1,7 @@
 import {ChannelModel} from '@/data/model/channel.model';
 import {ChannelDto} from '@/data/types/frontend';
 
-export function transformChannelsDto(c: ChannelModel): ChannelDto {
+export function transformChannelDto(c: ChannelModel): ChannelDto {
   return {
     name: c.name,
     id: c.id,
diff --git a/newback/src/modules/api/websocket/transformers/model/image.transformer.ts b/newback/src/modules/api/websocket/transformers/model/image.transformer.ts
new file mode 100644
index 000000000..d2148b1c9
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/model/image.transformer.ts
@@ -0,0 +1,26 @@
+import type {ImageModel} from "@/data/model/image.model";
+import type {MessageModel} from "@/data/model/message.model";
+import type {FileModelDto} from "@/data/types/frontend";
+import {ImageType} from "@/data/types/frontend";
+import type {PureModel,} from "@/data/types/internal";
+
+export function getUrl(value: PureModel<ImageModel>, attribute: "img" | "preview") {
+  return value.type === ImageType.GIPHY ? value.img : `/photo/${value[attribute]}`;
+}
+
+export function transformSingleImageDto(value: PureModel<ImageModel>): FileModelDto {
+  return {
+    id: value.id,
+    type: value.type,
+    url: getUrl(value, "img"),
+    preview: getUrl(value, "preview"),
+  };
+}
+
+export function transformImageByPickingDto(images: PureModel<ImageModel>[], mess: PureModel<MessageModel>): Record<number, FileModelDto> {
+  return Object.fromEntries(images.filter((img) => img.messageId === mess.id).map((img) => [img.symbol, transformSingleImageDto(img)]));
+}
+
+export function transformImageDto(resImages: PureModel<ImageModel>[]): Record<number, FileModelDto> {
+  return Object.fromEntries(resImages.map((value) => [value.symbol, transformSingleImageDto(value)]));
+}
diff --git a/newback/src/modules/api/websocket/transformers/mention.transformer.ts b/newback/src/modules/api/websocket/transformers/model/mention.transformer.ts
similarity index 69%
rename from newback/src/modules/api/websocket/transformers/mention.transformer.ts
rename to newback/src/modules/api/websocket/transformers/model/mention.transformer.ts
index cae359b41..88c23c027 100644
--- a/newback/src/modules/api/websocket/transformers/mention.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/model/mention.transformer.ts
@@ -5,14 +5,14 @@ import type {
   PureModel
 } from "@/data/types/internal";
 
-export function getTags(mentions: CreateModel<MessageMentionModel>[], m: PureModel<MessageModel>): Record<string, number> {
+export function transformMentionByPickingDto(mentions: CreateModel<MessageMentionModel>[], m: PureModel<MessageModel>): Record<string, number> {
   return mentions.filter((mention) => mention.messageId === m.id).reduce((mentions, mention) => {
     mentions[mention.symbol] = mention.userId;
     return mentions;
   }, {});
 }
 
-export function transformTags(mentions: CreateModel<MessageMentionModel>[]): Record<string, number> {
+export function transformMentionDto(mentions: CreateModel<MessageMentionModel>[]): Record<string, number> {
   return mentions.reduce<Record<string, number>>((previousValue, currentValue) => {
     previousValue[currentValue.symbol] = currentValue.userId;
     return previousValue;
diff --git a/newback/src/modules/api/websocket/transformers/message.transformer.ts b/newback/src/modules/api/websocket/transformers/model/message.transformer.ts
similarity index 59%
rename from newback/src/modules/api/websocket/transformers/message.transformer.ts
rename to newback/src/modules/api/websocket/transformers/model/message.transformer.ts
index ef89416c5..dd3a59324 100644
--- a/newback/src/modules/api/websocket/transformers/message.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/model/message.transformer.ts
@@ -2,18 +2,18 @@ import type {MessageModel} from "@/data/model/message.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
 import type {MessageModelDto} from "@/data/types/frontend";
-import {getTags} from "@/modules/api/websocket/transformers/mention.transformer";
-import {getFiles} from "@/modules/api/websocket/transformers/image.transformer";
 import type {
   CreateModel,
   PureModel,
 } from "@/data/types/internal";
+import {transformMentionByPickingDto} from '@/modules/api/websocket/transformers/model/mention.transformer';
+import {transformImageByPickingDto} from '@/modules/api/websocket/transformers/model/image.transformer';
 
-export function getMessage(message: PureModel<MessageModel>, mentions: CreateModel<MessageMentionModel>[], images: PureModel<ImageModel>[]): MessageModelDto {
+export function transformMessageDto(message: PureModel<MessageModel>, mentions: CreateModel<MessageMentionModel>[], images: PureModel<ImageModel>[]): MessageModelDto {
   return {
     id: message.id,
     content: message.content,
-    tags: getTags(mentions, message),
+    tags: transformMentionByPickingDto(mentions, message),
     roomId: message.roomId,
     userId: message.senderId,
     parentMessage: message.parentMessageId,
@@ -23,6 +23,6 @@ export function getMessage(message: PureModel<MessageModel>, mentions: CreateMod
     status: message.messageStatus,
     time: message.time,
     edited: message.updatedAt.getTime(),
-    files: getFiles(images, message),
+    files: transformImageByPickingDto(images, message),
   };
 }
diff --git a/newback/src/modules/api/websocket/transformers/profile.transformer.ts b/newback/src/modules/api/websocket/transformers/model/profile.transformer.ts
similarity index 86%
rename from newback/src/modules/api/websocket/transformers/profile.transformer.ts
rename to newback/src/modules/api/websocket/transformers/model/profile.transformer.ts
index c45c312ae..33f7006f2 100644
--- a/newback/src/modules/api/websocket/transformers/profile.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/model/profile.transformer.ts
@@ -1,7 +1,7 @@
 import {UserModel} from '@/data/model/user.model';
 import {UserProfileDto} from '@/data/types/frontend';
 
-export function transformProfile(user: UserModel): UserProfileDto {
+export function transformProfileDto(user: UserModel): UserProfileDto {
   return {
     username: user.username,
     name: user.userProfile.name,
diff --git a/newback/src/modules/api/websocket/transformers/model/room.transformer.ts b/newback/src/modules/api/websocket/transformers/model/room.transformer.ts
new file mode 100644
index 000000000..0f9b5af69
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/model/room.transformer.ts
@@ -0,0 +1,27 @@
+import type {RoomUsersModel} from "@/data/model/room.users.model";
+import type {GetRoomsForUser} from "@/data/types/internal";
+import type {RoomDto} from "@/data/types/frontend";
+
+export function getTransformRoomDto(users: number[], room: GetRoomsForUser): RoomDto {
+  return {
+    name: room.name,
+    id: room.id,
+    channelId: room.channelId,
+    p2p: Boolean(room.p2p),
+    notifications: Boolean(room.roomUsers.notifications),
+    users,
+    isMainInChannel: Boolean(room.isMainInChannel),
+    creatorId: room.creatorId,
+    volume: room.roomUsers.volume,
+  };
+}
+
+export function getRoomsOnline(allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[]): Record<string, number[]> {
+  return allUsersInTheseRooms.reduce<Record<string, number[]>>((previousValue, currentValue) => {
+    if (!previousValue[currentValue.roomId]) {
+      previousValue[currentValue.roomId] = [];
+    }
+    previousValue[currentValue.roomId].push(currentValue.userId);
+    return previousValue;
+  }, {});
+}
diff --git a/newback/src/modules/api/websocket/transformers/settings.transformer.ts b/newback/src/modules/api/websocket/transformers/model/settings.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/settings.transformer.ts
rename to newback/src/modules/api/websocket/transformers/model/settings.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/user.transformer.ts b/newback/src/modules/api/websocket/transformers/model/user.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/user.transformer.ts
rename to newback/src/modules/api/websocket/transformers/model/user.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/add.online.user.transformer.ts b/newback/src/modules/api/websocket/transformers/out.message/add.online.user.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/add.online.user.transformer.ts
rename to newback/src/modules/api/websocket/transformers/out.message/add.online.user.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/get.user.contries.transformer.ts b/newback/src/modules/api/websocket/transformers/out.message/get.user.contries.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/get.user.contries.transformer.ts
rename to newback/src/modules/api/websocket/transformers/out.message/get.user.contries.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/inner.transformer.ts b/newback/src/modules/api/websocket/transformers/out.message/inner.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/inner.transformer.ts
rename to newback/src/modules/api/websocket/transformers/out.message/inner.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/print.message.transformer.ts b/newback/src/modules/api/websocket/transformers/out.message/print.message.transformer.ts
similarity index 78%
rename from newback/src/modules/api/websocket/transformers/print.message.transformer.ts
rename to newback/src/modules/api/websocket/transformers/out.message/print.message.transformer.ts
index 10f2bfa73..b24814076 100644
--- a/newback/src/modules/api/websocket/transformers/print.message.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/out.message/print.message.transformer.ts
@@ -6,7 +6,7 @@ import type {
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {PrintMessageWsInMessage} from "@/data/types/frontend";
 import type {MessageModel} from "@/data/model/message.model";
-import {getMessage} from "@/modules/api/websocket/transformers/message.transformer";
+import {transformMessageDto} from '@/modules/api/websocket/transformers/model/message.transformer';
 
 export function transformPrintMessage(
   message: PureModel<MessageModel>,
@@ -16,6 +16,6 @@ export function transformPrintMessage(
   return {
     action: "printMessage",
     handler: "ws-message",
-    message: getMessage(message, mentions, images),
+    message: transformMessageDto(message, mentions, images),
   };
 }
diff --git a/newback/src/modules/api/websocket/transformers/remove.online.user.transformer.ts b/newback/src/modules/api/websocket/transformers/out.message/remove.online.user.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/remove.online.user.transformer.ts
rename to newback/src/modules/api/websocket/transformers/out.message/remove.online.user.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/out.message/set.ws.id.transformer.ts b/newback/src/modules/api/websocket/transformers/out.message/set.ws.id.transformer.ts
new file mode 100644
index 000000000..69d552eca
--- /dev/null
+++ b/newback/src/modules/api/websocket/transformers/out.message/set.ws.id.transformer.ts
@@ -0,0 +1,39 @@
+import type {TransformSetWsIdDataParams} from "@/data/types/internal";
+import type {SetWsIdMessage} from "@/data/types/frontend";
+import {transformChannelDto} from "@/modules/api/websocket/transformers/model/channel.transformer";
+
+import {transformSettings} from "@/modules/api/websocket/transformers/model/settings.transformer";
+import {transformUserDto} from "@/modules/api/websocket/transformers/model/user.transformer";
+import {transformProfileDto} from "@/modules/api/websocket/transformers/model/profile.transformer";
+import {
+  getRoomsOnline,
+  getTransformRoomDto,
+} from "@/modules/api/websocket/transformers/model/room.transformer";
+
+
+export function transformSetWsId(
+  {
+    myRooms,
+    allUsersInTheseRooms,
+    channels,
+    users,
+    online,
+    id,
+    user,
+    time,
+  }: TransformSetWsIdDataParams
+): SetWsIdMessage {
+  const roomsOnlineDict = getRoomsOnline(allUsersInTheseRooms);
+  return {
+    action: "setWsId",
+    channels: channels.map(transformChannelDto),
+    rooms: myRooms.map((room) => getTransformRoomDto(roomsOnlineDict[room.id], room)),
+    handler: "ws",
+    time,
+    users: users.map(transformUserDto),
+    online,
+    opponentWsId: id,
+    profile: transformProfileDto(user),
+    settings: transformSettings(user),
+  };
+}
diff --git a/newback/src/modules/api/websocket/transformers/sync.message.transformer.ts b/newback/src/modules/api/websocket/transformers/out.message/sync.message.transformer.ts
similarity index 74%
rename from newback/src/modules/api/websocket/transformers/sync.message.transformer.ts
rename to newback/src/modules/api/websocket/transformers/out.message/sync.message.transformer.ts
index f0ca92975..8c0adf475 100644
--- a/newback/src/modules/api/websocket/transformers/sync.message.transformer.ts
+++ b/newback/src/modules/api/websocket/transformers/out.message/sync.message.transformer.ts
@@ -2,7 +2,7 @@ import {MessageModel} from '@/data/model/message.model';
 import {MessageMentionModel} from '@/data/model/message.mention.model';
 import {ImageModel} from '@/data/model/image.model';
 import {SyncHistoryWsInMessage} from '@/data/types/frontend';
-import {getMessage} from '@/modules/api/websocket/transformers/message.transformer';
+import {transformMessageDto} from '@/modules/api/websocket/transformers/model/message.transformer';
 
 export function getSyncMessage(
   readMessageIds: number[],
@@ -14,6 +14,6 @@ export function getSyncMessage(
   return {
     readMessageIds,
     receivedMessageIds,
-    content: messages.map((m) => getMessage(m, mentions, images)),
+    content: messages.map((m) => transformMessageDto(m, mentions, images)),
   };
 }
diff --git a/newback/src/modules/api/websocket/transformers/room.transformer.ts b/newback/src/modules/api/websocket/transformers/room.transformer.ts
deleted file mode 100644
index eab28d5ce..000000000
--- a/newback/src/modules/api/websocket/transformers/room.transformer.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {RoomUsersModel} from '@/data/model/room.users.model';
-import {GetRoomsForUser} from '@/data/types/internal';
-import {RoomDto} from '@/data/types/frontend';
-
-export function getTransformRoomFn(allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[]): (r: GetRoomsForUser) => RoomDto {
-  const roomUsersIdInfoDict: Record<string, number[]> = allUsersInTheseRooms.reduce<Record<string, number[]>>((previousValue, currentValue) => {
-    if (!previousValue[currentValue.roomId]) {
-      previousValue[currentValue.roomId] = [];
-    }
-    previousValue[currentValue.roomId].push(currentValue.userId);
-    return previousValue;
-  }, {});
-  return (room: GetRoomsForUser) => ({
-    name: room.name,
-    id: room.id,
-    channelId: room.channelId,
-    p2p: Boolean(room.p2p),
-    notifications: Boolean(room.roomUsers.notifications),
-    users: roomUsersIdInfoDict[room.id],
-    isMainInChannel: Boolean(room.isMainInChannel),
-    creatorId: room.creatorId,
-    volume: room.roomUsers.volume,
-  });
-}
diff --git a/newback/src/modules/api/websocket/transformers/set.ws.id.transformer.ts b/newback/src/modules/api/websocket/transformers/set.ws.id.transformer.ts
deleted file mode 100644
index 2c32722fa..000000000
--- a/newback/src/modules/api/websocket/transformers/set.ws.id.transformer.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {TransformSetWsIdDataParams} from '@/data/types/internal';
-import {SetWsIdMessage} from '@/data/types/frontend';
-import {getTransformRoomFn} from '@/modules/api/websocket/transformers/room.transformer';
-import {transformChannelsDto} from '@/modules/api/websocket/transformers/channel.transformer';
-import {transformUserDto} from '@/modules/api/websocket/transformers/user.transformer';
-import {transformProfile} from '@/modules/api/websocket/transformers/profile.transformer';
-import {transformSettings} from '@/modules/api/websocket/transformers/settings.transformer';
-
-export function transformSetWsId(
-  {
-    myRooms,
-    allUsersInTheseRooms,
-    channels,
-    users,
-    online,
-    id,
-    user,
-    time,
-  }: TransformSetWsIdDataParams
-): SetWsIdMessage {
-  return {
-    action: "setWsId",
-    channels: channels.map(transformChannelsDto),
-    rooms: myRooms.map(getTransformRoomFn(allUsersInTheseRooms)),
-    handler: "ws",
-    time,
-    users: users.map(transformUserDto),
-    online,
-    opponentWsId: id,
-    profile: transformProfile(user),
-    settings: transformSettings(user),
-  };
-}
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 98658b39c..2d3862e41 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -12,9 +12,9 @@ import type {UserModel} from "@/data/model/user.model";
 import type {WebSocketContextData} from "@/data/types/internal";
 import {RedisService} from "@/modules/rest/redis/redis.service";
 import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
-import {transformSetWsId} from '@/modules/api/websocket/transformers/set.ws.id.transformer';
-import {transformAddUserOnline} from '@/modules/api/websocket/transformers/add.online.user.transformer';
-import {getLogoutMessage} from '@/modules/api/websocket/transformers/remove.online.user.transformer';
+import {transformSetWsId} from "@/modules/api/websocket/transformers/out.message/set.ws.id.transformer";
+import {transformAddUserOnline} from "@/modules/api/websocket/transformers/out.message/add.online.user.transformer";
+import {getLogoutMessage} from "@/modules/api/websocket/transformers/out.message/remove.online.user.transformer";
 
 
 @Injectable()
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index e986a8511..48b3231fd 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -9,7 +9,7 @@ import type {WebSocketContextData} from "@/data/types/internal";
 import {ConfigService} from "@/modules/rest/config/config.service";
 import {ValidationException} from "@/data/exceptions/validation.exception";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
-import {transformUserCountries} from '@/modules/api/websocket/transformers/get.user.contries.transformer';
+import {transformUserCountries} from '@/modules/api/websocket/transformers/out.message/get.user.contries.transformer';
 
 
 @Injectable()

From 51d2795b01f19bcade37909e5b0d6e9a3eac08e1 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 18 Apr 2022 23:40:45 +0300
Subject: [PATCH 080/221] Refactored transformers

---
 frontend/src/ts/utils/htmlApi.ts              | 20 ++++++----
 .../src/vue/chat/message/ChatTextMessage.vue  |  6 ++-
 .../src/vue/chat/textarea/ChatTextArea.vue    | 10 ++++-
 newback/src/data/types/internal.ts            | 20 +++++++++-
 newback/src/modules/api/file/file.module.ts   |  4 +-
 .../api/websocket/interfaces/pubsub.ts        | 14 -------
 .../modules/api/websocket/interfaces/utils.ts |  5 ---
 .../api/websocket/websocket.gateway.ts        |  8 ++--
 .../modules/app/guards/own.message.guard.ts   |  2 +-
 .../src/modules/app/guards/own.room.guard.ts  |  2 +-
 .../src/modules/rest/pubsub/pubsub.service.ts |  6 ++-
 newback/src/utils/migration.old.ts            | 38 +++++++++++--------
 12 files changed, 81 insertions(+), 54 deletions(-)
 delete mode 100644 newback/src/modules/api/websocket/interfaces/pubsub.ts
 delete mode 100644 newback/src/modules/api/websocket/interfaces/utils.ts

diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index d1b33e0df..cc5206523 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -238,7 +238,13 @@ function encodeFiles(html: string, files: Record<string, FileModel> | null) {
     html = html.replace(imageUnicodeRegex, (s) => {
       const v = files[s];
       if (v) {
-        if (v.type === ImageType.IMAGE) {
+        if (v.type === ImageType.IMAGE && v.preview) {
+          return `<picture symbol='${s}' class='${PASTED_IMG_CLASS}' serverId="${v.serverId}">
+            <source srcset="${resolveMediaUrl(v.preview!)}" type="image/webp">
+            <source srcset="${resolveMediaUrl(v.url!)}"> 
+            <img src="${resolveMediaUrl(v.url!)}">
+          </picture>`;
+        } else if (v.type === ImageType.IMAGE) {
           return `<img src='${resolveMediaUrl(v.url!)}' symbol='${s}' class='${PASTED_IMG_CLASS}' serverId="${v.serverId}"/>`;
         } else if (v.type === ImageType.VIDEO || v.type === ImageType.MEDIA_RECORD) {
           const className = v.type === ImageType.VIDEO ? "video-player" : "video-player video-record";
@@ -501,10 +507,10 @@ export function pasteBlobToContentEditable(blob: Blob, textArea: HTMLElement) {
 
 export function pasteBlobVideoToTextArea(file: Blob, textArea: HTMLElement, videoType: string, errCb: Function) {
   const video = document.createElement("video");
-  video.style.opacity = '0';
-  video.style.width = '0';
-  video.style.height = '0';
-  video.style.position = 'absolute'
+  video.style.opacity = "0";
+  video.style.width = "0";
+  video.style.height = "0";
+  video.style.position = "absolute";
   document.body.appendChild(video);
   if (video.canPlayType(file.type)) {
     video.autoplay = false;
@@ -528,7 +534,7 @@ export function pasteBlobVideoToTextArea(file: Blob, textArea: HTMLElement, vide
               if (file.name) {
                 blob.name = `${file.name}.jpg`;
               } else {
-                blob.name = '.jpg';
+                blob.name = ".jpg";
               }
 
               img.src = url;
@@ -545,7 +551,7 @@ export function pasteBlobVideoToTextArea(file: Blob, textArea: HTMLElement, vide
       }, 100); // https://stackoverflow.com/a/71900837/3872976
     }, false);
     video.src = src;
-    video.load()
+    video.load();
   } else {
     errCb(`Browser doesn't support playing ${file.type}`);
   }
diff --git a/frontend/src/vue/chat/message/ChatTextMessage.vue b/frontend/src/vue/chat/message/ChatTextMessage.vue
index 9dcbd940d..cfe5c9fbc 100644
--- a/frontend/src/vue/chat/message/ChatTextMessage.vue
+++ b/frontend/src/vue/chat/message/ChatTextMessage.vue
@@ -239,9 +239,13 @@ export default class ChatTextMessage extends Vue {
       width: 100px
       height: 36px
 
-  :deep(.B4j2ContentEditableImg)
+  :deep(img.B4j2ContentEditableImg)
     @include margin-img-def
     @include margin-img
+  :deep(picture.B4j2ContentEditableImg)
+    @include margin-img-def
+    img
+      @include margin-img-def
 
     &.failed
       min-width: 200px
diff --git a/frontend/src/vue/chat/textarea/ChatTextArea.vue b/frontend/src/vue/chat/textarea/ChatTextArea.vue
index 90a7dae09..5dc77ebfb 100644
--- a/frontend/src/vue/chat/textarea/ChatTextArea.vue
+++ b/frontend/src/vue/chat/textarea/ChatTextArea.vue
@@ -548,7 +548,7 @@ export default class ChatTextArea extends Vue {
   overflow-y: auto
   white-space: pre-wrap
 
-  :deep(.B4j2ContentEditableImg), :deep(.giphy-img)
+  :deep(img.B4j2ContentEditableImg), :deep(.giphy-img)
     max-height: 200px
     max-width: 400px
 
@@ -556,6 +556,14 @@ export default class ChatTextArea extends Vue {
       min-width: 200px
       min-height: 100px
 
+  :deep(picture.B4j2ContentEditableImg)
+    img
+      max-height: 200px
+      max-width: 400px
+      &.failed
+        min-width: 200px
+        min-height: 100px
+
   :deep(.audio-record)
     height: 50px
 
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index a619676bf..718f59cad 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,4 +1,7 @@
-import type {DefaultWsInMessage} from "@/data/types/frontend";
+import type {
+  DefaultWsInMessage,
+  HandlerName
+} from "@/data/types/frontend";
 import type {RoomModel} from "@/data/model/room.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {ChannelModel} from "@/data/model/channel.model";
@@ -25,6 +28,21 @@ export interface FileSaveResponse {
   previewFileName: string;
 }
 
+export interface OnWsClose {
+  closeConnection(context: WebSocketContextData);
+}
+
+export interface PubSubMessage<A extends string, H extends HandlerName> {
+  body: DefaultWsInMessage<A, H>;
+}
+
+/*
+ * Export interface SendToClientPubSubMessage<A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
+ * }
+ */
+export type SendToClientPubSubMessage<DATA extends DefaultWsInMessage<A, H>, A extends string, H extends HandlerName> = PubSubMessage<A, H>;
+
+
 export interface TransformSetWsIdDataParams {
   myRooms: GetRoomsForUser[];
   allUsersInTheseRooms: Pick<RoomUsersModel, "roomId" | "userId">[];
diff --git a/newback/src/modules/api/file/file.module.ts b/newback/src/modules/api/file/file.module.ts
index 0c9ec2392..24b9eb21e 100644
--- a/newback/src/modules/api/file/file.module.ts
+++ b/newback/src/modules/api/file/file.module.ts
@@ -13,8 +13,8 @@ import {FileService} from "@/modules/api/file/file.service";
   imports: [
     DatabaseModule,
     ServeStaticModule.forRoot({
-      rootPath: join(__dirname, "..", "..", "..", "photos"),
-      serveRoot: "photo",
+      rootPath: join(__dirname, "..", "..", "..", "..", "photos"),
+      serveRoot: "/photo",
     }),
   ],
   controllers: [FileController],
diff --git a/newback/src/modules/api/websocket/interfaces/pubsub.ts b/newback/src/modules/api/websocket/interfaces/pubsub.ts
deleted file mode 100644
index c186af540..000000000
--- a/newback/src/modules/api/websocket/interfaces/pubsub.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {
-  DefaultWsInMessage,
-  HandlerName,
-} from "@/data/types/frontend";
-
-export interface PubSubMessage<A extends string, H extends HandlerName> {
-  body: DefaultWsInMessage<A, H>;
-}
-
-/*
- * Export interface SendToClientPubSubMessage<A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
- * }
- */
-export type SendToClientPubSubMessage<DATA extends DefaultWsInMessage<A, H>, A extends string, H extends HandlerName> = PubSubMessage<A, H>;
diff --git a/newback/src/modules/api/websocket/interfaces/utils.ts b/newback/src/modules/api/websocket/interfaces/utils.ts
deleted file mode 100644
index 89ae7c0a7..000000000
--- a/newback/src/modules/api/websocket/interfaces/utils.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type {WebSocketContextData} from "@/data/types/internal";
-
-export interface OnWsClose {
-  closeConnection(context: WebSocketContextData);
-}
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 636c55e02..c601561cc 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -10,7 +10,11 @@ import {
   Server,
   WebSocket,
 } from "ws";
-import {WebSocketContextData} from "@/data/types/internal";
+import {
+  OnWsClose,
+  SendToClientPubSubMessage,
+  WebSocketContextData
+} from "@/data/types/internal";
 import {
   Logger,
   UseFilters,
@@ -27,9 +31,7 @@ import {
   SyncHistoryWsOutMessage,
 } from "@/data/types/frontend";
 import {SubscribePuBSub} from "@/modules/rest/pubsub/pubsub.service";
-import {SendToClientPubSubMessage} from "@/modules/api/websocket/interfaces/pubsub";
 import {WebsocketService} from "@/modules/api/websocket/websocket.service";
-import type {OnWsClose} from "@/modules/api/websocket/interfaces/utils";
 import {WsDataService} from "@/modules/api/websocket/ws.data.service";
 import {WsExceptionFilter} from "@/modules/api/websocket/ws.exception.filter";
 import {MessageService} from "@/modules/api/websocket/message.service";
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
index f0118f0e5..57d6799e4 100644
--- a/newback/src/modules/app/guards/own.message.guard.ts
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -11,7 +11,7 @@ import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 import type {DefaultWsOutMessage} from "@/data/types/frontend";
 
 
-export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]) => {
+export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
   @Injectable()
   class OwnMessageGuardMixin implements CanActivate {
     constructor(
diff --git a/newback/src/modules/app/guards/own.room.guard.ts b/newback/src/modules/app/guards/own.room.guard.ts
index cd37ca7eb..87b21f006 100644
--- a/newback/src/modules/app/guards/own.room.guard.ts
+++ b/newback/src/modules/app/guards/own.room.guard.ts
@@ -11,7 +11,7 @@ import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
 import type {DefaultWsOutMessage} from "@/data/types/frontend";
 
 
-export const OwnRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]) => {
+export const OwnRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
   @Injectable()
   class OwnMessageGuardMixin implements CanActivate {
     constructor(
diff --git a/newback/src/modules/rest/pubsub/pubsub.service.ts b/newback/src/modules/rest/pubsub/pubsub.service.ts
index 03f61be1d..9ba78e8e5 100644
--- a/newback/src/modules/rest/pubsub/pubsub.service.ts
+++ b/newback/src/modules/rest/pubsub/pubsub.service.ts
@@ -3,8 +3,10 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import type {WebSocketContextData} from "@/data/types/internal";
-import type {PubSubMessage} from "@/modules/api/websocket/interfaces/pubsub";
+import type {
+  PubSubMessage,
+  WebSocketContextData
+} from "@/data/types/internal";
 import type {HandlerName} from "@/data/types/frontend";
 
 
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index af09aee56..6ae6465a0 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -21,25 +21,31 @@ import {SubscriptionModel} from "@/data/model/subscription.model";
 import {SubscriptionMessageModel} from "@/data/model/subscription.message.model";
 import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import {VerificationModel} from "@/data/model/verification.model";
-import * as pychat_chat_channel from "@/fixtures/prod/pychat_chat_channel.json";
-import * as pychat_chat_image from "@/fixtures/prod/pychat_chat_image.json";
-import * as pychat_chat_ip_address from "@/fixtures/prod/pychat_chat_ip_address.json";
-import * as pychat_chat_message from "@/fixtures/prod/pychat_chat_message.json";
-import * as pychat_chat_messagehistory from "@/fixtures/prod/pychat_chat_messagehistory.json";
-import * as pychat_chat_messagemention from "@/fixtures/prod/pychat_chat_messagemention.json";
-import * as pychat_chat_room from "@/fixtures/prod/pychat_chat_room.json";
-import * as pychat_chat_room_users from "@/fixtures/prod/pychat_chat_room_users.json";
-import * as pychat_chat_subscription from "@/fixtures/prod/pychat_chat_subscription.json";
-import * as pychat_chat_subscription_message from "@/fixtures/prod/pychat_chat_subscription_message.json";
-import * as pychat_chat_uploadedfile from "@/fixtures/prod/pychat_chat_uploadedfile.json";
-import * as pychat_chat_user_joined_info from "@/fixtures/prod/pychat_chat_user_joined_info.json";
-import * as pychat_chat_user from "@/fixtures/prod/pychat_chat_user.json";
-import * as pychat_chat_userprofile from "@/fixtures/prod/pychat_chat_userprofile.json";
-import * as pychat_chat_verification from "@/fixtures/prod/pychat_chat_verification.json";
 import {IpAddressModel} from "@/data/model/ip.address.model";
 
 
 async function bootstrap() {
+
+  // we should use require, since these files are not commited in git,
+  // and thus compilation for this file will fail if these are absent
+  // which will fail the whole build. require doesn't check types during compile but import does
+  const pychat_chat_channel = require("@/fixtures/prod/pychat_chat_channel.json");
+  const pychat_chat_image = require("@/fixtures/prod/pychat_chat_image.json");
+  const pychat_chat_ip_address = require("@/fixtures/prod/pychat_chat_ip_address.json");
+  const pychat_chat_message = require("@/fixtures/prod/pychat_chat_message.json");
+  const pychat_chat_messagehistory = require("@/fixtures/prod/pychat_chat_messagehistory.json");
+  const pychat_chat_messagemention = require("@/fixtures/prod/pychat_chat_messagemention.json");
+  const pychat_chat_room = require("@/fixtures/prod/pychat_chat_room.json");
+  const pychat_chat_room_users = require("@/fixtures/prod/pychat_chat_room_users.json");
+  const pychat_chat_subscription = require("@/fixtures/prod/pychat_chat_subscription.json");
+  const pychat_chat_subscription_message = require("@/fixtures/prod/pychat_chat_subscription_message.json");
+  const pychat_chat_uploadedfile = require("@/fixtures/prod/pychat_chat_uploadedfile.json");
+  const pychat_chat_user_joined_info = require("@/fixtures/prod/pychat_chat_user_joined_info.json");
+  const pychat_chat_user = require("@/fixtures/prod/pychat_chat_user.json");
+  const pychat_chat_userprofile = require("@/fixtures/prod/pychat_chat_userprofile.json");
+  const pychat_chat_verification = require("@/fixtures/prod/pychat_chat_verification.json");
+
+
   const app = await Test.createTestingModule({
     imports: [
       {
@@ -162,7 +168,7 @@ async function bootstrap() {
     });
     await roomModel.bulkCreate(rooms, {transaction});
 
-    const messaggs = pychat_chat_message.map((key) => {
+    const messaggs = (pychat_chat_message as any[]).map((key) => {
       const result: MessageModel = {
         id: key.id,
         senderId: key.sender_id,

From e11b37439b2d31587a9764a8f5a5616c30d3bf99 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 19 Apr 2022 00:02:35 +0300
Subject: [PATCH 081/221] Restructure code

---
 newback/package.json                          |  4 +--
 newback/src/config/Config.d.ts                | 35 +++----------------
 newback/src/config/default.json               |  6 ++--
 newback/src/{utils => data}/consts.ts         |  0
 newback/src/data/model/user.model.ts          |  2 +-
 .../helper/generate.user.name.spec.ts         | 15 ++++++++
 .../transformers/helper/generate.user.name.ts |  5 +++
 .../transformers/helper/get.max.symbol.ts     | 14 ++++++++
 .../transformers/model/channel.transformer.ts |  0
 .../transformers/model/image.transformer.ts   |  0
 .../transformers/model/mention.transformer.ts |  0
 .../transformers/model/message.transformer.ts |  5 +--
 .../transformers/model/profile.transformer.ts |  0
 .../transformers/model/room.transformer.ts    |  0
 .../model/settings.transformer.ts             |  0
 .../transformers/model/user.transformer.ts    |  0
 .../add.online.user.transformer.ts            |  0
 .../get.user.contries.transformer.ts          |  0
 .../out.message/inner.transformer.ts          |  0
 .../out.message/print.message.transformer.ts  |  2 +-
 .../remove.online.user.transformer.ts         |  0
 .../out.message/set.ws.id.transformer.ts      | 10 +++---
 .../out.message/sync.message.transformer.ts   |  2 +-
 newback/src/main.ts                           | 18 +++++-----
 .../src/modules/api/auth/auth.module.spec.ts  | 28 +++++++--------
 newback/src/modules/api/auth/auth.module.ts   | 16 ++++-----
 newback/src/modules/api/auth/auth.service.ts  | 24 ++++++-------
 .../modules/api/auth/facebook.auth.service.ts |  4 +--
 .../validators/sign.up.request.validator.ts   |  3 +-
 .../validate.user.request.validator.ts        |  2 +-
 newback/src/modules/api/file/file.module.ts   |  8 ++---
 newback/src/modules/api/file/file.service.ts  |  2 +-
 .../modules/api/file/image.service.spec.ts    |  4 +--
 newback/src/modules/api/file/image.service.ts |  2 +-
 .../modules/api/verify/verify.module.spec.ts  | 28 +++++++--------
 .../src/modules/api/verify/verify.module.ts   | 14 ++++----
 .../src/modules/api/verify/verify.service.ts  | 12 +++----
 .../modules/api/websocket/message.service.ts  | 12 +++----
 .../websocket/websocket.gateway.e2e.spec.ts   | 20 +++++------
 .../api/websocket/websocket.gateway.ts        |  2 +-
 .../modules/api/websocket/websocket.module.ts | 10 +++---
 .../api/websocket/websocket.service.ts        | 21 +++++------
 .../modules/api/websocket/ws.data.service.ts  |  8 ++---
 newback/src/modules/app/app.module.ts         |  6 ++--
 newback/src/modules/app/guards/auth.guard.ts  |  4 +--
 .../src/modules/app/guards/captcha.guard.ts   |  4 +--
 .../modules/app/guards/own.message.guard.ts   |  4 +--
 .../src/modules/app/guards/own.room.guard.ts  |  4 +--
 newback/src/modules/rest/ip/ip.module.ts      | 17 ---------
 .../{rest => shared}/config/config.module.ts  |  2 +-
 .../{rest => shared}/config/config.service.ts |  0
 .../database/database.module.ts               | 12 +++----
 .../database/repository/ip.repository.ts      |  0
 .../repository/message.repository.e2e.spec.ts |  8 ++---
 .../repository/messages.repository.ts         |  0
 .../database/repository/room.repository.ts    |  0
 .../database/repository/user.repository.ts    |  0
 .../repository/verification.repository.ts     |  0
 .../{rest => shared}/email/email.module.ts    |  4 +--
 .../email/email.service.spec.ts               |  8 ++---
 .../{rest => shared}/email/email.service.ts   |  4 +--
 .../html/html.service.spec.ts                 |  2 +-
 .../{rest => shared}/html/html.service.ts     |  0
 .../{rest => shared}/http/http.module.ts      |  2 +-
 .../{rest => shared}/http/http.service.ts     |  0
 .../{rest => shared}/ip/ip.cache.service.ts   |  6 ++--
 newback/src/modules/shared/ip/ip.module.ts    | 17 +++++++++
 .../ip/ip.service.e2e.spec.ts                 |  6 ++--
 .../modules/{rest => shared}/ip/ip.service.ts |  2 +-
 .../{rest => shared}/logger/logger.module.ts  |  0
 .../password/password.service.ts              |  0
 .../{rest => shared}/pubsub/pubsub.service.ts |  0
 .../{rest => shared}/redis/redis.service.ts   |  2 +-
 .../session/session.service.ts                |  6 ++--
 .../{rest => shared}/ws.adapter/ws.adapter.ts |  0
 .../{helpers.ts => generate.orm.config.ts}    | 19 ++--------
 newback/src/utils/helpers.spec.ts             | 16 ---------
 newback/src/{ => utils}/jest.config.ts        |  6 ++--
 newback/src/{ => utils}/jest.setup.ts         |  0
 newback/src/utils/migration.old.ts            | 14 ++++----
 80 files changed, 251 insertions(+), 262 deletions(-)
 rename newback/src/{utils => data}/consts.ts (100%)
 create mode 100644 newback/src/data/transformers/helper/generate.user.name.spec.ts
 create mode 100644 newback/src/data/transformers/helper/generate.user.name.ts
 create mode 100644 newback/src/data/transformers/helper/get.max.symbol.ts
 rename newback/src/{modules/api/websocket => data}/transformers/model/channel.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/model/image.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/model/mention.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/model/message.transformer.ts (82%)
 rename newback/src/{modules/api/websocket => data}/transformers/model/profile.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/model/room.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/model/settings.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/model/user.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/out.message/add.online.user.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/out.message/get.user.contries.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/out.message/inner.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/out.message/print.message.transformer.ts (86%)
 rename newback/src/{modules/api/websocket => data}/transformers/out.message/remove.online.user.transformer.ts (100%)
 rename newback/src/{modules/api/websocket => data}/transformers/out.message/set.ws.id.transformer.ts (63%)
 rename newback/src/{modules/api/websocket => data}/transformers/out.message/sync.message.transformer.ts (85%)
 delete mode 100644 newback/src/modules/rest/ip/ip.module.ts
 rename newback/src/modules/{rest => shared}/config/config.module.ts (80%)
 rename newback/src/modules/{rest => shared}/config/config.service.ts (100%)
 rename newback/src/modules/{rest => shared}/database/database.module.ts (81%)
 rename newback/src/modules/{rest => shared}/database/repository/ip.repository.ts (100%)
 rename newback/src/modules/{rest => shared}/database/repository/message.repository.e2e.spec.ts (78%)
 rename newback/src/modules/{rest => shared}/database/repository/messages.repository.ts (100%)
 rename newback/src/modules/{rest => shared}/database/repository/room.repository.ts (100%)
 rename newback/src/modules/{rest => shared}/database/repository/user.repository.ts (100%)
 rename newback/src/modules/{rest => shared}/database/repository/verification.repository.ts (100%)
 rename newback/src/modules/{rest => shared}/email/email.module.ts (79%)
 rename newback/src/modules/{rest => shared}/email/email.service.spec.ts (91%)
 rename newback/src/modules/{rest => shared}/email/email.service.ts (94%)
 rename newback/src/modules/{rest => shared}/html/html.service.spec.ts (94%)
 rename newback/src/modules/{rest => shared}/html/html.service.ts (100%)
 rename newback/src/modules/{rest => shared}/http/http.module.ts (83%)
 rename newback/src/modules/{rest => shared}/http/http.service.ts (100%)
 rename newback/src/modules/{rest => shared}/ip/ip.cache.service.ts (92%)
 create mode 100644 newback/src/modules/shared/ip/ip.module.ts
 rename newback/src/modules/{rest => shared}/ip/ip.service.e2e.spec.ts (86%)
 rename newback/src/modules/{rest => shared}/ip/ip.service.ts (92%)
 rename newback/src/modules/{rest => shared}/logger/logger.module.ts (100%)
 rename newback/src/modules/{rest => shared}/password/password.service.ts (100%)
 rename newback/src/modules/{rest => shared}/pubsub/pubsub.service.ts (100%)
 rename newback/src/modules/{rest => shared}/redis/redis.service.ts (98%)
 rename newback/src/modules/{rest => shared}/session/session.service.ts (86%)
 rename newback/src/modules/{rest => shared}/ws.adapter/ws.adapter.ts (100%)
 rename newback/src/utils/{helpers.ts => generate.orm.config.ts} (54%)
 delete mode 100644 newback/src/utils/helpers.spec.ts
 rename newback/src/{ => utils}/jest.config.ts (72%)
 rename newback/src/{ => utils}/jest.setup.ts (100%)

diff --git a/newback/package.json b/newback/package.json
index aad718900..4d2fafb45 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -9,8 +9,8 @@
     "migrate": "ts-node --compiler ttypescript ./src/utils/migration.runner.ts ",
     "build": "rm -rf ./dist && ttsc",
     "start": "ts-node --compiler ttypescript src/main.ts",
-    "test:html:coverage": "jest --config ./src/jest.config.ts --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
-    "test": "jest --config ./src/jest.config.ts --runInBand --coverage --coverageReporters text",
+    "test:html:coverage": "jest --config ./src/utils/jest.config.ts --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
+    "test": "jest --config ./src/utils/jest.config.ts --runInBand --coverage --coverageReporters text",
     "lint": "eslint --ext .ts --max-warnings=0 src",
     "lint:new": "eslint-find-rules -u ./.eslintrc.json",
     "lint:fix": "eslint --fix --ext .ts src",
diff --git a/newback/src/config/Config.d.ts b/newback/src/config/Config.d.ts
index 44fe71045..cd5e7c788 100644
--- a/newback/src/config/Config.d.ts
+++ b/newback/src/config/Config.d.ts
@@ -1,3 +1,4 @@
+/* tslint:disable */
 /* eslint-disable */
 declare module "node-ts-config" {
   interface IConfig {
@@ -11,86 +12,58 @@ declare module "node-ts-config" {
     recaptcha: Recaptcha
     email: Email
   }
-
   interface Email {
     host: string
     port: number
     secure: boolean
     auth: Auth2
   }
-
   interface Auth2 {
     user: string
     pass: string
   }
-
   interface Recaptcha {
     publicKey: string
     privateKey: string
   }
-
   interface Auth {
     google: Google
     facebook: Facebook
   }
-
   interface Facebook {
     accessToken: string
   }
-
   interface Google {
     clientId: string
   }
-
   interface Mysql {
     host: string
     port: number
     username: string
     password: string
     database: string
-    synchronize: boolean
     logging: boolean
   }
-
   interface Frontend {
     address: string
-    jsConsoleLogs: string
-    maxMessageSize: number
     issueReportLink: string
-    chromeExtension: ChromeExtension
   }
-
-  interface ChromeExtension {
-    id: string
-    url: string
-  }
-
   interface Redis {
     host: string
     port: number
     database: number
   }
-
   interface Settings {
-    wsIdCharLength: number
-    allRedisRoom: string
-    allRoomId: number
     flags: boolean
-    firebaseUrl: string
-    pingCloseJsDelay: number
-    pingInterval: number
-    clientNoServerPingCloseTimeout: number
   }
-
   interface Application {
-    env: string
     port: number
-    logLevel: string
-    logOutput: string
+    ssl: Ssl
+  }
+  interface Ssl {
     crtPath: string
     keyPath: string
   }
-
   export const config: Config
   export type Config = IConfig
 }
diff --git a/newback/src/config/default.json b/newback/src/config/default.json
index 3baddc761..9e91b50f1 100644
--- a/newback/src/config/default.json
+++ b/newback/src/config/default.json
@@ -2,8 +2,10 @@
   "name": "pychat",
   "application": {
     "port": 8888,
-    "crtPath": "../frontend/build/certs/server.crt.pem",
-    "keyPath": "../frontend/build/certs/private.key.pem"
+    "ssl" : {
+      "crtPath": "../frontend/build/certs/server.crt.pem",
+      "keyPath": "../frontend/build/certs/private.key.pem"
+    }
   },
   "settings": {
     "flags": true
diff --git a/newback/src/utils/consts.ts b/newback/src/data/consts.ts
similarity index 100%
rename from newback/src/utils/consts.ts
rename to newback/src/data/consts.ts
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index 321761952..3756e7de2 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -8,9 +8,9 @@ import {
 import {Injectable} from "@nestjs/common";
 import {Gender} from "@/data/types/frontend";
 import {UserAuthModel} from "@/data/model/user.auth.model";
-import {MAX_USERNAME_LENGTH} from "@/utils/consts";
 import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
+import {MAX_USERNAME_LENGTH} from '@/data/consts';
 
 
 @Injectable()
diff --git a/newback/src/data/transformers/helper/generate.user.name.spec.ts b/newback/src/data/transformers/helper/generate.user.name.spec.ts
new file mode 100644
index 000000000..097df5d3a
--- /dev/null
+++ b/newback/src/data/transformers/helper/generate.user.name.spec.ts
@@ -0,0 +1,15 @@
+import {generateUserName} from '@/data/transformers/helper/generate.user.name';
+
+
+describe("generateUserName", () => {
+  it("should remove email domain", () => {
+    expect(generateUserName("deathangel@gmail.com")).toEqual("deathangel");
+  });
+
+  it("should cut to 16 symbolx", () => {
+    expect(generateUserName("deathangasdfasfasdfsadfasdfel@gmail.com")).toHaveLength(16);
+  });
+  it("should replace multiple invalid chars", () => {
+    expect(generateUserName("f#8f))c@gmail.com")).toEqual("f-8f-c");
+  });
+});
diff --git a/newback/src/data/transformers/helper/generate.user.name.ts b/newback/src/data/transformers/helper/generate.user.name.ts
new file mode 100644
index 000000000..b4b0cf851
--- /dev/null
+++ b/newback/src/data/transformers/helper/generate.user.name.ts
@@ -0,0 +1,5 @@
+import {MAX_USERNAME_LENGTH} from '@/data/consts';
+
+export function generateUserName(email: string) {
+  return email.split("@")[0].replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, MAX_USERNAME_LENGTH);
+}
diff --git a/newback/src/data/transformers/helper/get.max.symbol.ts b/newback/src/data/transformers/helper/get.max.symbol.ts
new file mode 100644
index 000000000..4a6d9ba12
--- /dev/null
+++ b/newback/src/data/transformers/helper/get.max.symbol.ts
@@ -0,0 +1,14 @@
+import {UploadedFileModel} from '@/data/model/uploaded.file.model';
+import {GiphyDto} from '@/data/types/frontend';
+
+
+export function getMaxSymbol(files: UploadedFileModel[], tags: Record<string, number>, giphies: GiphyDto[]) {
+  const maxSymInt: number = Math.max(
+    0,
+    ...files.map((f) => f.symbol.charCodeAt(0)),
+    ...Object.keys(tags).map((k) => k.charCodeAt(0)),
+    ...giphies.map((g) => g.symbol.charCodeAt(0))
+  );
+  const symbol: string | null = maxSymInt === 0 ? null : String.fromCharCode(maxSymInt);
+  return symbol;
+}
diff --git a/newback/src/modules/api/websocket/transformers/model/channel.transformer.ts b/newback/src/data/transformers/model/channel.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/model/channel.transformer.ts
rename to newback/src/data/transformers/model/channel.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/model/image.transformer.ts b/newback/src/data/transformers/model/image.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/model/image.transformer.ts
rename to newback/src/data/transformers/model/image.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/model/mention.transformer.ts b/newback/src/data/transformers/model/mention.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/model/mention.transformer.ts
rename to newback/src/data/transformers/model/mention.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/model/message.transformer.ts b/newback/src/data/transformers/model/message.transformer.ts
similarity index 82%
rename from newback/src/modules/api/websocket/transformers/model/message.transformer.ts
rename to newback/src/data/transformers/model/message.transformer.ts
index dd3a59324..83c0f7b32 100644
--- a/newback/src/modules/api/websocket/transformers/model/message.transformer.ts
+++ b/newback/src/data/transformers/model/message.transformer.ts
@@ -6,8 +6,9 @@ import type {
   CreateModel,
   PureModel,
 } from "@/data/types/internal";
-import {transformMentionByPickingDto} from '@/modules/api/websocket/transformers/model/mention.transformer';
-import {transformImageByPickingDto} from '@/modules/api/websocket/transformers/model/image.transformer';
+import {transformMentionByPickingDto} from '@/data/transformers/model/mention.transformer';
+import {transformImageByPickingDto} from '@/data/transformers/model/image.transformer';
+
 
 export function transformMessageDto(message: PureModel<MessageModel>, mentions: CreateModel<MessageMentionModel>[], images: PureModel<ImageModel>[]): MessageModelDto {
   return {
diff --git a/newback/src/modules/api/websocket/transformers/model/profile.transformer.ts b/newback/src/data/transformers/model/profile.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/model/profile.transformer.ts
rename to newback/src/data/transformers/model/profile.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/model/room.transformer.ts b/newback/src/data/transformers/model/room.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/model/room.transformer.ts
rename to newback/src/data/transformers/model/room.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/model/settings.transformer.ts b/newback/src/data/transformers/model/settings.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/model/settings.transformer.ts
rename to newback/src/data/transformers/model/settings.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/model/user.transformer.ts b/newback/src/data/transformers/model/user.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/model/user.transformer.ts
rename to newback/src/data/transformers/model/user.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/out.message/add.online.user.transformer.ts b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/out.message/add.online.user.transformer.ts
rename to newback/src/data/transformers/out.message/add.online.user.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/out.message/get.user.contries.transformer.ts b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/out.message/get.user.contries.transformer.ts
rename to newback/src/data/transformers/out.message/get.user.contries.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/out.message/inner.transformer.ts b/newback/src/data/transformers/out.message/inner.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/out.message/inner.transformer.ts
rename to newback/src/data/transformers/out.message/inner.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/out.message/print.message.transformer.ts b/newback/src/data/transformers/out.message/print.message.transformer.ts
similarity index 86%
rename from newback/src/modules/api/websocket/transformers/out.message/print.message.transformer.ts
rename to newback/src/data/transformers/out.message/print.message.transformer.ts
index b24814076..022ee086d 100644
--- a/newback/src/modules/api/websocket/transformers/out.message/print.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/print.message.transformer.ts
@@ -6,7 +6,7 @@ import type {
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {PrintMessageWsInMessage} from "@/data/types/frontend";
 import type {MessageModel} from "@/data/model/message.model";
-import {transformMessageDto} from '@/modules/api/websocket/transformers/model/message.transformer';
+import {transformMessageDto} from '@/data/transformers/model/message.transformer';
 
 export function transformPrintMessage(
   message: PureModel<MessageModel>,
diff --git a/newback/src/modules/api/websocket/transformers/out.message/remove.online.user.transformer.ts b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
similarity index 100%
rename from newback/src/modules/api/websocket/transformers/out.message/remove.online.user.transformer.ts
rename to newback/src/data/transformers/out.message/remove.online.user.transformer.ts
diff --git a/newback/src/modules/api/websocket/transformers/out.message/set.ws.id.transformer.ts b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
similarity index 63%
rename from newback/src/modules/api/websocket/transformers/out.message/set.ws.id.transformer.ts
rename to newback/src/data/transformers/out.message/set.ws.id.transformer.ts
index 69d552eca..8d87300d5 100644
--- a/newback/src/modules/api/websocket/transformers/out.message/set.ws.id.transformer.ts
+++ b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
@@ -1,14 +1,14 @@
 import type {TransformSetWsIdDataParams} from "@/data/types/internal";
 import type {SetWsIdMessage} from "@/data/types/frontend";
-import {transformChannelDto} from "@/modules/api/websocket/transformers/model/channel.transformer";
+import {transformChannelDto} from "@/data/transformers/model/channel.transformer";
 
-import {transformSettings} from "@/modules/api/websocket/transformers/model/settings.transformer";
-import {transformUserDto} from "@/modules/api/websocket/transformers/model/user.transformer";
-import {transformProfileDto} from "@/modules/api/websocket/transformers/model/profile.transformer";
+import {transformSettings} from "@/data/transformers/model/settings.transformer";
+import {transformUserDto} from "@/data/transformers/model/user.transformer";
+import {transformProfileDto} from "@/data/transformers/model/profile.transformer";
 import {
   getRoomsOnline,
   getTransformRoomDto,
-} from "@/modules/api/websocket/transformers/model/room.transformer";
+} from "@/data/transformers/model/room.transformer";
 
 
 export function transformSetWsId(
diff --git a/newback/src/modules/api/websocket/transformers/out.message/sync.message.transformer.ts b/newback/src/data/transformers/out.message/sync.message.transformer.ts
similarity index 85%
rename from newback/src/modules/api/websocket/transformers/out.message/sync.message.transformer.ts
rename to newback/src/data/transformers/out.message/sync.message.transformer.ts
index 8c0adf475..ec9a743c2 100644
--- a/newback/src/modules/api/websocket/transformers/out.message/sync.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/sync.message.transformer.ts
@@ -2,7 +2,7 @@ import {MessageModel} from '@/data/model/message.model';
 import {MessageMentionModel} from '@/data/model/message.mention.model';
 import {ImageModel} from '@/data/model/image.model';
 import {SyncHistoryWsInMessage} from '@/data/types/frontend';
-import {transformMessageDto} from '@/modules/api/websocket/transformers/model/message.transformer';
+import {transformMessageDto} from '@/data/transformers/model/message.transformer';
 
 export function getSyncMessage(
   readMessageIds: number[],
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 14d6ea4dd..c79f286da 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -6,23 +6,25 @@ import {
   ValidationPipe,
 } from "@nestjs/common";
 import {readFile} from "fs/promises";
-import {WsAdapter} from "@/modules/rest/ws.adapter/ws.adapter";
+import {WsAdapter} from "@/modules/shared/ws.adapter/ws.adapter";
+import type {HttpsOptions} from "@nestjs/common/interfaces/external/https-options.interface";
 
 async function bootstrap() {
-  const key = await readFile(config.application.keyPath, "utf-8");
-  const cert = await readFile(config.application.crtPath, "utf-8");
+  let httpsOptions: HttpsOptions = null;
+  if (config.application.ssl) {
+    httpsOptions = {};
+    httpsOptions.key = await readFile(config.application.ssl.keyPath, "utf-8");
+    httpsOptions.cert = await readFile(config.application.ssl.crtPath, "utf-8");
+  }
 
   const app = await NestFactory.create(AppModule, {
     logger: ["log", "error", "warn", "debug"],
     cors: {
-      allowedHeaders: ["x-requested-with", "session-id", "Content-Type"],
+      allowedHeaders: ["session-id", "Content-Type"],
       methods: ["POST", "GET", "OPTIONS"],
       origin: "*",
     },
-    httpsOptions: {
-      key,
-      cert,
-    },
+    httpsOptions,
   });
   const logger = app.get(Logger);
   app.useLogger(logger);
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index a18073e78..21aa7c74a 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -8,33 +8,33 @@ import * as supertest from "supertest";
 import {Test} from "@nestjs/testing";
 import {AuthService} from "@/modules/api/auth/auth.service";
 import {AuthController} from "@/modules/api/auth/auth.controller";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
-import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {EmailService} from "@/modules/rest/email/email.service";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
+import {PasswordService} from "@/modules/shared/password/password.service";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
+import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {EmailService} from "@/modules/shared/email/email.service";
 import {MailerService} from "@nestjs-modules/mailer";
 import {Sequelize} from "sequelize-typescript";
-import {HtmlService} from "@/modules/rest/html/html.service";
+import {HtmlService} from "@/modules/shared/html/html.service";
 import waitForExpect from "wait-for-expect";
 import {GoogleAuthService} from "@/modules/api/auth/google.auth.service";
 import type {OAuth2Client} from "google-auth-library";
-import {HttpService} from "@/modules/rest/http/http.service";
+import {HttpService} from "@/modules/shared/http/http.service";
 import type fetch from "node-fetch";
 import * as googleResponseFixture from "@/fixtures/google.response.fixture.json";
 import * as facebookGetTokenResponseFixture from "@/fixtures/facebook.get.token.response.json";
 import * as facebookGetUserResponseFixture from "@/fixtures/facebook.get.user.response.json";
-import {ConfigService} from "@/modules/rest/config/config.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 import type {IConfig} from "node-ts-config";
 import {config} from "node-ts-config";
 import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
-import {IpService} from "@/modules/rest/ip/ip.service";
-import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
+import {IpService} from "@/modules/shared/ip/ip.service";
+import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
 import type {IpAddressModel} from "@/data/model/ip.address.model";
-import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
-import {SessionService} from "@/modules/rest/session/session.service";
+import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
+import {SessionService} from "@/modules/shared/session/session.service";
 
 describe("AuthModule", () => {
   let app: INestApplication;
diff --git a/newback/src/modules/api/auth/auth.module.ts b/newback/src/modules/api/auth/auth.module.ts
index a4e4d88fe..14f48aea1 100644
--- a/newback/src/modules/api/auth/auth.module.ts
+++ b/newback/src/modules/api/auth/auth.module.ts
@@ -4,18 +4,18 @@ import {
 } from "@nestjs/common";
 import {AuthController} from "@/modules/api/auth/auth.controller";
 import {AuthService} from "@/modules/api/auth/auth.service";
-import {DatabaseModule} from "@/modules/rest/database/database.module";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {EmailModule} from "@/modules/rest/email/email.module";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {EmailModule} from "@/modules/shared/email/email.module";
 import {GoogleAuthService} from "@/modules/api/auth/google.auth.service";
-import {PasswordService} from "@/modules/rest/password/password.service";
+import {PasswordService} from "@/modules/shared/password/password.service";
 import {OAuth2Client} from "google-auth-library";
 import {config} from "node-ts-config";
-import {HttpModule} from "@/modules/rest/http/http.module";
+import {HttpModule} from "@/modules/shared/http/http.module";
 import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
-import {ConfigService} from "@/modules/rest/config/config.service";
-import {IpModule} from "@/modules/rest/ip/ip.module";
-import {SessionService} from "@/modules/rest/session/session.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
+import {IpModule} from "@/modules/shared/ip/ip.module";
+import {SessionService} from "@/modules/shared/session/session.service";
 
 @Module({
   imports: [DatabaseModule, EmailModule, HttpModule, IpModule],
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index c7b7fccbc..febb1541c 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -4,8 +4,8 @@ import {
   Logger,
   UnauthorizedException,
 } from "@nestjs/common";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
-import {PasswordService} from "@/modules/rest/password/password.service";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
+import {PasswordService} from "@/modules/shared/password/password.service";
 import type {
   FaceBookAuthRequest,
   FacebookSignInResponse,
@@ -20,22 +20,22 @@ import {
   Gender,
   VerificationType,
 } from "@/data/types/frontend";
-import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/utils/consts";
-import {EmailService} from "@/modules/rest/email/email.service";
+import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
+import {EmailService} from "@/modules/shared/email/email.service";
 import type {Transaction} from "sequelize";
 import {Sequelize} from "sequelize-typescript";
 import {GoogleAuthService} from "@/modules/api/auth/google.auth.service";
 import type {TokenPayload} from "google-auth-library";
-import {generateUserName} from "@/utils/helpers";
 import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
 import type {FacebookGetUserResponse} from "@/data/types/api";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
-import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
-import {SessionService} from "@/modules/rest/session/session.service";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
+import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
+import {SessionService} from "@/modules/shared/session/session.service";
+import {generateUserName} from '@/data/transformers/helper/generate.user.name';
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH
+} from '@/data/consts';
 
 @Injectable()
 export class AuthService {
diff --git a/newback/src/modules/api/auth/facebook.auth.service.ts b/newback/src/modules/api/auth/facebook.auth.service.ts
index a2da369f4..c67e2138c 100644
--- a/newback/src/modules/api/auth/facebook.auth.service.ts
+++ b/newback/src/modules/api/auth/facebook.auth.service.ts
@@ -5,8 +5,8 @@ import {
   Logger,
   ServiceUnavailableException,
 } from "@nestjs/common";
-import {HttpService} from "@/modules/rest/http/http.service";
-import {ConfigService} from "@/modules/rest/config/config.service";
+import {HttpService} from "@/modules/shared/http/http.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 import type {FacebookGetUserResponse} from "@/data/types/api";
 
 @Injectable()
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index 037ff2763..f0a4686f7 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -8,7 +8,8 @@ import {
 } from "class-validator";
 import type {SignUpRequest} from "@/data/types/frontend";
 import {Gender} from "@/data/types/frontend";
-import {MAX_USERNAME_LENGTH} from "@/utils/consts";
+import {MAX_USERNAME_LENGTH} from '@/data/consts';
+
 
 export class SignUpRequestValidator implements SignUpRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index b34bdb978..d21464f85 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -4,7 +4,7 @@ import {
   Matches,
 } from "class-validator";
 import type {ValidateUserRequest} from "@/data/types/frontend";
-import {MAX_USERNAME_LENGTH} from "@/utils/consts";
+import {MAX_USERNAME_LENGTH} from '@/data/consts';
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {
   @IsString()
diff --git a/newback/src/modules/api/file/file.module.ts b/newback/src/modules/api/file/file.module.ts
index 24b9eb21e..9e3181b9b 100644
--- a/newback/src/modules/api/file/file.module.ts
+++ b/newback/src/modules/api/file/file.module.ts
@@ -1,11 +1,11 @@
 import {Module} from "@nestjs/common";
-import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {ServeStaticModule} from "@nestjs/serve-static";
 import {join} from "path";
 import {FileController} from "@/modules/api/file/file.controller";
-import {SessionService} from "@/modules/rest/session/session.service";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import {RedisService} from "@/modules/rest/redis/redis.service";
+import {SessionService} from "@/modules/shared/session/session.service";
+import {PasswordService} from "@/modules/shared/password/password.service";
+import {RedisService} from "@/modules/shared/redis/redis.service";
 import {ImageService} from "@/modules/api/file/image.service";
 import {FileService} from "@/modules/api/file/file.service";
 
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index 32aa2a709..5d3c905e3 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -5,7 +5,7 @@ import {
 import type {SaveFileResponse} from "@/data/types/frontend";
 import {ImageType} from "@/data/types/frontend";
 import {join} from "path";
-import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import type {FileSaveResponse} from "@/data/types/internal";
 import {Sequelize} from "sequelize-typescript";
 import {ImageService} from "@/modules/api/file/image.service";
diff --git a/newback/src/modules/api/file/image.service.spec.ts b/newback/src/modules/api/file/image.service.spec.ts
index 9f45ef1ba..f545faae5 100644
--- a/newback/src/modules/api/file/image.service.spec.ts
+++ b/newback/src/modules/api/file/image.service.spec.ts
@@ -1,8 +1,8 @@
 import {Test} from "@nestjs/testing";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {ConsoleLogger} from "@nestjs/common";
 import {ImageService} from "@/modules/api/file/image.service";
-import {PasswordService} from "@/modules/rest/password/password.service";
+import {PasswordService} from "@/modules/shared/password/password.service";
 
 describe("ImageService", () => {
   let imgService: ImageService;
diff --git a/newback/src/modules/api/file/image.service.ts b/newback/src/modules/api/file/image.service.ts
index b98c517b7..af926a9af 100644
--- a/newback/src/modules/api/file/image.service.ts
+++ b/newback/src/modules/api/file/image.service.ts
@@ -5,7 +5,7 @@ import {
 import {ImageType} from "@/data/types/frontend";
 import type {Metadata} from "sharp";
 import * as sharp from "sharp";
-import {PasswordService} from "@/modules/rest/password/password.service";
+import {PasswordService} from "@/modules/shared/password/password.service";
 import {join} from "path";
 import {
   stat,
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index faf5a0c60..cf91ad344 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -6,28 +6,28 @@ import {
 } from "@nestjs/common";
 import * as supertest from "supertest";
 import {Test} from "@nestjs/testing";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
-import type {RoomRepository} from "@/modules/rest/database/repository/room.repository";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {EmailService} from "@/modules/rest/email/email.service";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
+import {PasswordService} from "@/modules/shared/password/password.service";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
+import type {RoomRepository} from "@/modules/shared/database/repository/room.repository";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {EmailService} from "@/modules/shared/email/email.service";
 import {MailerService} from "@nestjs-modules/mailer";
 import {Sequelize} from "sequelize-typescript";
-import {HtmlService} from "@/modules/rest/html/html.service";
-import {HttpService} from "@/modules/rest/http/http.service";
+import {HtmlService} from "@/modules/shared/html/html.service";
+import {HttpService} from "@/modules/shared/http/http.service";
 import type fetch from "node-fetch";
-import {ConfigService} from "@/modules/rest/config/config.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 import {config} from "node-ts-config";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
-import {IpService} from "@/modules/rest/ip/ip.service";
-import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
+import {IpService} from "@/modules/shared/ip/ip.service";
+import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
 import type {IpAddressModel} from "@/data/model/ip.address.model";
-import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
+import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
 import {VerificationType} from "@/data/types/frontend";
 import {VerifyController} from "@/modules/api/verify/verify.controller";
 import {VerifyService} from "@/modules/api/verify/verify.service";
-import {SessionService} from "@/modules/rest/session/session.service";
+import {SessionService} from "@/modules/shared/session/session.service";
 
 describe("VerifyModule", () => {
   let app: INestApplication;
diff --git a/newback/src/modules/api/verify/verify.module.ts b/newback/src/modules/api/verify/verify.module.ts
index 34a1091c1..5ce685135 100644
--- a/newback/src/modules/api/verify/verify.module.ts
+++ b/newback/src/modules/api/verify/verify.module.ts
@@ -1,12 +1,12 @@
 import {Module} from "@nestjs/common";
-import {DatabaseModule} from "@/modules/rest/database/database.module";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {EmailModule} from "@/modules/rest/email/email.module";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import {HttpModule} from "@/modules/rest/http/http.module";
-import {IpModule} from "@/modules/rest/ip/ip.module";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {EmailModule} from "@/modules/shared/email/email.module";
+import {PasswordService} from "@/modules/shared/password/password.service";
+import {HttpModule} from "@/modules/shared/http/http.module";
+import {IpModule} from "@/modules/shared/ip/ip.module";
 import {VerifyController} from "@/modules/api/verify/verify.controller";
-import {SessionService} from "@/modules/rest/session/session.service";
+import {SessionService} from "@/modules/shared/session/session.service";
 import {VerifyService} from "@/modules/api/verify/verify.service";
 
 @Module({
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index 59ec7b91e..7c6c32bb9 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -3,8 +3,8 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
-import {PasswordService} from "@/modules/rest/password/password.service";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
+import {PasswordService} from "@/modules/shared/password/password.service";
 import type {
   AcceptTokenRequest,
   AcceptTokenResponse,
@@ -13,12 +13,12 @@ import type {
   VerifyTokenResponse,
 } from "@/data/types/frontend";
 import {VerificationType} from "@/data/types/frontend";
-import {EmailService} from "@/modules/rest/email/email.service";
+import {EmailService} from "@/modules/shared/email/email.service";
 import {Sequelize} from "sequelize-typescript";
 import type {VerificationModel} from "@/data/model/verification.model";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
-import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
-import {SessionService} from "@/modules/rest/session/session.service";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
+import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
+import {SessionService} from "@/modules/shared/session/session.service";
 
 @Injectable()
 export class VerifyService {
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 812bf379a..8662a5d38 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -9,24 +9,24 @@ import type {
   SyncHistoryWsOutMessage,
 } from "@/data/types/frontend";
 import {MessageStatus} from "@/data/types/frontend";
-import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import type {
   CreateModel,
   WebSocketContextData,
 } from "@/data/types/internal";
-import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import {Sequelize} from "sequelize-typescript";
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
-import {getMaxSymbol} from "@/utils/helpers";
-import {getSyncMessage} from '@/modules/api/websocket/transformers/out.message/sync.message.transformer';
+import {getSyncMessage} from '@/data/transformers/out.message/sync.message.transformer';
 import {
   getMentionsFromTags,
   getUploadedGiphies,
   groupUploadedFileToImages
-} from '@/modules/api/websocket/transformers/out.message/inner.transformer';
-import {transformPrintMessage} from '@/modules/api/websocket/transformers/out.message/print.message.transformer';
+} from '@/data/transformers/out.message/inner.transformer';
+import {transformPrintMessage} from '@/data/transformers/out.message/print.message.transformer';
+import {getMaxSymbol} from '@/data/transformers/helper/get.max.symbol';
 
 @Injectable()
 export class MessageService {
diff --git a/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts b/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
index f1d743153..8bd4a2c50 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.e2e.spec.ts
@@ -1,21 +1,21 @@
 import type {TestingModule} from "@nestjs/testing";
 import {Test} from "@nestjs/testing";
-import {IpService} from "@/modules/rest/ip/ip.service";
-import {HttpModule} from "@/modules/rest/http/http.module";
+import {IpService} from "@/modules/shared/ip/ip.service";
+import {HttpModule} from "@/modules/shared/http/http.module";
 import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
-import {SessionService} from "@/modules/rest/session/session.service";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
+import {SessionService} from "@/modules/shared/session/session.service";
+import {PasswordService} from "@/modules/shared/password/password.service";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {RedisModule} from "@nestjs-modules/ioredis";
 import {config} from "node-ts-config";
 import {ConsoleLogger} from "@nestjs/common";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
 import {AuthModule} from "@/modules/api/auth/auth.module";
 import {AuthService} from "@/modules/api/auth/auth.service";
-import {ConfigModule} from "@/modules/rest/config/config.module";
+import {ConfigModule} from "@/modules/shared/config/config.module";
 
 
 describe("WebsocketGateway", () => {
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index c601561cc..d6b954125 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -30,7 +30,7 @@ import {
   ShowITypeWsOutMessage,
   SyncHistoryWsOutMessage,
 } from "@/data/types/frontend";
-import {SubscribePuBSub} from "@/modules/rest/pubsub/pubsub.service";
+import {SubscribePuBSub} from "@/modules/shared/pubsub/pubsub.service";
 import {WebsocketService} from "@/modules/api/websocket/websocket.service";
 import {WsDataService} from "@/modules/api/websocket/ws.data.service";
 import {WsExceptionFilter} from "@/modules/api/websocket/ws.exception.filter";
diff --git a/newback/src/modules/api/websocket/websocket.module.ts b/newback/src/modules/api/websocket/websocket.module.ts
index fc17c373b..ab2642505 100644
--- a/newback/src/modules/api/websocket/websocket.module.ts
+++ b/newback/src/modules/api/websocket/websocket.module.ts
@@ -1,11 +1,11 @@
 import {Module} from "@nestjs/common";
 import {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
 import {WebsocketService} from "@/modules/api/websocket/websocket.service";
-import {SessionService} from "@/modules/rest/session/session.service";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {DatabaseModule} from "@/modules/rest/database/database.module";
-import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {SessionService} from "@/modules/shared/session/session.service";
+import {PasswordService} from "@/modules/shared/password/password.service";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
+import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import {WsDataService} from "@/modules/api/websocket/ws.data.service";
 import {MessageService} from "@/modules/api/websocket/message.service";
 
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 2d3862e41..120248f3d 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -2,19 +2,20 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
-import {PasswordService} from "@/modules/rest/password/password.service";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
+import {PasswordService} from "@/modules/shared/password/password.service";
 import type {AddOnlineUserMessage} from "@/data/types/frontend";
-import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
-import {SessionService} from "@/modules/rest/session/session.service";
+import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
+import {SessionService} from "@/modules/shared/session/session.service";
 import type {UserModel} from "@/data/model/user.model";
 import type {WebSocketContextData} from "@/data/types/internal";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
-import {transformSetWsId} from "@/modules/api/websocket/transformers/out.message/set.ws.id.transformer";
-import {transformAddUserOnline} from "@/modules/api/websocket/transformers/out.message/add.online.user.transformer";
-import {getLogoutMessage} from "@/modules/api/websocket/transformers/out.message/remove.online.user.transformer";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
+import {transformSetWsId} from "@/data/transformers/out.message/set.ws.id.transformer";
+import {transformAddUserOnline} from '@/data/transformers/out.message/add.online.user.transformer';
+import {getLogoutMessage} from '@/data/transformers/out.message/remove.online.user.transformer';
+
 
 
 @Injectable()
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index 48b3231fd..e7f466b25 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -3,13 +3,13 @@ import {
   Logger,
 } from "@nestjs/common";
 import type {GetCountryCodeWsInMessage} from "@/data/types/frontend";
-import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
+import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import type {WebSocketContextData} from "@/data/types/internal";
-import {ConfigService} from "@/modules/rest/config/config.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 import {ValidationException} from "@/data/exceptions/validation.exception";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
-import {transformUserCountries} from '@/modules/api/websocket/transformers/out.message/get.user.contries.transformer';
+import {transformUserCountries} from '@/data/transformers/out.message/get.user.contries.transformer';
 
 
 @Injectable()
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 38671e946..6ff43c3de 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -2,12 +2,12 @@ import {Module} from "@nestjs/common";
 import {AuthModule} from "@/modules/api/auth/auth.module";
 import {LoggingInterceptor} from "@/modules/app/interceptors/logging.interceptor";
 import {APP_INTERCEPTOR} from "@nestjs/core";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {RedisModule} from "@nestjs-modules/ioredis";
 import {config} from "node-ts-config";
-import {ConfigModule} from "@/modules/rest/config/config.module";
+import {ConfigModule} from "@/modules/shared/config/config.module";
 import {VerifyModule} from "@/modules/api/verify/verify.module";
-import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {WebsocketModule} from "@/modules/api/websocket/websocket.module";
 import {FileModule} from "@/modules/api/file/file.module";
 
diff --git a/newback/src/modules/app/guards/auth.guard.ts b/newback/src/modules/app/guards/auth.guard.ts
index c6a1f6a2f..d89c27b67 100644
--- a/newback/src/modules/app/guards/auth.guard.ts
+++ b/newback/src/modules/app/guards/auth.guard.ts
@@ -6,8 +6,8 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {HttpService} from "@/modules/rest/http/http.service";
-import {SessionService} from "@/modules/rest/session/session.service";
+import {HttpService} from "@/modules/shared/http/http.service";
+import {SessionService} from "@/modules/shared/session/session.service";
 
 @Injectable()
 export class AuthGuard implements CanActivate {
diff --git a/newback/src/modules/app/guards/captcha.guard.ts b/newback/src/modules/app/guards/captcha.guard.ts
index 3bcdc3736..bc3f8f2cc 100644
--- a/newback/src/modules/app/guards/captcha.guard.ts
+++ b/newback/src/modules/app/guards/captcha.guard.ts
@@ -9,8 +9,8 @@ import {
   UnauthorizedException,
 } from "@nestjs/common";
 
-import {ConfigService} from "@/modules/rest/config/config.service";
-import {HttpService} from "@/modules/rest/http/http.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
+import {HttpService} from "@/modules/shared/http/http.service";
 
 @Injectable()
 export class CaptchaGuard implements CanActivate {
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
index 57d6799e4..46eb68f4c 100644
--- a/newback/src/modules/app/guards/own.message.guard.ts
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -6,8 +6,8 @@ import {
   Injectable,
   mixin,
 } from "@nestjs/common";
-import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
-import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
+import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import type {DefaultWsOutMessage} from "@/data/types/frontend";
 
 
diff --git a/newback/src/modules/app/guards/own.room.guard.ts b/newback/src/modules/app/guards/own.room.guard.ts
index 87b21f006..6e65a9f9f 100644
--- a/newback/src/modules/app/guards/own.room.guard.ts
+++ b/newback/src/modules/app/guards/own.room.guard.ts
@@ -6,8 +6,8 @@ import {
   Injectable,
   mixin,
 } from "@nestjs/common";
-import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
-import {PubsubService} from "@/modules/rest/pubsub/pubsub.service";
+import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
+import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import type {DefaultWsOutMessage} from "@/data/types/frontend";
 
 
diff --git a/newback/src/modules/rest/ip/ip.module.ts b/newback/src/modules/rest/ip/ip.module.ts
deleted file mode 100644
index 843a56bad..000000000
--- a/newback/src/modules/rest/ip/ip.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {
-  Global,
-  Module,
-} from "@nestjs/common";
-import {IpService} from "@/modules/rest/ip/ip.service";
-import {IpCacheService} from "@/modules/rest/ip/ip.cache.service";
-import {DatabaseModule} from "@/modules/rest/database/database.module";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-
-@Global()
-@Module({
-  imports: [DatabaseModule],
-  providers: [IpService, IpCacheService, RedisService],
-  exports: [IpCacheService],
-})
-export class IpModule {
-}
diff --git a/newback/src/modules/rest/config/config.module.ts b/newback/src/modules/shared/config/config.module.ts
similarity index 80%
rename from newback/src/modules/rest/config/config.module.ts
rename to newback/src/modules/shared/config/config.module.ts
index eb1e8a649..368763b70 100644
--- a/newback/src/modules/rest/config/config.module.ts
+++ b/newback/src/modules/shared/config/config.module.ts
@@ -2,7 +2,7 @@ import {
   Global,
   Module,
 } from "@nestjs/common";
-import {ConfigService} from "@/modules/rest/config/config.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 import {config} from "node-ts-config";
 
 @Global()
diff --git a/newback/src/modules/rest/config/config.service.ts b/newback/src/modules/shared/config/config.service.ts
similarity index 100%
rename from newback/src/modules/rest/config/config.service.ts
rename to newback/src/modules/shared/config/config.service.ts
diff --git a/newback/src/modules/rest/database/database.module.ts b/newback/src/modules/shared/database/database.module.ts
similarity index 81%
rename from newback/src/modules/rest/database/database.module.ts
rename to newback/src/modules/shared/database/database.module.ts
index e05ba2897..2c3319b8c 100644
--- a/newback/src/modules/rest/database/database.module.ts
+++ b/newback/src/modules/shared/database/database.module.ts
@@ -1,7 +1,6 @@
 import {Module} from "@nestjs/common";
 import {SequelizeModule} from "@nestjs/sequelize";
 
-import {generateOrmConfig} from "@/utils/helpers";
 import {ChannelModel} from "@/data/model/channel.model";
 import {ImageModel} from "@/data/model/image.model";
 import {IpAddressModel} from "@/data/model/ip.address.model";
@@ -20,11 +19,12 @@ import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
 import {VerificationModel} from "@/data/model/verification.model";
 import {Logger} from "@nestjs/common/services/logger.service";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
-import {RoomRepository} from "@/modules/rest/database/repository/room.repository";
-import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
-import {VerificationRepository} from "@/modules/rest/database/repository/verification.repository";
-import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
+import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
+import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
+import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
+import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
+import {generateOrmConfig} from '@/utils/generate.orm.config';
 
 const repositories = [
   UserRepository,
diff --git a/newback/src/modules/rest/database/repository/ip.repository.ts b/newback/src/modules/shared/database/repository/ip.repository.ts
similarity index 100%
rename from newback/src/modules/rest/database/repository/ip.repository.ts
rename to newback/src/modules/shared/database/repository/ip.repository.ts
diff --git a/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
similarity index 78%
rename from newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
rename to newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
index f66e9b382..e97048dd6 100644
--- a/newback/src/modules/rest/database/repository/message.repository.e2e.spec.ts
+++ b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
@@ -1,10 +1,10 @@
-import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {ConsoleLogger} from "@nestjs/common";
 import type {TestingModule} from "@nestjs/testing";
 import {Test} from "@nestjs/testing";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
-import {ConfigModule} from "@/modules/rest/config/config.module";
-import {MessageRepository} from "@/modules/rest/database/repository/messages.repository";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
+import {ConfigModule} from "@/modules/shared/config/config.module";
+import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import {MessageStatus} from '@/data/types/frontend';
 
 describe("MessageRepository", () => {
diff --git a/newback/src/modules/rest/database/repository/messages.repository.ts b/newback/src/modules/shared/database/repository/messages.repository.ts
similarity index 100%
rename from newback/src/modules/rest/database/repository/messages.repository.ts
rename to newback/src/modules/shared/database/repository/messages.repository.ts
diff --git a/newback/src/modules/rest/database/repository/room.repository.ts b/newback/src/modules/shared/database/repository/room.repository.ts
similarity index 100%
rename from newback/src/modules/rest/database/repository/room.repository.ts
rename to newback/src/modules/shared/database/repository/room.repository.ts
diff --git a/newback/src/modules/rest/database/repository/user.repository.ts b/newback/src/modules/shared/database/repository/user.repository.ts
similarity index 100%
rename from newback/src/modules/rest/database/repository/user.repository.ts
rename to newback/src/modules/shared/database/repository/user.repository.ts
diff --git a/newback/src/modules/rest/database/repository/verification.repository.ts b/newback/src/modules/shared/database/repository/verification.repository.ts
similarity index 100%
rename from newback/src/modules/rest/database/repository/verification.repository.ts
rename to newback/src/modules/shared/database/repository/verification.repository.ts
diff --git a/newback/src/modules/rest/email/email.module.ts b/newback/src/modules/shared/email/email.module.ts
similarity index 79%
rename from newback/src/modules/rest/email/email.module.ts
rename to newback/src/modules/shared/email/email.module.ts
index 650d0934f..4a2941e60 100644
--- a/newback/src/modules/rest/email/email.module.ts
+++ b/newback/src/modules/shared/email/email.module.ts
@@ -4,8 +4,8 @@ import {
   MailerService,
 } from "@nestjs-modules/mailer";
 import {config} from "node-ts-config";
-import {EmailService} from "@/modules/rest/email/email.service";
-import {HtmlService} from "@/modules/rest/html/html.service";
+import {EmailService} from "@/modules/shared/email/email.service";
+import {HtmlService} from "@/modules/shared/html/html.service";
 
 
 @Module({
diff --git a/newback/src/modules/rest/email/email.service.spec.ts b/newback/src/modules/shared/email/email.service.spec.ts
similarity index 91%
rename from newback/src/modules/rest/email/email.service.spec.ts
rename to newback/src/modules/shared/email/email.service.spec.ts
index fa912ac68..b3b0f0cb4 100644
--- a/newback/src/modules/rest/email/email.service.spec.ts
+++ b/newback/src/modules/shared/email/email.service.spec.ts
@@ -1,14 +1,14 @@
-import {HtmlService} from "@/modules/rest/html/html.service";
-import {EmailService} from "@/modules/rest/email/email.service";
+import {HtmlService} from "@/modules/shared/html/html.service";
+import {EmailService} from "@/modules/shared/email/email.service";
 import type {TestingModule} from "@nestjs/testing";
 import {Test} from "@nestjs/testing";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {MailerService} from "@nestjs-modules/mailer";
 
 import {readFile} from "fs/promises";
 import {resolve} from "path";
 import {ConsoleLogger} from "@nestjs/common";
-import {ConfigService} from "@/modules/rest/config/config.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 import {config} from "node-ts-config";
 
 describe("EmailSenderService", () => {
diff --git a/newback/src/modules/rest/email/email.service.ts b/newback/src/modules/shared/email/email.service.ts
similarity index 94%
rename from newback/src/modules/rest/email/email.service.ts
rename to newback/src/modules/shared/email/email.service.ts
index 2596bf897..ca8b71c78 100644
--- a/newback/src/modules/rest/email/email.service.ts
+++ b/newback/src/modules/shared/email/email.service.ts
@@ -2,9 +2,9 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {HtmlService} from "@/modules/rest/html/html.service";
+import {HtmlService} from "@/modules/shared/html/html.service";
 import {MailerService} from "@nestjs-modules/mailer";
-import {ConfigService} from "@/modules/rest/config/config.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 
 @Injectable()
 export class EmailService {
diff --git a/newback/src/modules/rest/html/html.service.spec.ts b/newback/src/modules/shared/html/html.service.spec.ts
similarity index 94%
rename from newback/src/modules/rest/html/html.service.spec.ts
rename to newback/src/modules/shared/html/html.service.spec.ts
index fc7f22a04..2528a4305 100644
--- a/newback/src/modules/rest/html/html.service.spec.ts
+++ b/newback/src/modules/shared/html/html.service.spec.ts
@@ -1,4 +1,4 @@
-import {HtmlService} from "@/modules/rest/html/html.service";
+import {HtmlService} from "@/modules/shared/html/html.service";
 
 describe("HtmlService", () => {
   describe("replaceTemplate", () => {
diff --git a/newback/src/modules/rest/html/html.service.ts b/newback/src/modules/shared/html/html.service.ts
similarity index 100%
rename from newback/src/modules/rest/html/html.service.ts
rename to newback/src/modules/shared/html/html.service.ts
diff --git a/newback/src/modules/rest/http/http.module.ts b/newback/src/modules/shared/http/http.module.ts
similarity index 83%
rename from newback/src/modules/rest/http/http.module.ts
rename to newback/src/modules/shared/http/http.module.ts
index ba6e8c1c2..e2759beaf 100644
--- a/newback/src/modules/rest/http/http.module.ts
+++ b/newback/src/modules/shared/http/http.module.ts
@@ -3,7 +3,7 @@ import {
   Logger,
   Module,
 } from "@nestjs/common";
-import {HttpService} from "@/modules/rest/http/http.service";
+import {HttpService} from "@/modules/shared/http/http.service";
 import fetch from "node-fetch";
 
 @Global()
diff --git a/newback/src/modules/rest/http/http.service.ts b/newback/src/modules/shared/http/http.service.ts
similarity index 100%
rename from newback/src/modules/rest/http/http.service.ts
rename to newback/src/modules/shared/http/http.service.ts
diff --git a/newback/src/modules/rest/ip/ip.cache.service.ts b/newback/src/modules/shared/ip/ip.cache.service.ts
similarity index 92%
rename from newback/src/modules/rest/ip/ip.cache.service.ts
rename to newback/src/modules/shared/ip/ip.cache.service.ts
index 0a2404338..e16aade65 100644
--- a/newback/src/modules/rest/ip/ip.cache.service.ts
+++ b/newback/src/modules/shared/ip/ip.cache.service.ts
@@ -2,12 +2,12 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {IpRepository} from "@/modules/rest/database/repository/ip.repository";
-import {IpService} from "@/modules/rest/ip/ip.service";
+import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
+import {IpService} from "@/modules/shared/ip/ip.service";
 import type {IpAddressModel} from "@/data/model/ip.address.model";
 
 import type {InvalidIpException} from "@/data/exceptions/invalid.ip.exception";
-import {RedisService} from "@/modules/rest/redis/redis.service";
+import {RedisService} from "@/modules/shared/redis/redis.service";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 import type {CreateModel} from "@/data/types/internal";
 
diff --git a/newback/src/modules/shared/ip/ip.module.ts b/newback/src/modules/shared/ip/ip.module.ts
new file mode 100644
index 000000000..ea06f3a28
--- /dev/null
+++ b/newback/src/modules/shared/ip/ip.module.ts
@@ -0,0 +1,17 @@
+import {
+  Global,
+  Module,
+} from "@nestjs/common";
+import {IpService} from "@/modules/shared/ip/ip.service";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+
+@Global()
+@Module({
+  imports: [DatabaseModule],
+  providers: [IpService, IpCacheService, RedisService],
+  exports: [IpCacheService],
+})
+export class IpModule {
+}
diff --git a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts b/newback/src/modules/shared/ip/ip.service.e2e.spec.ts
similarity index 86%
rename from newback/src/modules/rest/ip/ip.service.e2e.spec.ts
rename to newback/src/modules/shared/ip/ip.service.e2e.spec.ts
index 4718d1e0e..d9814552c 100644
--- a/newback/src/modules/rest/ip/ip.service.e2e.spec.ts
+++ b/newback/src/modules/shared/ip/ip.service.e2e.spec.ts
@@ -1,9 +1,9 @@
 import type {TestingModule} from "@nestjs/testing";
 import {Test} from "@nestjs/testing";
-import {IpService} from "@/modules/rest/ip/ip.service";
-import {HttpModule} from "@/modules/rest/http/http.module";
+import {IpService} from "@/modules/shared/ip/ip.service";
+import {HttpModule} from "@/modules/shared/http/http.module";
 import * as pychatIpAddressFixture from "@/fixtures/ip.134.249.113.11.json";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {ConsoleLogger} from "@nestjs/common";
 import {InvalidIpException} from "@/data/exceptions/invalid.ip.exception";
 
diff --git a/newback/src/modules/rest/ip/ip.service.ts b/newback/src/modules/shared/ip/ip.service.ts
similarity index 92%
rename from newback/src/modules/rest/ip/ip.service.ts
rename to newback/src/modules/shared/ip/ip.service.ts
index 70b2d0d05..5888b871e 100644
--- a/newback/src/modules/rest/ip/ip.service.ts
+++ b/newback/src/modules/shared/ip/ip.service.ts
@@ -1,5 +1,5 @@
 import {Injectable} from "@nestjs/common";
-import {HttpService} from "@/modules/rest/http/http.service";
+import {HttpService} from "@/modules/shared/http/http.service";
 import type {
   IpInfoResponse,
   IpSuccessInfoResponse,
diff --git a/newback/src/modules/rest/logger/logger.module.ts b/newback/src/modules/shared/logger/logger.module.ts
similarity index 100%
rename from newback/src/modules/rest/logger/logger.module.ts
rename to newback/src/modules/shared/logger/logger.module.ts
diff --git a/newback/src/modules/rest/password/password.service.ts b/newback/src/modules/shared/password/password.service.ts
similarity index 100%
rename from newback/src/modules/rest/password/password.service.ts
rename to newback/src/modules/shared/password/password.service.ts
diff --git a/newback/src/modules/rest/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
similarity index 100%
rename from newback/src/modules/rest/pubsub/pubsub.service.ts
rename to newback/src/modules/shared/pubsub/pubsub.service.ts
diff --git a/newback/src/modules/rest/redis/redis.service.ts b/newback/src/modules/shared/redis/redis.service.ts
similarity index 98%
rename from newback/src/modules/rest/redis/redis.service.ts
rename to newback/src/modules/shared/redis/redis.service.ts
index 6d5439e95..6fb61554d 100644
--- a/newback/src/modules/rest/redis/redis.service.ts
+++ b/newback/src/modules/shared/redis/redis.service.ts
@@ -2,13 +2,13 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {REDIS_KEYS} from "@/utils/consts";
 import {
   InjectRedis,
   Redis,
 } from "@nestjs-modules/ioredis";
 import type {UserOnlineData} from "@/data/types/internal";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
+import { REDIS_KEYS } from "@/data/consts";
 
 @Injectable()
 export class RedisService {
diff --git a/newback/src/modules/rest/session/session.service.ts b/newback/src/modules/shared/session/session.service.ts
similarity index 86%
rename from newback/src/modules/rest/session/session.service.ts
rename to newback/src/modules/shared/session/session.service.ts
index d029bc07c..b552995e1 100644
--- a/newback/src/modules/rest/session/session.service.ts
+++ b/newback/src/modules/shared/session/session.service.ts
@@ -4,9 +4,9 @@ import {
   Logger,
   UnauthorizedException,
 } from "@nestjs/common";
-import {PasswordService} from "@/modules/rest/password/password.service";
-import {RedisService} from "@/modules/rest/redis/redis.service";
-import {UserRepository} from "@/modules/rest/database/repository/user.repository";
+import {PasswordService} from "@/modules/shared/password/password.service";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
 import type {UserModel} from "@/data/model/user.model";
 
 @Injectable()
diff --git a/newback/src/modules/rest/ws.adapter/ws.adapter.ts b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
similarity index 100%
rename from newback/src/modules/rest/ws.adapter/ws.adapter.ts
rename to newback/src/modules/shared/ws.adapter/ws.adapter.ts
diff --git a/newback/src/utils/helpers.ts b/newback/src/utils/generate.orm.config.ts
similarity index 54%
rename from newback/src/utils/helpers.ts
rename to newback/src/utils/generate.orm.config.ts
index 50abcc4d3..9f522e812 100644
--- a/newback/src/utils/helpers.ts
+++ b/newback/src/utils/generate.orm.config.ts
@@ -1,13 +1,7 @@
 import type {SequelizeModuleOptions} from "@nestjs/sequelize";
 
-import {MAX_USERNAME_LENGTH} from "@/utils/consts";
 import {config} from "node-ts-config";
-import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
-import type {GiphyDto} from "@/data/types/frontend";
 
-export function generateUserName(email: string) {
-  return email.split("@")[0].replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, MAX_USERNAME_LENGTH);
-}
 
 export function generateOrmConfig(logging: ((sql: string) => void)): Omit<SequelizeModuleOptions, "ssl"> {
   const sync = false;
@@ -40,13 +34,6 @@ export function generateOrmConfig(logging: ((sql: string) => void)): Omit<Sequel
 }
 
 
-export function getMaxSymbol(files: UploadedFileModel[], tags: Record<string, number>, giphies: GiphyDto[]) {
-  const maxSymInt: number = Math.max(
-    0,
-    ...files.map((f) => f.symbol.charCodeAt(0)),
-    ...Object.keys(tags).map((k) => k.charCodeAt(0)),
-    ...giphies.map((g) => g.symbol.charCodeAt(0))
-  );
-  const symbol: string | null = maxSymInt === 0 ? null : String.fromCharCode(maxSymInt);
-  return symbol;
-}
+
+
+
diff --git a/newback/src/utils/helpers.spec.ts b/newback/src/utils/helpers.spec.ts
deleted file mode 100644
index f30f5c581..000000000
--- a/newback/src/utils/helpers.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {generateUserName} from "@/utils/helpers";
-
-describe("helper", () => {
-  describe("generateUserName", () => {
-    it("should remove email domain", () => {
-      expect(generateUserName("deathangel@gmail.com")).toEqual("deathangel");
-    });
-
-    it("should cut to 16 symbolx", () => {
-      expect(generateUserName("deathangasdfasfasdfsadfasdfel@gmail.com")).toHaveLength(16);
-    });
-    it("should replace multiple invalid chars", () => {
-      expect(generateUserName("f#8f))c@gmail.com")).toEqual("f-8f-c");
-    });
-  });
-});
diff --git a/newback/src/jest.config.ts b/newback/src/utils/jest.config.ts
similarity index 72%
rename from newback/src/jest.config.ts
rename to newback/src/utils/jest.config.ts
index 9e07e30f9..395d5455d 100644
--- a/newback/src/jest.config.ts
+++ b/newback/src/utils/jest.config.ts
@@ -1,6 +1,8 @@
 import type {Config} from "@jest/types";
 
 // Sync object
+// jest should be inside of src directory, otherwise tsc will compile it, and will make src directory in build
+// which will fail node-ts-config along with __dirname for photos and etc
 const config: Config.InitialOptions = {
   verbose: true,
 };
@@ -16,7 +18,7 @@ export default async(): Promise<Config.InitialOptions> => ({
     "json",
     "ts",
   ],
-  globalSetup: "./jest.setup.ts",
+  globalSetup: "./utils/jest.setup.ts",
   modulePathIgnorePatterns: ["e2e.spec.ts"],
   testRegex: ".*\\.spec\\.ts$",
   transform: {
@@ -26,7 +28,7 @@ export default async(): Promise<Config.InitialOptions> => ({
   coveragePathIgnorePatterns: [
     "/node_modules/",
     "/coverage/",
-    "/jest.config.ts",
+    "/src/utils/jest.config.ts",
     "/dist/",
     ".module.ts$",
     ".dto.ts$",
diff --git a/newback/src/jest.setup.ts b/newback/src/utils/jest.setup.ts
similarity index 100%
rename from newback/src/jest.setup.ts
rename to newback/src/utils/jest.setup.ts
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index 6ae6465a0..cb42ac0d1 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -1,9 +1,9 @@
-import {DatabaseModule} from "@/modules/rest/database/database.module";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {ConsoleLogger} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 import {Test} from "@nestjs/testing";
-import {LoggerModule} from "@/modules/rest/logger/logger.module";
-import {ConfigModule} from "@/modules/rest/config/config.module";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
+import {ConfigModule} from "@/modules/shared/config/config.module";
 import {getModelToken} from "@nestjs/sequelize";
 import {Sequelize} from "sequelize-typescript";
 import {Gender} from "@/data/types/frontend";
@@ -26,9 +26,11 @@ import {IpAddressModel} from "@/data/model/ip.address.model";
 
 async function bootstrap() {
 
-  // we should use require, since these files are not commited in git,
-  // and thus compilation for this file will fail if these are absent
-  // which will fail the whole build. require doesn't check types during compile but import does
+  /*
+   * We should use require, since these files are not commited in git,
+   * and thus compilation for this file will fail if these are absent
+   * which will fail the whole build. require doesn't check types during compile but import does
+   */
   const pychat_chat_channel = require("@/fixtures/prod/pychat_chat_channel.json");
   const pychat_chat_image = require("@/fixtures/prod/pychat_chat_image.json");
   const pychat_chat_ip_address = require("@/fixtures/prod/pychat_chat_ip_address.json");

From 0d9acc10ee5da1e352f9ffe4f6c4c3fab29a0c61 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 19 Apr 2022 10:03:46 +0300
Subject: [PATCH 082/221] split data

---
 common/dto.ts                              | 511 ---------------------
 frontend/src/ts/types/backend.ts           |   1 -
 frontend/src/ts/types/shared               |   1 +
 newback/src/data/model/enums.ts            |  35 ++
 newback/src/data/shared/common.ts          |  32 ++
 newback/src/data/shared/consts.ts          |   1 +
 newback/src/data/shared/dto.ts             | 215 +++++++++
 newback/src/data/shared/http.ts            | 111 +++++
 newback/src/data/shared/ws.in.messages.ts  | 235 ++++++++++
 newback/src/data/shared/ws.out.messages.ts |  21 +
 newback/src/data/types/frontend.ts         |   1 -
 11 files changed, 651 insertions(+), 513 deletions(-)
 delete mode 120000 frontend/src/ts/types/backend.ts
 create mode 120000 frontend/src/ts/types/shared
 create mode 100644 newback/src/data/model/enums.ts
 create mode 100644 newback/src/data/shared/common.ts
 create mode 100644 newback/src/data/shared/consts.ts
 create mode 100644 newback/src/data/shared/dto.ts
 create mode 100644 newback/src/data/shared/http.ts
 create mode 100644 newback/src/data/shared/ws.in.messages.ts
 create mode 100644 newback/src/data/shared/ws.out.messages.ts
 delete mode 120000 newback/src/data/types/frontend.ts

diff --git a/common/dto.ts b/common/dto.ts
index 115e27ed2..bd33bc8e1 100644
--- a/common/dto.ts
+++ b/common/dto.ts
@@ -1,205 +1,3 @@
-export interface SignInRequest extends CaptchaRequest {
-  username?: string;
-  password: string;
-  email?: string;
-}
-
-export interface SendRestorePasswordRequest extends CaptchaRequest {
-  username?: string;
-  email?: string;
-}
-
-export interface VerifyTokenRequest {
-  token: string;
-}
-
-export interface AcceptTokenRequest {
-  token: string;
-  password: string;
-}
-
-export type AcceptTokenResponse = SessionResponse;
-
-export interface VerifyTokenResponse extends OkResponse {
-  username: string;
-}
-
-export type SendRestorePasswordResponse = OkResponse;
-
-export interface CaptchaRequest {
-  captcha?: string;
-}
-
-export interface GoogleAuthRequest {
-  token: string;
-}
-
-export interface FaceBookAuthRequest {
-  token: string;
-}
-
-export interface ValidateUserRequest {
-  username: string;
-}
-
-export interface SignUpRequest {
-  username: string;
-  password: string;
-  email?: string;
-  sex?: Gender;
-}
-
-export interface ConfirmEmailRequest {
-  token: string;
-}
-
-export type ConfirmEmailResponse = OkResponse;
-
-export interface SessionResponse {
-  session: string;
-}
-
-export type SignInResponse = SessionResponse;
-
-
-interface TypeGeneratorForOauth1 extends SessionResponse {
-  isNewAccount: true;
-  username: string;
-}
-
-interface TypeGeneratorForOauth2 extends SessionResponse {
-  isNewAccount: false;
-}
-
-export type OauthSessionResponse =
-  TypeGeneratorForOauth1
-  | TypeGeneratorForOauth2;
-
-
-export type GoogleSignInResponse = OauthSessionResponse;
-export type FacebookSignInResponse = OauthSessionResponse;
-
-export type SignUpResponse = SessionResponse;
-
-export interface OkResponse {
-  ok: true;
-}
-
-export type ValidateUserResponse = OkResponse;
-
-export type ValidateEmailResponse = OkResponse;
-
-export interface ValidateUserEmailRequest {
-  email: string;
-}
-
-// ISO/IEC 5218 1 male, 2 - female
-export enum Gender {
-  MALE = "MALE",
-  FEMALE = "FEMALE",
-  OTHER = "OTHER",
-}
-
-export enum MessageStatus {
-  ON_SERVER = "ON_SERVER", // Uploaded to server
-  READ = "READ",
-  RECEIVED = "RECEIVED", // Sent
-}
-
-export enum Theme {
-  COLOR_LOR = "COLOR_LOR",
-  COLOR_REG = "COLOR_REG",
-  COLOR_WHITE = "COLOR_WHITE",
-}
-
-
-export enum VerificationType {
-  REGISTER = "REGISTER", // When user sign up with email, we want to confirm that it's his/her email
-  PASSWORD = "PASSWORD", // When user request a pasword change
-  EMAIL = "EMAIL", // When user changes an email
-}
-
-export enum ImageType {
-  VIDEO = "VIDEO",
-  FILE = "FILE",
-  MEDIA_RECORD = "MEDIA_RECORD",
-  AUDIO_RECORD = "AUDIO_RECORD",
-  IMAGE = "IMAGE",
-  PREVIEW = "PREVIEW",
-  GIPHY = "GIPHY",
-}
-
-export interface SaveFileResponse {
-  id: number;
-  previewId?: number;
-  symbol: string;
-}
-
-export interface SaveFileRequest {
-  file: Blob;
-  name?: string;
-  symbol: string;
-  type: ImageType;
-}
-
-/** CODE THAT I PUT HERE MANUALLY */
-
-export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {
-  cbId?: number;
-}
-
-export interface DefaultMessage<A extends string> {
-  action: A;
-}
-
-
-export interface SyncHistoryWsOutMessage extends DefaultWsOutMessage<"syncHistory"> {
-  roomIds: number[];
-  messagesIds: number[];
-  onServerMessageIds: number[];
-  receivedMessageIds: number[];
-  lastSynced: number;
-}
-
-export interface ShowITypeWsInMessage extends DefaultWsInMessage<"showIType", "room"> {
-  roomId: number;
-  userId: number;
-}
-
-export interface ShowITypeWsOutMessage extends DefaultWsOutMessage<"showIType"> {
-  roomId: number;
-}
-
-/** CODE I PUT HERE MANUALLY WS IN */
-/*
- * Any means that every every registered subscriber will be called with this handler if it exists
- * this means, that handler that registered this event will be called
- * void means that no handlers should process this signal
- */
-export type HandlerName =
-  "*"
-  | "call"
-  | "notifier"
-  | "peerConnection:*"
-  | "room"
-  | "router"
-  | "void"
-  | "webrtc-message"
-  | "webrtc"
-  | "webrtcTransfer:*"
-  | "ws-message"
-  | "ws";
-
-export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
-  handler: H;
-}
-
-export interface DefaultWsInMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H>, CallBackMessage {
-  cbBySender?: string;
-  cbId?: number;
-}
-
-
 /** BasemessagesInterfaces.ts */
 
 
@@ -211,11 +9,7 @@ export interface ChangeUserOnlineBase {
 }
 
 
-export type HandlerType<A extends string, H extends HandlerName> = (a: DefaultInMessage<A, H | "*">) => Promise<void> | void;
 
-export type HandlerTypes<K extends string, H extends HandlerName> = {
-  [Key in K]?: HandlerType<Key, H>
-};
 
 export interface AcceptFileContent {
   received: number;
@@ -335,26 +129,7 @@ export interface SyncHistoryWsInMessage extends MessagesResponseMessage {
   receivedMessageIds: number[];
 }
 
-export interface DeleteMessage extends DefaultWsInMessage<"deleteMessage", "ws-message"> {
-  roomId: number;
-  id: number;
-  edited: number;
-}
 
-export interface SetMessageStatusWsOutMessage extends DefaultWsOutMessage<"setMessageStatus"> {
-  messagesIds: number[];
-  status: MessageStatus;
-  roomId: number;
-}
-
-export interface SetMessageStatusWsInMessage extends DefaultWsInMessage<"setMessageStatus", "ws-message"> {
-  roomId: number;
-  status: MessageStatus;
-  messagesIds: number[];
-}
-
-export interface EditMessage extends DefaultWsInMessage<"editMessage", "ws-message">, MessageModelDto {
-}
 
 export interface GiphyDto {
   webp: string;
@@ -362,298 +137,12 @@ export interface GiphyDto {
   symbol: string;
 }
 
-export interface PrintMessageWsOutMessage extends DefaultMessage<"printMessage"> {
-  content: string;
-  roomId: number;
-  files: number[];
-  id: number;
-  timeDiff: number;
-  parentMessage: number | null;
-  tags: Record<string, number>;
-  giphies: GiphyDto[];
-}
-
-export interface PrintMessageWsInMessage extends DefaultWsInMessage<"printMessage", "ws-message"> {
-  message: MessageModelDto;
-}
-
-export interface AddOnlineUserMessage extends DefaultWsInMessage<"addOnlineUser", "room">, ChangeUserOnlineBase {
-  opponentWsId: string;
-}
-
-export interface CreateNewUsedMessage extends DefaultWsInMessage<"createNewUser", "room">, UserDto {
-  id: number;
-  rooms: {
-    roomId: number;
-    users: number[];
-  }[];
-}
 
-export interface RemoveOnlineUserMessage extends DefaultWsInMessage<"removeOnlineUser", "room">, ChangeUserOnlineBase {
-}
 
-export interface DeleteRoomMessage extends DefaultWsInMessage<"deleteRoom", "room"> {
-  roomId: number;
-}
 
-export type GetCountryCodeWsOutMessage = DefaultWsOutMessage<"getCountryCode">;
 
 
-export interface GetCountryCodeWsInMessage extends DefaultInMessage<"getCountryCode", "void"> {
-  content: Record<string, LocationDto>;
-}
 
-export interface LeaveUserMessage extends DefaultWsInMessage<"leaveUser", "room"> {
-  roomId: number;
-  userId: number;
-  users: number[];
-}
-
-export interface AddChannelMessage extends DefaultWsInMessage<"addChannel", "room">, ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
-  channelUsers: number[];
-}
 
-export interface InviteUserMessage extends NewRoom, RoomExistedBefore, DefaultWsInMessage<"inviteUser", "room"> {
-  roomId: number;
-  users: number[];
-}
-
-export interface AddInviteMessage extends AddRoomBase, RoomExistedBefore, DefaultWsInMessage<"addInvite", "room"> {
-}
-
-export interface SaveChannelSettingsMessage extends DefaultWsInMessage<"saveChannelSettings", "room">, ChannelDto {
-  notifications: boolean;
-  volume: number;
-  p2p: boolean;
-  userId: number;
-}
-
-export interface DeleteChannelMessage extends DefaultWsInMessage<"deleteChannel", "room"> {
-  channelId: number;
-  roomIds: number[];
-}
-
-export interface SaveRoomSettingsMessage extends DefaultWsInMessage<"saveRoomSettings", "room">, RoomNoUsersDto {
-}
-
-
-export interface SetWsIdMessage extends DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
-  rooms: RoomDto[];
-  channels: ChannelDto[];
-  users: UserDto[];
-  online: Record<number, string[]>;
-  time: number;
-  profile: UserProfileDto;
-  settings: UserSettingsDto;
-}
-
-export interface WebRtcSetConnectionIdMessage extends WebRtcDefaultMessage, DefaultWsInMessage<"setConnectionId", "void"> {
-  time: number;
-}
-
-export interface AddRoomMessage extends AddRoomBase, DefaultWsInMessage<"addRoom", "room"> {
-  channelUsers: number[];
-  channelId: number;
-}
-
-export interface OfferFile extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerFile", "webrtc"> {
-  content: OfferFileContent;
-  roomId: number;
-  threadId: number | null;
-  userId: number;
-  time: number;
-}
-
-export interface OfferCall extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerCall", "webrtc"> {
-  content: BrowserBase;
-  roomId: number;
-  userId: number;
-  time: number;
-}
-
-export interface ReplyCallMessage extends ReplyWebRtc, DefaultWsInMessage<"replyCall", "webrtcTransfer:*"> {
-
-}
-
-export interface NotifyCallActiveMessage extends DefaultWsInMessage<"notifyCallActive", "webrtc">, WebRtcDefaultMessage, OpponentWsId {
-  roomId: number;
-  userId: number;
-}
-
-export interface DestroyCallConnection extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"destroyCallConnection", "peerConnection:*"> {
-  content: string;
-}
-
-export interface OfferMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerMessage", "webrtc"> {
-  content: BrowserBase;
-  roomId: number;
-  userId: number;
-  time: number;
-}
-
-export interface SetSettingsMessage extends DefaultWsInMessage<"setSettings", "ws"> {
-  content: UserSettingsDto;
-}
-
-export interface SetUserProfileMessage extends DefaultWsInMessage<"setUserProfile", "ws"> {
-  content: UserProfileDtoWoImage;
-}
-
-export interface UserProfileChangedMessage extends DefaultWsInMessage<"userProfileChanged", "ws">, UserDto {
-
-}
-
-export interface GrowlMessage extends DefaultWsInMessage<"growlError", "void"> {
-  content: string;
-  action: "growlError";
-}
-
-export interface PingMessage extends DefaultWsInMessage<"ping", "ws"> {
-  time: string;
-}
-
-export interface PongMessage extends DefaultWsInMessage<"pong", "ws"> {
-  time: string;
-}
-
-export interface ReplyFileMessage extends ReplyWebRtc, DefaultWsInMessage<"replyFile", "webrtcTransfer:*"> {
-
-}
-
-export interface SetProfileImageMessage extends DefaultWsInMessage<"setProfileImage", "ws"> {
-  content: string;
-}
-
-export interface AcceptCallMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"acceptCall", "webrtcTransfer:*"> {
-}
-
-export interface AcceptFileMessage extends DefaultWsInMessage<"acceptFile", "peerConnection:*"> {
-  content: AcceptFileContent;
-}
-
-export interface SendRtcDataMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"sendRtcData", "peerConnection:*"> {
-  content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
-}
-
-export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*">;
-
-export interface DestroyFileConnectionMessage extends DefaultWsInMessage<"destroyFileConnection", "peerConnection:*"> {
-  content: "decline" | "success";
-}
-
-/** WsOutMEssages */
-/**
- * This file only contains messages that sent to backend api. FE -> BE by websockets
- */
-
-// Import type {DefaultMessage} from "@/ts/types/backend";
-
-
-// / IMPORTED FROM OTHERS
-
-
-export interface MessageModelDto {
-  id: number;
-  time: number;
-  parentMessage: number;
-  files?: Record<number, FileModelDto>;
-  tags: Record<number, number>;
-  content: string;
-  status: MessageStatus;
-  symbol?: string;
-  deleted?: boolean;
-  threadMessagesCount: number;
-  edited: number;
-  roomId: number;
-  userId: number;
-}
-
-
-export interface UserDto {
-  username: string;
-  id: number;
-  thumbnail: string;
-  lastTimeOnline: number;
-  sex: Gender;
-}
-
-
-export interface UserProfileDtoWoImage {
-  username: string;
-  name: string;
-  city: string;
-  surname: string;
-  email: string;
-  birthday: Date;
-  contacts: string;
-  sex: Gender;
-  id: number;
-}
-
-export declare type LogLevel =
-  "debug"
-  | "disable"
-  | "error"
-  | "info"
-  | "log_raise_error"
-  | "log_with_warnings"
-  | "trace"
-  | "warn";
-
-export interface UserSettingsDto {
-  embeddedYoutube: boolean;
-  highlightCode: boolean;
-  incomingFileCallSound: boolean;
-  messageSound: boolean;
-  onlineChangeSound: boolean;
-  showWhenITyping: boolean;
-  suggestions: boolean;
-  logs: LogLevel;
-  theme: string;
-}
-
-
-export interface RoomNoUsersDto {
-  channelId: number | null;
-  notifications: boolean;
-  p2p: boolean;
-  volume: number;
-  isMainInChannel: boolean;
-  id: number;
-  name: string;
-  creatorId: number;
-}
-
-export interface UserProfileDto extends UserProfileDtoWoImage {
-  thumbnail: string;
-}
-
-
-export interface LocationDto {
-  city: string;
-  country: string;
-  countryCode: string;
-  region: string;
-}
-
-
-export interface ChannelDto {
-  name: string;
-  id: number;
-  creatorId: number;
-}
-
-export interface RoomDto extends RoomNoUsersDto {
-  users: number[];
-}
-
-
-export interface FileModelDto {
-  url: string;
-  id: number;
-  type: ImageType;
-  preview: string;
-}
 
 
-export const WS_SESSION_EXPIRED_CODE = 4001;
diff --git a/frontend/src/ts/types/backend.ts b/frontend/src/ts/types/backend.ts
deleted file mode 120000
index 43385c905..000000000
--- a/frontend/src/ts/types/backend.ts
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/dto.ts
\ No newline at end of file
diff --git a/frontend/src/ts/types/shared b/frontend/src/ts/types/shared
new file mode 120000
index 000000000..325f1cb08
--- /dev/null
+++ b/frontend/src/ts/types/shared
@@ -0,0 +1 @@
+../../../../newback/src/data/shared/
\ No newline at end of file
diff --git a/newback/src/data/model/enums.ts b/newback/src/data/model/enums.ts
new file mode 100644
index 000000000..4e1d65e9f
--- /dev/null
+++ b/newback/src/data/model/enums.ts
@@ -0,0 +1,35 @@
+// ISO/IEC 5218 1 male, 2 - female
+export enum Gender {
+  MALE = "MALE",
+  FEMALE = "FEMALE",
+  OTHER = "OTHER",
+}
+
+export enum MessageStatus {
+  ON_SERVER = "ON_SERVER", // Uploaded to server
+  READ = "READ",
+  RECEIVED = "RECEIVED", // Sent
+}
+
+export enum Theme {
+  COLOR_LOR = "COLOR_LOR",
+  COLOR_REG = "COLOR_REG",
+  COLOR_WHITE = "COLOR_WHITE",
+}
+
+
+export enum VerificationType {
+  REGISTER = "REGISTER", // When user sign up with email, we want to confirm that it's his/her email
+  PASSWORD = "PASSWORD", // When user request a pasword change
+  EMAIL = "EMAIL", // When user changes an email
+}
+
+export enum ImageType {
+  VIDEO = "VIDEO",
+  FILE = "FILE",
+  MEDIA_RECORD = "MEDIA_RECORD",
+  AUDIO_RECORD = "AUDIO_RECORD",
+  IMAGE = "IMAGE",
+  PREVIEW = "PREVIEW",
+  GIPHY = "GIPHY",
+}
diff --git a/newback/src/data/shared/common.ts b/newback/src/data/shared/common.ts
new file mode 100644
index 000000000..391b714e7
--- /dev/null
+++ b/newback/src/data/shared/common.ts
@@ -0,0 +1,32 @@
+
+export interface DefaultMessage<A extends string> {
+  action: A;
+}
+
+
+/** CODE I PUT HERE MANUALLY WS IN */
+/*
+ * Any means that every every registered subscriber will be called with this handler if it exists
+ * this means, that handler that registered this event will be called
+ * void means that no handlers should process this signal
+ */
+export type HandlerName =
+  "*"
+  | "call"
+  | "notifier"
+  | "peerConnection:*"
+  | "room"
+  | "router"
+  | "void"
+  | "webrtc-message"
+  | "webrtc"
+  | "webrtcTransfer:*"
+  | "ws-message"
+  | "ws";
+
+
+export type HandlerType<A extends string, H extends HandlerName> = (a: DefaultInMessage<A, H | "*">) => Promise<void> | void;
+
+export type HandlerTypes<K extends string, H extends HandlerName> = {
+  [Key in K]?: HandlerType<Key, H>
+};
diff --git a/newback/src/data/shared/consts.ts b/newback/src/data/shared/consts.ts
new file mode 100644
index 000000000..fb93f9a3f
--- /dev/null
+++ b/newback/src/data/shared/consts.ts
@@ -0,0 +1 @@
+export const WS_SESSION_EXPIRED_CODE = 4001;
diff --git a/newback/src/data/shared/dto.ts b/newback/src/data/shared/dto.ts
new file mode 100644
index 000000000..12dff4494
--- /dev/null
+++ b/newback/src/data/shared/dto.ts
@@ -0,0 +1,215 @@
+
+
+export declare type LogLevel =
+  "debug"
+  | "disable"
+  | "error"
+  | "info"
+  | "log_raise_error"
+  | "log_with_warnings"
+  | "trace"
+  | "warn";
+
+export interface UserSettingsDto {
+  embeddedYoutube: boolean;
+  highlightCode: boolean;
+  incomingFileCallSound: boolean;
+  messageSound: boolean;
+  onlineChangeSound: boolean;
+  showWhenITyping: boolean;
+  suggestions: boolean;
+  logs: LogLevel;
+  theme: string;
+}
+
+
+export interface RoomNoUsersDto {
+  channelId: number | null;
+  notifications: boolean;
+  p2p: boolean;
+  volume: number;
+  isMainInChannel: boolean;
+  id: number;
+  name: string;
+  creatorId: number;
+}
+
+export interface UserProfileDto extends UserProfileDtoWoImage {
+  thumbnail: string;
+}
+
+
+export interface LocationDto {
+  city: string;
+  country: string;
+  countryCode: string;
+  region: string;
+}
+
+
+export interface ChannelDto {
+  name: string;
+  id: number;
+  creatorId: number;
+}
+
+export interface RoomDto extends RoomNoUsersDto {
+  users: number[];
+}
+
+
+export interface FileModelDto {
+  url: string;
+  id: number;
+  type: ImageType;
+  preview: string;
+}
+
+
+
+export interface MessageModelDto {
+  id: number;
+  time: number;
+  parentMessage: number;
+  files?: Record<number, FileModelDto>;
+  tags: Record<number, number>;
+  content: string;
+  status: MessageStatus;
+  symbol?: string;
+  deleted?: boolean;
+  threadMessagesCount: number;
+  edited: number;
+  roomId: number;
+  userId: number;
+}
+
+
+export interface UserDto {
+  username: string;
+  id: number;
+  thumbnail: string;
+  lastTimeOnline: number;
+  sex: Gender;
+}
+
+
+export interface UserProfileDtoWoImage {
+  username: string;
+  name: string;
+  city: string;
+  surname: string;
+  email: string;
+  birthday: Date;
+  contacts: string;
+  sex: Gender;
+  id: number;
+}
+
+
+
+
+export interface ChangeUserOnlineBase {
+  online: Record<number, string[]>;
+  userId: number;
+  lastTimeOnline: number;
+  time: number;
+}
+
+
+
+
+export interface AcceptFileContent {
+  received: number;
+}
+
+export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
+  content: BrowserBase;
+  userId: number;
+}
+
+export interface NewRoom {
+  inviterUserId: number;
+  time: number;
+}
+
+export interface RoomExistedBefore {
+  inviteeUserId: number[];
+}
+
+export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
+}
+
+export interface OpponentWsId {
+  opponentWsId: string;
+}
+
+export interface WebRtcDefaultMessage {
+  connId: string;
+}
+
+export interface OfferFileContent extends BrowserBase {
+  size: number;
+  name: string;
+}
+
+export type ChangeDeviceType =
+  "i_deleted"
+  | "invited"
+  | "room_created"
+  | "someone_joined"
+  | "someone_left";
+export type ChangeOnlineType =
+  "appear_online"
+  | "gone_offline";
+
+export interface BrowserBase {
+  browser: string;
+}
+
+export interface CallBackMessage {
+  // Request to send response with this callback id
+  cbId?: number;
+}
+
+
+export interface ResolveCallbackId {
+  resolveCbId?: number; // If this callback id is present, resolve it
+}
+
+export interface IMessageHandler {
+  handle(message: DefaultInMessage<string, HandlerName>): void;
+
+  getHandler<H extends HandlerName, A extends string>(message: DefaultInMessage<A, H>): HandlerType<A, H> | undefined;
+}
+
+export type CallStatus =
+  "accepted"
+  | "not_inited"
+  | "received_offer"
+  | "sent_offer";
+
+
+/** WsInMessages.ts */
+/**
+ * This file should only contain structures created by server. Only BE -> FE by websockets
+ * and processed by MessageHandler
+ */
+
+
+export interface MessagesResponseMessage {
+  content: MessageModelDto[];
+}
+
+export interface SyncHistoryWsInMessage extends MessagesResponseMessage {
+  readMessageIds: number[];
+  receivedMessageIds: number[];
+}
+
+
+
+export interface GiphyDto {
+  webp: string;
+  url: string;
+  symbol: string;
+}
+
diff --git a/newback/src/data/shared/http.ts b/newback/src/data/shared/http.ts
new file mode 100644
index 000000000..dfd7a1008
--- /dev/null
+++ b/newback/src/data/shared/http.ts
@@ -0,0 +1,111 @@
+import {
+  Gender,
+  ImageType
+} from '@/data/types/frontend';
+
+interface TypeGeneratorForOauth1 extends SessionResponse {
+  isNewAccount: true;
+  username: string;
+}
+
+interface TypeGeneratorForOauth2 extends SessionResponse {
+  isNewAccount: false;
+}
+
+export type OauthSessionResponse =
+  TypeGeneratorForOauth1
+  | TypeGeneratorForOauth2;
+
+
+export type GoogleSignInResponse = OauthSessionResponse;
+export type FacebookSignInResponse = OauthSessionResponse;
+
+export interface SignInRequest extends CaptchaRequest {
+  username?: string;
+  password: string;
+  email?: string;
+}
+
+export interface SendRestorePasswordRequest extends CaptchaRequest {
+  username?: string;
+  email?: string;
+}
+
+export interface VerifyTokenRequest {
+  token: string;
+}
+
+export interface AcceptTokenRequest {
+  token: string;
+  password: string;
+}
+
+export type AcceptTokenResponse = SessionResponse;
+
+export interface VerifyTokenResponse extends OkResponse {
+  username: string;
+}
+
+export type SendRestorePasswordResponse = OkResponse;
+
+export interface CaptchaRequest {
+  captcha?: string;
+}
+
+export interface GoogleAuthRequest {
+  token: string;
+}
+
+export interface FaceBookAuthRequest {
+  token: string;
+}
+
+export interface ValidateUserRequest {
+  username: string;
+}
+
+export interface SignUpRequest {
+  username: string;
+  password: string;
+  email?: string;
+  sex?: Gender;
+}
+
+export interface ConfirmEmailRequest {
+  token: string;
+}
+
+export type ConfirmEmailResponse = OkResponse;
+
+export interface SessionResponse {
+  session: string;
+}
+
+export type SignInResponse = SessionResponse;
+
+export type SignUpResponse = SessionResponse;
+
+export interface OkResponse {
+  ok: true;
+}
+
+export type ValidateUserResponse = OkResponse;
+
+export type ValidateEmailResponse = OkResponse;
+
+export interface ValidateUserEmailRequest {
+  email: string;
+}
+
+export interface SaveFileResponse {
+  id: number;
+  previewId?: number;
+  symbol: string;
+}
+
+export interface SaveFileRequest {
+  file: Blob;
+  name?: string;
+  symbol: string;
+  type: ImageType;
+}
diff --git a/newback/src/data/shared/ws.in.messages.ts b/newback/src/data/shared/ws.in.messages.ts
new file mode 100644
index 000000000..0535d5ffc
--- /dev/null
+++ b/newback/src/data/shared/ws.in.messages.ts
@@ -0,0 +1,235 @@
+import {
+  AcceptFileContent,
+  AddRoomBase,
+  BrowserBase,
+  CallBackMessage,
+  ChangeUserOnlineBase,
+  ChannelDto,
+  DefaultMessage,
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  GiphyDto,
+  HandlerName,
+  MessageModelDto,
+  NewRoom,
+  OfferFileContent,
+  OpponentWsId,
+  ReplyWebRtc,
+  RoomDto,
+  RoomExistedBefore,
+  RoomNoUsersDto,
+  UserDto,
+  UserProfileDto,
+  UserProfileDtoWoImage,
+  UserSettingsDto,
+  WebRtcDefaultMessage
+} from '@/data/types/frontend';
+
+
+export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
+  handler: H;
+}
+
+export interface GetCountryCodeWsInMessage extends DefaultInMessage<"getCountryCode", "void"> {
+  content: Record<string, LocationDto>;
+}
+
+export interface DefaultWsInMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H>, CallBackMessage {
+  cbBySender?: string;
+  cbId?: number;
+}
+
+export interface ShowITypeWsInMessage extends DefaultWsInMessage<"showIType", "room"> {
+  roomId: number;
+  userId: number;
+}
+
+
+export interface DeleteMessage extends DefaultWsInMessage<"deleteMessage", "ws-message"> {
+  roomId: number;
+  id: number;
+  edited: number;
+}
+
+
+export interface SetMessageStatusWsInMessage extends DefaultWsInMessage<"setMessageStatus", "ws-message"> {
+  roomId: number;
+  status: MessageStatus;
+  messagesIds: number[];
+}
+
+export interface EditMessage extends DefaultWsInMessage<"editMessage", "ws-message">, MessageModelDto {
+}
+
+export interface PrintMessageWsInMessage extends DefaultWsInMessage<"printMessage", "ws-message"> {
+  message: MessageModelDto;
+}
+
+export interface AddOnlineUserMessage extends DefaultWsInMessage<"addOnlineUser", "room">, ChangeUserOnlineBase {
+  opponentWsId: string;
+}
+
+export interface CreateNewUsedMessage extends DefaultWsInMessage<"createNewUser", "room">, UserDto {
+  id: number;
+  rooms: {
+    roomId: number;
+    users: number[];
+  }[];
+}
+
+export interface RemoveOnlineUserMessage extends DefaultWsInMessage<"removeOnlineUser", "room">, ChangeUserOnlineBase {
+}
+
+export interface DeleteRoomMessage extends DefaultWsInMessage<"deleteRoom", "room"> {
+  roomId: number;
+}
+
+
+export interface LeaveUserMessage extends DefaultWsInMessage<"leaveUser", "room"> {
+  roomId: number;
+  userId: number;
+  users: number[];
+}
+
+export interface AddChannelMessage extends DefaultWsInMessage<"addChannel", "room">, ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
+  channelUsers: number[];
+}
+
+export interface InviteUserMessage extends NewRoom, RoomExistedBefore, DefaultWsInMessage<"inviteUser", "room"> {
+  roomId: number;
+  users: number[];
+}
+
+export interface AddInviteMessage extends AddRoomBase, RoomExistedBefore, DefaultWsInMessage<"addInvite", "room"> {
+}
+
+export interface SaveChannelSettingsMessage extends DefaultWsInMessage<"saveChannelSettings", "room">, ChannelDto {
+  notifications: boolean;
+  volume: number;
+  p2p: boolean;
+  userId: number;
+}
+
+export interface DeleteChannelMessage extends DefaultWsInMessage<"deleteChannel", "room"> {
+  channelId: number;
+  roomIds: number[];
+}
+
+export interface SaveRoomSettingsMessage extends DefaultWsInMessage<"saveRoomSettings", "room">, RoomNoUsersDto {
+}
+
+
+export interface SetWsIdMessage extends DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
+  rooms: RoomDto[];
+  channels: ChannelDto[];
+  users: UserDto[];
+  online: Record<number, string[]>;
+  time: number;
+  profile: UserProfileDto;
+  settings: UserSettingsDto;
+}
+
+export interface WebRtcSetConnectionIdMessage extends WebRtcDefaultMessage, DefaultWsInMessage<"setConnectionId", "void"> {
+  time: number;
+}
+
+export interface AddRoomMessage extends AddRoomBase, DefaultWsInMessage<"addRoom", "room"> {
+  channelUsers: number[];
+  channelId: number;
+}
+
+export interface OfferFile extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerFile", "webrtc"> {
+  content: OfferFileContent;
+  roomId: number;
+  threadId: number | null;
+  userId: number;
+  time: number;
+}
+
+export interface OfferCall extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerCall", "webrtc"> {
+  content: BrowserBase;
+  roomId: number;
+  userId: number;
+  time: number;
+}
+
+export interface ReplyCallMessage extends ReplyWebRtc, DefaultWsInMessage<"replyCall", "webrtcTransfer:*"> {
+
+}
+
+export interface NotifyCallActiveMessage extends DefaultWsInMessage<"notifyCallActive", "webrtc">, WebRtcDefaultMessage, OpponentWsId {
+  roomId: number;
+  userId: number;
+}
+
+export interface DestroyCallConnection extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"destroyCallConnection", "peerConnection:*"> {
+  content: string;
+}
+
+export interface OfferMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerMessage", "webrtc"> {
+  content: BrowserBase;
+  roomId: number;
+  userId: number;
+  time: number;
+}
+
+export interface SetSettingsMessage extends DefaultWsInMessage<"setSettings", "ws"> {
+  content: UserSettingsDto;
+}
+
+export interface SetUserProfileMessage extends DefaultWsInMessage<"setUserProfile", "ws"> {
+  content: UserProfileDtoWoImage;
+}
+
+export interface UserProfileChangedMessage extends DefaultWsInMessage<"userProfileChanged", "ws">, UserDto {
+
+}
+
+export interface GrowlMessage extends DefaultWsInMessage<"growlError", "void"> {
+  content: string;
+  action: "growlError";
+}
+
+export interface PingMessage extends DefaultWsInMessage<"ping", "ws"> {
+  time: string;
+}
+
+export interface PongMessage extends DefaultWsInMessage<"pong", "ws"> {
+  time: string;
+}
+
+export interface ReplyFileMessage extends ReplyWebRtc, DefaultWsInMessage<"replyFile", "webrtcTransfer:*"> {
+
+}
+
+export interface SetProfileImageMessage extends DefaultWsInMessage<"setProfileImage", "ws"> {
+  content: string;
+}
+
+export interface AcceptCallMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"acceptCall", "webrtcTransfer:*"> {
+}
+
+export interface AcceptFileMessage extends DefaultWsInMessage<"acceptFile", "peerConnection:*"> {
+  content: AcceptFileContent;
+}
+
+export interface SendRtcDataMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"sendRtcData", "peerConnection:*"> {
+  content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
+}
+
+export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*">;
+
+export interface DestroyFileConnectionMessage extends DefaultWsInMessage<"destroyFileConnection", "peerConnection:*"> {
+  content: "decline" | "success";
+}
+
+export interface PrintMessageWsOutMessage extends DefaultWsInMessage<"printMessage", "ws-message"> {
+  content: string;
+  roomId: number;
+  files: number[];
+  id: number;
+  timeDiff: number;
+  parentMessage: number | null;
+  tags: Record<string, number>;
+  giphies: GiphyDto[];
+}
diff --git a/newback/src/data/shared/ws.out.messages.ts b/newback/src/data/shared/ws.out.messages.ts
new file mode 100644
index 000000000..929fddd55
--- /dev/null
+++ b/newback/src/data/shared/ws.out.messages.ts
@@ -0,0 +1,21 @@
+import {
+  DefaultMessage,
+  DefaultWsOutMessage
+} from '@/data/types/frontend';
+
+
+export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {
+  cbId?: number;
+}
+
+export interface ShowITypeWsOutMessage extends DefaultWsOutMessage<"showIType"> {
+  roomId: number;
+}
+
+export interface SetMessageStatusWsOutMessage extends DefaultWsOutMessage<"setMessageStatus"> {
+  messagesIds: number[];
+  status: MessageStatus;
+  roomId: number;
+}
+
+export type GetCountryCodeWsOutMessage = DefaultWsOutMessage<"getCountryCode">;
diff --git a/newback/src/data/types/frontend.ts b/newback/src/data/types/frontend.ts
deleted file mode 120000
index 43385c905..000000000
--- a/newback/src/data/types/frontend.ts
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/dto.ts
\ No newline at end of file

From c6999a8cff805304e2e80aec3644e168874bb8c3 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Tue, 19 Apr 2022 13:23:29 +0300
Subject: [PATCH 083/221] fix imports

---
 frontend/build/vite.config.ts                 |  2 +-
 frontend/yarn.lock                            | 89 +------------------
 newback/src/data/model/image.model.ts         |  2 +-
 newback/src/data/model/message.model.ts       |  2 +-
 newback/src/data/model/uploaded.file.model.ts |  2 +-
 newback/src/data/model/user.model.ts          |  2 +-
 newback/src/data/model/user.settings.model.ts |  2 +-
 newback/src/data/model/verification.model.ts  |  2 +-
 newback/src/data/shared/common.ts             |  1 +
 newback/src/data/shared/dto.ts                |  4 +
 newback/src/data/shared/http.ts               |  6 +-
 newback/src/data/shared/ws.in.messages.ts     | 21 +----
 newback/src/data/shared/ws.out.messages.ts    | 26 +++++-
 .../transformers/helper/get.max.symbol.ts     |  2 +-
 .../transformers/model/channel.transformer.ts |  3 +-
 .../transformers/model/image.transformer.ts   |  4 +-
 .../transformers/model/message.transformer.ts |  2 +-
 .../transformers/model/profile.transformer.ts |  2 +-
 .../transformers/model/room.transformer.ts    |  2 +-
 .../model/settings.transformer.ts             |  2 +-
 .../transformers/model/user.transformer.ts    |  2 +-
 .../add.online.user.transformer.ts            |  2 +-
 .../get.user.contries.transformer.ts          |  7 +-
 .../out.message/inner.transformer.ts          |  8 +-
 .../out.message/print.message.transformer.ts  |  2 +-
 .../remove.online.user.transformer.ts         |  2 +-
 .../out.message/set.ws.id.transformer.ts      |  3 +-
 .../out.message/sync.message.transformer.ts   |  2 +-
 newback/src/data/types/internal.ts            |  6 +-
 .../src/modules/api/auth/auth.controller.ts   | 16 ++--
 newback/src/modules/api/auth/auth.service.ts  | 22 ++---
 .../facebook.auth.request.validator.ts        |  2 +-
 .../google.auth.reques.validator.ts           |  2 +-
 .../validators/login.request.validator.ts     |  2 +-
 .../validators/sign.up.request.validator.ts   |  4 +-
 .../validate.email.request.validator.ts       |  2 +-
 .../validate.user.request.validator.ts        |  2 +-
 .../src/modules/api/file/file.controller.ts   |  3 +-
 newback/src/modules/api/file/file.service.ts  |  4 +-
 newback/src/modules/api/file/image.service.ts |  2 +-
 .../accept.token.request.validator.ts         |  2 +-
 .../confirm.email.request.validator.ts        |  2 +-
 .../send.restore.password.validator.ts        |  2 +-
 .../verify.token.request.validator.ts         |  2 +-
 .../modules/api/verify/verify.controller.ts   | 12 +--
 .../modules/api/verify/verify.module.spec.ts  |  2 +-
 .../src/modules/api/verify/verify.service.ts  | 15 ++--
 .../modules/api/websocket/message.service.ts  | 14 +--
 .../api/websocket/websocket.gateway.ts        | 18 ++--
 .../api/websocket/websocket.service.ts        |  2 +-
 .../modules/api/websocket/ws.data.service.ts  |  2 +-
 .../api/websocket/ws.exception.filter.ts      |  2 +-
 .../modules/app/decorators/catch.ws.errors.ts |  2 +-
 .../modules/app/guards/own.message.guard.ts   |  2 +-
 .../src/modules/app/guards/own.room.guard.ts  |  3 +-
 .../repository/message.repository.e2e.spec.ts |  2 +-
 .../repository/messages.repository.ts         |  2 +-
 .../database/repository/user.repository.ts    |  2 +-
 .../modules/shared/pubsub/pubsub.service.ts   |  2 +-
 .../modules/shared/ws.adapter/ws.adapter.ts   |  6 +-
 newback/src/utils/migration.old.ts            |  2 +-
 newback/src/utils/migration.runner.ts         |  2 +-
 62 files changed, 138 insertions(+), 235 deletions(-)

diff --git a/frontend/build/vite.config.ts b/frontend/build/vite.config.ts
index 75181f870..c94ff69f7 100644
--- a/frontend/build/vite.config.ts
+++ b/frontend/build/vite.config.ts
@@ -132,7 +132,7 @@ export default defineConfig(async({command, mode}) => {
       },
     },
     server: {
-      port: 443,
+      port: 8080,
       https: {
         key,
         cert,
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 83dbe2df7..ca787ceb4 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -107,16 +107,6 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
-"@socket.io/base64-arraybuffer@~1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61"
-  integrity sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==
-
-"@socket.io/component-emitter@~3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz#8863915676f837d9dad7b76f50cb500c1e9422e9"
-  integrity sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q==
-
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -587,11 +577,6 @@ array.prototype.flat@^1.2.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.0"
 
-backo2@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -833,7 +818,7 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -941,28 +926,6 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.1.1.tgz#800d4b9db5487d169686729e5bd887afa78d36b0"
-  integrity sha512-V05mmDo4gjimYW+FGujoGmmmxRaDsrVr7AXA3ZIfa04MWM1jOfZfUwou0oNqhNwy/votUDvGDt4JA4QF4e0b4g==
-  dependencies:
-    "@socket.io/component-emitter" "~3.0.0"
-    debug "~4.3.1"
-    engine.io-parser "~5.0.0"
-    has-cors "1.1.0"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~8.2.3"
-    xmlhttprequest-ssl "~2.0.0"
-    yeast "0.1.2"
-
-engine.io-parser@~5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.3.tgz#ca1f0d7b11e290b4bfda251803baea765ed89c09"
-  integrity sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==
-  dependencies:
-    "@socket.io/base64-arraybuffer" "~1.0.2"
-
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -1632,11 +1595,6 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -2332,16 +2290,6 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
-
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
-
 patch-package@^6.2.2:
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148"
@@ -2718,26 +2666,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-socket.io-client@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.4.1.tgz#b6aa9448149d09b8d0b2bbf3d2fac310631fdec9"
-  integrity sha512-N5C/L5fLNha5Ojd7Yeb/puKcPWWcoB/A09fEjjNsg91EDVr5twk/OEyO6VT9dlLSUNY85NpW6KBhVMvaLKQ3vQ==
-  dependencies:
-    "@socket.io/component-emitter" "~3.0.0"
-    backo2 "~1.0.2"
-    debug "~4.3.2"
-    engine.io-client "~6.1.1"
-    parseuri "0.0.6"
-    socket.io-parser "~4.1.1"
-
-socket.io-parser@~4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.1.2.tgz#0a97d4fb8e67022158a568450a6e41887e42035e"
-  integrity sha512-j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog==
-  dependencies:
-    "@socket.io/component-emitter" "~3.0.0"
-    debug "~4.3.1"
-
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -3311,16 +3239,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@~8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
-  integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
-
-xmlhttprequest-ssl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
-  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -3379,8 +3297,3 @@ yauzl@^2.10.0:
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
-
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
diff --git a/newback/src/data/model/image.model.ts b/newback/src/data/model/image.model.ts
index ab2cdd8df..8c71a60c7 100644
--- a/newback/src/data/model/image.model.ts
+++ b/newback/src/data/model/image.model.ts
@@ -8,8 +8,8 @@ import {
   Unique,
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
-import {ImageType} from "@/data/types/frontend";
 import {MessageModel} from "@/data/model/message.model";
+import { ImageType } from '@/data/model/enums';
 
 const uniqueUserIdSymbMess = "unique_image_symbol_message";
 
diff --git a/newback/src/data/model/message.model.ts b/newback/src/data/model/message.model.ts
index f4ae55696..b27653560 100644
--- a/newback/src/data/model/message.model.ts
+++ b/newback/src/data/model/message.model.ts
@@ -7,9 +7,9 @@ import {
   Table,
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
-import {MessageStatus} from "@/data/types/frontend";
 import {UserModel} from "@/data/model/user.model";
 import {RoomModel} from "@/data/model/room.model";
+import { MessageStatus } from '@/data/model/enums';
 
 @Injectable()
 @Table({tableName: "message"})
diff --git a/newback/src/data/model/uploaded.file.model.ts b/newback/src/data/model/uploaded.file.model.ts
index 73c3ca2fd..faa27d59b 100644
--- a/newback/src/data/model/uploaded.file.model.ts
+++ b/newback/src/data/model/uploaded.file.model.ts
@@ -7,8 +7,8 @@ import {
   Table,
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
-import {ImageType} from "@/data/types/frontend";
 import {UserModel} from "@/data/model/user.model";
+import { ImageType } from '@/data/model/enums';
 
 @Injectable()
 @Table({tableName: "uploaded_file"})
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index 3756e7de2..b64cb4792 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -6,11 +6,11 @@ import {
   Table,
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
-import {Gender} from "@/data/types/frontend";
 import {UserAuthModel} from "@/data/model/user.auth.model";
 import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
 import {MAX_USERNAME_LENGTH} from '@/data/consts';
+import { Gender } from '@/data/model/enums';
 
 
 @Injectable()
diff --git a/newback/src/data/model/user.settings.model.ts b/newback/src/data/model/user.settings.model.ts
index 58827c86b..5fa8bfae9 100644
--- a/newback/src/data/model/user.settings.model.ts
+++ b/newback/src/data/model/user.settings.model.ts
@@ -7,13 +7,13 @@ import {
   Table,
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
-import {Theme} from "@/data/types/frontend";
 import {UserModel} from "@/data/model/user.model";
 import {
   LogLevel,
   logLevels,
 } from "lines-logger";
 import {MysqlBool} from "@/data/types/internal";
+import { Theme } from '@/data/model/enums';
 
 @Injectable()
 @Table({tableName: "user_settings"})
diff --git a/newback/src/data/model/verification.model.ts b/newback/src/data/model/verification.model.ts
index 2592587ed..f2e5f70b4 100644
--- a/newback/src/data/model/verification.model.ts
+++ b/newback/src/data/model/verification.model.ts
@@ -8,8 +8,8 @@ import {
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
-import {VerificationType} from "@/data/types/frontend";
 import {MysqlBool} from "@/data/types/internal";
+import { VerificationType } from '@/data/model/enums';
 
 @Injectable()
 @Table({tableName: "verification"})
diff --git a/newback/src/data/shared/common.ts b/newback/src/data/shared/common.ts
index 391b714e7..3443dacdd 100644
--- a/newback/src/data/shared/common.ts
+++ b/newback/src/data/shared/common.ts
@@ -1,3 +1,4 @@
+import { DefaultInMessage } from '@/data/shared/ws.in.messages';
 
 export interface DefaultMessage<A extends string> {
   action: A;
diff --git a/newback/src/data/shared/dto.ts b/newback/src/data/shared/dto.ts
index 12dff4494..8b7c8c7d8 100644
--- a/newback/src/data/shared/dto.ts
+++ b/newback/src/data/shared/dto.ts
@@ -1,3 +1,6 @@
+import { Gender, ImageType, MessageStatus } from '@/data/model/enums';
+import { DefaultInMessage } from '@/data/shared/ws.in.messages';
+import { HandlerName, HandlerType } from '@/data/shared/common';
 
 
 export declare type LogLevel =
@@ -179,6 +182,7 @@ export interface ResolveCallbackId {
 export interface IMessageHandler {
   handle(message: DefaultInMessage<string, HandlerName>): void;
 
+  // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
   getHandler<H extends HandlerName, A extends string>(message: DefaultInMessage<A, H>): HandlerType<A, H> | undefined;
 }
 
diff --git a/newback/src/data/shared/http.ts b/newback/src/data/shared/http.ts
index dfd7a1008..cd3b34d09 100644
--- a/newback/src/data/shared/http.ts
+++ b/newback/src/data/shared/http.ts
@@ -1,7 +1,5 @@
-import {
-  Gender,
-  ImageType
-} from '@/data/types/frontend';
+import { Gender, ImageType } from '@/data/model/enums';
+
 
 interface TypeGeneratorForOauth1 extends SessionResponse {
   isNewAccount: true;
diff --git a/newback/src/data/shared/ws.in.messages.ts b/newback/src/data/shared/ws.in.messages.ts
index 0535d5ffc..d13972854 100644
--- a/newback/src/data/shared/ws.in.messages.ts
+++ b/newback/src/data/shared/ws.in.messages.ts
@@ -5,11 +5,7 @@ import {
   CallBackMessage,
   ChangeUserOnlineBase,
   ChannelDto,
-  DefaultMessage,
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  GiphyDto,
-  HandlerName,
+  GiphyDto, LocationDto,
   MessageModelDto,
   NewRoom,
   OfferFileContent,
@@ -23,7 +19,9 @@ import {
   UserProfileDtoWoImage,
   UserSettingsDto,
   WebRtcDefaultMessage
-} from '@/data/types/frontend';
+} from '@/data/shared/dto';
+import { DefaultMessage, HandlerName } from '@/data/shared/common';
+import { MessageStatus } from '@/data/model/enums';
 
 
 export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
@@ -222,14 +220,3 @@ export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*
 export interface DestroyFileConnectionMessage extends DefaultWsInMessage<"destroyFileConnection", "peerConnection:*"> {
   content: "decline" | "success";
 }
-
-export interface PrintMessageWsOutMessage extends DefaultWsInMessage<"printMessage", "ws-message"> {
-  content: string;
-  roomId: number;
-  files: number[];
-  id: number;
-  timeDiff: number;
-  parentMessage: number | null;
-  tags: Record<string, number>;
-  giphies: GiphyDto[];
-}
diff --git a/newback/src/data/shared/ws.out.messages.ts b/newback/src/data/shared/ws.out.messages.ts
index 929fddd55..426b45838 100644
--- a/newback/src/data/shared/ws.out.messages.ts
+++ b/newback/src/data/shared/ws.out.messages.ts
@@ -1,7 +1,6 @@
-import {
-  DefaultMessage,
-  DefaultWsOutMessage
-} from '@/data/types/frontend';
+import { DefaultMessage } from '@/data/shared/common';
+import { MessageStatus } from '@/data/model/enums';
+import { GiphyDto } from '@/data/shared/dto';
 
 
 export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {
@@ -19,3 +18,22 @@ export interface SetMessageStatusWsOutMessage extends DefaultWsOutMessage<"setMe
 }
 
 export type GetCountryCodeWsOutMessage = DefaultWsOutMessage<"getCountryCode">;
+
+export interface SyncHistoryWsOutMessage extends DefaultWsOutMessage<"syncHistory"> {
+  roomIds: number[];
+  messagesIds: number[];
+  onServerMessageIds: number[];
+  receivedMessageIds: number[];
+  lastSynced: number;
+}
+
+export interface PrintMessageWsOutMessage extends DefaultMessage<"printMessage"> {
+  content: string;
+  roomId: number;
+  files: number[];
+  id: number;
+  timeDiff: number;
+  parentMessage: number | null;
+  tags: Record<string, number>;
+  giphies: GiphyDto[];
+}
diff --git a/newback/src/data/transformers/helper/get.max.symbol.ts b/newback/src/data/transformers/helper/get.max.symbol.ts
index 4a6d9ba12..005267686 100644
--- a/newback/src/data/transformers/helper/get.max.symbol.ts
+++ b/newback/src/data/transformers/helper/get.max.symbol.ts
@@ -1,5 +1,5 @@
 import {UploadedFileModel} from '@/data/model/uploaded.file.model';
-import {GiphyDto} from '@/data/types/frontend';
+import { GiphyDto } from '@/data/shared/dto';
 
 
 export function getMaxSymbol(files: UploadedFileModel[], tags: Record<string, number>, giphies: GiphyDto[]) {
diff --git a/newback/src/data/transformers/model/channel.transformer.ts b/newback/src/data/transformers/model/channel.transformer.ts
index 41688419e..6bfa5858b 100644
--- a/newback/src/data/transformers/model/channel.transformer.ts
+++ b/newback/src/data/transformers/model/channel.transformer.ts
@@ -1,5 +1,6 @@
 import {ChannelModel} from '@/data/model/channel.model';
-import {ChannelDto} from '@/data/types/frontend';
+import { ChannelDto } from '@/data/shared/dto';
+
 
 export function transformChannelDto(c: ChannelModel): ChannelDto {
   return {
diff --git a/newback/src/data/transformers/model/image.transformer.ts b/newback/src/data/transformers/model/image.transformer.ts
index d2148b1c9..d0994ed2f 100644
--- a/newback/src/data/transformers/model/image.transformer.ts
+++ b/newback/src/data/transformers/model/image.transformer.ts
@@ -1,8 +1,8 @@
 import type {ImageModel} from "@/data/model/image.model";
 import type {MessageModel} from "@/data/model/message.model";
-import type {FileModelDto} from "@/data/types/frontend";
-import {ImageType} from "@/data/types/frontend";
 import type {PureModel,} from "@/data/types/internal";
+import { FileModelDto } from '@/data/shared/dto';
+import { ImageType } from '@/data/model/enums';
 
 export function getUrl(value: PureModel<ImageModel>, attribute: "img" | "preview") {
   return value.type === ImageType.GIPHY ? value.img : `/photo/${value[attribute]}`;
diff --git a/newback/src/data/transformers/model/message.transformer.ts b/newback/src/data/transformers/model/message.transformer.ts
index 83c0f7b32..1a77ffdd6 100644
--- a/newback/src/data/transformers/model/message.transformer.ts
+++ b/newback/src/data/transformers/model/message.transformer.ts
@@ -1,13 +1,13 @@
 import type {MessageModel} from "@/data/model/message.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
-import type {MessageModelDto} from "@/data/types/frontend";
 import type {
   CreateModel,
   PureModel,
 } from "@/data/types/internal";
 import {transformMentionByPickingDto} from '@/data/transformers/model/mention.transformer';
 import {transformImageByPickingDto} from '@/data/transformers/model/image.transformer';
+import { MessageModelDto } from '@/data/shared/dto';
 
 
 export function transformMessageDto(message: PureModel<MessageModel>, mentions: CreateModel<MessageMentionModel>[], images: PureModel<ImageModel>[]): MessageModelDto {
diff --git a/newback/src/data/transformers/model/profile.transformer.ts b/newback/src/data/transformers/model/profile.transformer.ts
index 33f7006f2..1fa86f1fb 100644
--- a/newback/src/data/transformers/model/profile.transformer.ts
+++ b/newback/src/data/transformers/model/profile.transformer.ts
@@ -1,5 +1,5 @@
 import {UserModel} from '@/data/model/user.model';
-import {UserProfileDto} from '@/data/types/frontend';
+import { UserProfileDto } from '@/data/shared/dto';
 
 export function transformProfileDto(user: UserModel): UserProfileDto {
   return {
diff --git a/newback/src/data/transformers/model/room.transformer.ts b/newback/src/data/transformers/model/room.transformer.ts
index 0f9b5af69..4a0920981 100644
--- a/newback/src/data/transformers/model/room.transformer.ts
+++ b/newback/src/data/transformers/model/room.transformer.ts
@@ -1,6 +1,6 @@
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {GetRoomsForUser} from "@/data/types/internal";
-import type {RoomDto} from "@/data/types/frontend";
+import { RoomDto } from '@/data/shared/dto';
 
 export function getTransformRoomDto(users: number[], room: GetRoomsForUser): RoomDto {
   return {
diff --git a/newback/src/data/transformers/model/settings.transformer.ts b/newback/src/data/transformers/model/settings.transformer.ts
index adc8a0cac..899267ec0 100644
--- a/newback/src/data/transformers/model/settings.transformer.ts
+++ b/newback/src/data/transformers/model/settings.transformer.ts
@@ -1,5 +1,5 @@
 import {UserModel} from '@/data/model/user.model';
-import {UserSettingsDto} from '@/data/types/frontend';
+import { UserSettingsDto } from '@/data/shared/dto';
 
 export function transformSettings(user: UserModel): UserSettingsDto {
   return {
diff --git a/newback/src/data/transformers/model/user.transformer.ts b/newback/src/data/transformers/model/user.transformer.ts
index d9b87bd39..fee55f298 100644
--- a/newback/src/data/transformers/model/user.transformer.ts
+++ b/newback/src/data/transformers/model/user.transformer.ts
@@ -1,5 +1,5 @@
 import {UserModel} from '@/data/model/user.model';
-import {UserDto} from '@/data/types/frontend';
+import { UserDto } from '@/data/shared/dto';
 
 
 export function transformUserDto(u: UserModel): UserDto {
diff --git a/newback/src/data/transformers/out.message/add.online.user.transformer.ts b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
index 425fc48a0..2f4cb93b4 100644
--- a/newback/src/data/transformers/out.message/add.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
@@ -1,5 +1,5 @@
 import {UserModel} from '@/data/model/user.model';
-import {AddOnlineUserMessage} from '@/data/types/frontend';
+import { AddOnlineUserMessage } from '@/data/shared/ws.in.messages';
 
 export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
   return {
diff --git a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
index 895aa65b0..d55792299 100644
--- a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
+++ b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
@@ -1,8 +1,7 @@
 import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
-import {
-  GetCountryCodeWsInMessage,
-  LocationDto
-} from '@/data/types/frontend';
+import { GetCountryCodeWsInMessage } from '@/data/shared/ws.in.messages';
+import { LocationDto } from '@/data/shared/dto';
+
 
 export function transformUserCountries(userInfo: UserJoinedInfoModel[]): Omit<GetCountryCodeWsInMessage, "action" | "handler"> {
   const content: GetCountryCodeWsInMessage["content"] = userInfo.reduce((previousValue, currentValue) => {
diff --git a/newback/src/data/transformers/out.message/inner.transformer.ts b/newback/src/data/transformers/out.message/inner.transformer.ts
index 33a44f775..42f671b54 100644
--- a/newback/src/data/transformers/out.message/inner.transformer.ts
+++ b/newback/src/data/transformers/out.message/inner.transformer.ts
@@ -1,12 +1,10 @@
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {ImageModel} from "@/data/model/image.model";
-import type {
-  GiphyDto,
-  PrintMessageWsOutMessage,
-} from "@/data/types/frontend";
-import {ImageType} from "@/data/types/frontend";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {CreateModel} from "@/data/types/internal";
+import { GiphyDto } from '@/data/shared/dto';
+import { ImageType } from '@/data/model/enums';
+import { PrintMessageWsOutMessage } from '@/data/shared/ws.out.messages';
 
 
 export function getUploadedGiphies(data: GiphyDto[], messageId: number): CreateModel<ImageModel>[] {
diff --git a/newback/src/data/transformers/out.message/print.message.transformer.ts b/newback/src/data/transformers/out.message/print.message.transformer.ts
index 022ee086d..4e1f89474 100644
--- a/newback/src/data/transformers/out.message/print.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/print.message.transformer.ts
@@ -4,9 +4,9 @@ import type {
   PureModel,
 } from "@/data/types/internal";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
-import type {PrintMessageWsInMessage} from "@/data/types/frontend";
 import type {MessageModel} from "@/data/model/message.model";
 import {transformMessageDto} from '@/data/transformers/model/message.transformer';
+import { PrintMessageWsInMessage } from '@/data/shared/ws.in.messages';
 
 export function transformPrintMessage(
   message: PureModel<MessageModel>,
diff --git a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
index b2ed987bd..5fbb04b14 100644
--- a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
@@ -2,7 +2,7 @@ import {
   UserOnlineData,
   WebSocketContextData
 } from '@/data/types/internal';
-import {RemoveOnlineUserMessage} from '@/data/types/frontend';
+import { RemoveOnlineUserMessage } from '@/data/shared/ws.in.messages';
 
 export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage {
   return {
diff --git a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
index 8d87300d5..d2b15bb8d 100644
--- a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
+++ b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
@@ -1,7 +1,5 @@
 import type {TransformSetWsIdDataParams} from "@/data/types/internal";
-import type {SetWsIdMessage} from "@/data/types/frontend";
 import {transformChannelDto} from "@/data/transformers/model/channel.transformer";
-
 import {transformSettings} from "@/data/transformers/model/settings.transformer";
 import {transformUserDto} from "@/data/transformers/model/user.transformer";
 import {transformProfileDto} from "@/data/transformers/model/profile.transformer";
@@ -9,6 +7,7 @@ import {
   getRoomsOnline,
   getTransformRoomDto,
 } from "@/data/transformers/model/room.transformer";
+import { SetWsIdMessage } from '@/data/shared/ws.in.messages';
 
 
 export function transformSetWsId(
diff --git a/newback/src/data/transformers/out.message/sync.message.transformer.ts b/newback/src/data/transformers/out.message/sync.message.transformer.ts
index ec9a743c2..88734efba 100644
--- a/newback/src/data/transformers/out.message/sync.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/sync.message.transformer.ts
@@ -1,8 +1,8 @@
 import {MessageModel} from '@/data/model/message.model';
 import {MessageMentionModel} from '@/data/model/message.mention.model';
 import {ImageModel} from '@/data/model/image.model';
-import {SyncHistoryWsInMessage} from '@/data/types/frontend';
 import {transformMessageDto} from '@/data/transformers/model/message.transformer';
+import { SyncHistoryWsInMessage } from '@/data/shared/dto';
 
 export function getSyncMessage(
   readMessageIds: number[],
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 718f59cad..a0d967609 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,11 +1,9 @@
-import type {
-  DefaultWsInMessage,
-  HandlerName
-} from "@/data/types/frontend";
 import type {RoomModel} from "@/data/model/room.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {ChannelModel} from "@/data/model/channel.model";
 import type {UserModel} from "@/data/model/user.model";
+import { DefaultWsInMessage } from '@/data/shared/ws.in.messages';
+import { HandlerName } from '@/data/shared/common';
 
 export interface WebSocketContextData {
   userId: number;
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index d4da1b823..2f76cc9d0 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -9,18 +9,18 @@ import {AuthService} from "@/modules/api/auth/auth.service";
 import {LoginRequestValidator} from "@/modules/api/auth/validators/login.request.validator";
 import {SignUpRequestValidator} from "@/modules/api/auth/validators/sign.up.request.validator";
 import {ValidateUserRequestValidator} from "@/modules/api/auth/validators/validate.user.request.validator";
-import type {
-  FacebookSignInResponse,
-  GoogleSignInResponse,
-  SignInResponse,
-  SignUpResponse,
-  ValidateEmailResponse,
-  ValidateUserResponse,
-} from "@/data/types/frontend";
+
 import {GoogleAuthRequestValidator} from "@/modules/api/auth/validators/google.auth.reques.validator";
 import {CaptchaGuard} from "@/modules/app/guards/captcha.guard";
 import {ValidateEmailRequestValidator} from "@/modules/api/auth/validators/validate.email.request.validator";
 import {FacebookAuthRequestValidator} from "@/modules/api/auth/validators/facebook.auth.request.validator";
+import {
+  FacebookSignInResponse, GoogleSignInResponse,
+  SignInResponse,
+  SignUpResponse,
+  ValidateEmailResponse,
+  ValidateUserResponse
+} from '@/data/shared/http';
 
 
 @Controller({
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index febb1541c..467c886f2 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -6,20 +6,6 @@ import {
 } from "@nestjs/common";
 import {UserRepository} from "@/modules/shared/database/repository/user.repository";
 import {PasswordService} from "@/modules/shared/password/password.service";
-import type {
-  FaceBookAuthRequest,
-  FacebookSignInResponse,
-  GoogleAuthRequest,
-  GoogleSignInResponse,
-  SignInRequest,
-  SignInResponse,
-  SignUpRequest,
-  SignUpResponse,
-} from "@/data/types/frontend";
-import {
-  Gender,
-  VerificationType,
-} from "@/data/types/frontend";
 import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
 import {EmailService} from "@/modules/shared/email/email.service";
 import type {Transaction} from "sequelize";
@@ -36,6 +22,14 @@ import {
   ALL_ROOM_ID,
   MAX_USERNAME_LENGTH
 } from '@/data/consts';
+import {
+  FaceBookAuthRequest,
+  FacebookSignInResponse,
+  GoogleAuthRequest, GoogleSignInResponse, SignInRequest, SignInResponse,
+  SignUpRequest,
+  SignUpResponse
+} from '@/data/shared/http';
+import { Gender, VerificationType } from '@/data/model/enums';
 
 @Injectable()
 export class AuthService {
diff --git a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
index 90d88a8ad..ca312c1f6 100644
--- a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
@@ -1,5 +1,5 @@
 import {IsString} from "class-validator";
-import type {FaceBookAuthRequest} from "@/data/types/frontend";
+import { FaceBookAuthRequest } from '@/data/shared/http';
 
 export class FacebookAuthRequestValidator implements FaceBookAuthRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
index 3d7f9949f..4a2427506 100644
--- a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -1,5 +1,5 @@
 import {IsString} from "class-validator";
-import type {GoogleAuthRequest} from "@/data/types/frontend";
+import { GoogleAuthRequest } from '@/data/shared/http';
 
 export class GoogleAuthRequestValidator implements GoogleAuthRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/login.request.validator.ts b/newback/src/modules/api/auth/validators/login.request.validator.ts
index e0a511e23..4215808e2 100644
--- a/newback/src/modules/api/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/login.request.validator.ts
@@ -4,7 +4,7 @@ import {
   Matches,
   ValidateIf,
 } from "class-validator";
-import type {SignInRequest} from "@/data/types/frontend";
+import { SignInRequest } from '@/data/shared/http';
 
 export class LoginRequestValidator implements SignInRequest {
   @ValidateIf((o) => !o.email || o.username)
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index f0a4686f7..2f793fafc 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -6,9 +6,9 @@ import {
   Length,
   Matches,
 } from "class-validator";
-import type {SignUpRequest} from "@/data/types/frontend";
-import {Gender} from "@/data/types/frontend";
 import {MAX_USERNAME_LENGTH} from '@/data/consts';
+import { SignUpRequest } from '@/data/shared/http';
+import { Gender } from '@/data/model/enums';
 
 
 export class SignUpRequestValidator implements SignUpRequest {
diff --git a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
index f4086fe95..f40e4a9e7 100644
--- a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
@@ -2,7 +2,7 @@ import {
   IsEmail,
   IsString,
 } from "class-validator";
-import type {ValidateUserEmailRequest} from "@/data/types/frontend";
+import { ValidateUserEmailRequest } from '@/data/shared/http';
 
 export class ValidateEmailRequestValidator implements ValidateUserEmailRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index d21464f85..af7ff9095 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -3,8 +3,8 @@ import {
   Length,
   Matches,
 } from "class-validator";
-import type {ValidateUserRequest} from "@/data/types/frontend";
 import {MAX_USERNAME_LENGTH} from '@/data/consts';
+import { ValidateUserRequest } from '@/data/shared/http';
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {
   @IsString()
diff --git a/newback/src/modules/api/file/file.controller.ts b/newback/src/modules/api/file/file.controller.ts
index d2d49b653..b42e0d44d 100644
--- a/newback/src/modules/api/file/file.controller.ts
+++ b/newback/src/modules/api/file/file.controller.ts
@@ -10,8 +10,7 @@ import {FileInterceptor} from "@nestjs/platform-express";
 import {AuthGuard} from "@/modules/app/guards/auth.guard";
 import {UserId} from "@/modules/app/decorators/user.id.decorator";
 import {FileService} from "@/modules/api/file/file.service";
-import type {SaveFileResponse} from "@/data/types/frontend";
-import {SaveFileRequest} from "@/data/types/frontend";
+import { SaveFileRequest, SaveFileResponse } from '@/data/shared/http';
 
 
 @Controller({
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index 5d3c905e3..2924d32f8 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -2,13 +2,13 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import type {SaveFileResponse} from "@/data/types/frontend";
-import {ImageType} from "@/data/types/frontend";
 import {join} from "path";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import type {FileSaveResponse} from "@/data/types/internal";
 import {Sequelize} from "sequelize-typescript";
 import {ImageService} from "@/modules/api/file/image.service";
+import { ImageType } from '@/data/model/enums';
+import { SaveFileResponse } from '@/data/shared/http';
 
 @Injectable()
 export class FileService {
diff --git a/newback/src/modules/api/file/image.service.ts b/newback/src/modules/api/file/image.service.ts
index af926a9af..b8951fa63 100644
--- a/newback/src/modules/api/file/image.service.ts
+++ b/newback/src/modules/api/file/image.service.ts
@@ -2,7 +2,6 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import {ImageType} from "@/data/types/frontend";
 import type {Metadata} from "sharp";
 import * as sharp from "sharp";
 import {PasswordService} from "@/modules/shared/password/password.service";
@@ -13,6 +12,7 @@ import {
   writeFile,
 } from "fs/promises";
 import type {FileSaveResponse} from "@/data/types/internal";
+import { ImageType } from '@/data/model/enums';
 
 @Injectable()
 export class ImageService {
diff --git a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
index b9886d715..1bd7efb56 100644
--- a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
@@ -3,7 +3,7 @@ import {
   Length,
   Matches,
 } from "class-validator";
-import type {AcceptTokenRequest} from "@/data/types/frontend";
+import { AcceptTokenRequest } from '@/data/shared/http';
 
 
 export class AcceptTokenRequestValidator implements AcceptTokenRequest {
diff --git a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
index f47b956cd..e21fe4daf 100644
--- a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
@@ -1,5 +1,5 @@
 import {IsString} from "class-validator";
-import type {ConfirmEmailRequest} from "@/data/types/frontend";
+import { ConfirmEmailRequest } from '@/data/shared/http';
 
 
 export class ConfirmEmailRequestValidator implements ConfirmEmailRequest {
diff --git a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
index f7b76799c..f1c23dbfa 100644
--- a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
+++ b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
@@ -4,7 +4,7 @@ import {
   Matches,
   ValidateIf,
 } from "class-validator";
-import type {SendRestorePasswordRequest} from "@/data/types/frontend";
+import { SendRestorePasswordRequest } from '@/data/shared/http';
 
 export class SendRestorePasswordValidator implements SendRestorePasswordRequest {
   @ValidateIf((o) => !o.email || o.username)
diff --git a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
index 7d93e3091..6400d91d0 100644
--- a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
@@ -1,5 +1,5 @@
 import {IsString} from "class-validator";
-import type {VerifyTokenRequest} from "@/data/types/frontend";
+import { VerifyTokenRequest } from '@/data/shared/http';
 
 
 export class VerifyTokenRequestValidator implements VerifyTokenRequest {
diff --git a/newback/src/modules/api/verify/verify.controller.ts b/newback/src/modules/api/verify/verify.controller.ts
index a371d9cb3..d7e3906ec 100644
--- a/newback/src/modules/api/verify/verify.controller.ts
+++ b/newback/src/modules/api/verify/verify.controller.ts
@@ -7,16 +7,16 @@ import {
 } from "@nestjs/common";
 import {CaptchaGuard} from "@/modules/app/guards/captcha.guard";
 import {SendRestorePasswordValidator} from "@/modules/api/verify/validators/send.restore.password.validator";
-import type {
-  AcceptTokenResponse,
-  ConfirmEmailResponse,
-  SendRestorePasswordResponse,
-  VerifyTokenResponse,
-} from "@/data/types/frontend";
 import {VerifyTokenRequestValidator} from "@/modules/api/verify/validators/verify.token.request.validator";
 import {ConfirmEmailRequestValidator} from "@/modules/api/verify/validators/confirm.email.request.validator";
 import {AcceptTokenRequestValidator} from "@/modules/api/verify/validators/accept.token.request.validator";
 import {VerifyService} from "@/modules/api/verify/verify.service";
+import {
+  AcceptTokenResponse,
+  ConfirmEmailResponse,
+  SendRestorePasswordResponse,
+  VerifyTokenResponse
+} from '@/data/shared/http';
 
 
 @Controller({
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index cf91ad344..d7874413c 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -24,10 +24,10 @@ import {IpService} from "@/modules/shared/ip/ip.service";
 import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
 import type {IpAddressModel} from "@/data/model/ip.address.model";
 import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
-import {VerificationType} from "@/data/types/frontend";
 import {VerifyController} from "@/modules/api/verify/verify.controller";
 import {VerifyService} from "@/modules/api/verify/verify.service";
 import {SessionService} from "@/modules/shared/session/session.service";
+import { VerificationType } from '@/data/model/enums';
 
 describe("VerifyModule", () => {
   let app: INestApplication;
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index 7c6c32bb9..a81531df6 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -5,20 +5,19 @@ import {
 } from "@nestjs/common";
 import {UserRepository} from "@/modules/shared/database/repository/user.repository";
 import {PasswordService} from "@/modules/shared/password/password.service";
-import type {
-  AcceptTokenRequest,
-  AcceptTokenResponse,
-  ConfirmEmailRequest,
-  SendRestorePasswordRequest,
-  VerifyTokenResponse,
-} from "@/data/types/frontend";
-import {VerificationType} from "@/data/types/frontend";
 import {EmailService} from "@/modules/shared/email/email.service";
 import {Sequelize} from "sequelize-typescript";
 import type {VerificationModel} from "@/data/model/verification.model";
 import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
 import {SessionService} from "@/modules/shared/session/session.service";
+import {
+  AcceptTokenRequest,
+  AcceptTokenResponse, ConfirmEmailRequest,
+  SendRestorePasswordRequest,
+  VerifyTokenResponse
+} from '@/data/shared/http';
+import { VerificationType } from '@/data/model/enums';
 
 @Injectable()
 export class VerifyService {
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 8662a5d38..98709798f 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -2,13 +2,6 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import type {
-  PrintMessageWsOutMessage,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutMessage,
-  SyncHistoryWsOutMessage,
-} from "@/data/types/frontend";
-import {MessageStatus} from "@/data/types/frontend";
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import type {
   CreateModel,
@@ -27,6 +20,13 @@ import {
 } from '@/data/transformers/out.message/inner.transformer';
 import {transformPrintMessage} from '@/data/transformers/out.message/print.message.transformer';
 import {getMaxSymbol} from '@/data/transformers/helper/get.max.symbol';
+import {
+  PrintMessageWsOutMessage,
+  ShowITypeWsOutMessage,
+  SyncHistoryWsOutMessage
+} from '@/data/shared/ws.out.messages';
+import { MessageStatus } from '@/data/model/enums';
+import { ShowITypeWsInMessage } from '@/data/shared/ws.in.messages';
 
 @Injectable()
 export class MessageService {
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index d6b954125..c5a91e3cc 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -20,16 +20,6 @@ import {
   UseFilters,
   UseGuards,
 } from "@nestjs/common";
-import type {
-  GetCountryCodeWsInMessage,
-  SyncHistoryWsInMessage,
-} from "@/data/types/frontend";
-import {
-  GetCountryCodeWsOutMessage,
-  PrintMessageWsOutMessage,
-  ShowITypeWsOutMessage,
-  SyncHistoryWsOutMessage,
-} from "@/data/types/frontend";
 import {SubscribePuBSub} from "@/modules/shared/pubsub/pubsub.service";
 import {WebsocketService} from "@/modules/api/websocket/websocket.service";
 import {WsDataService} from "@/modules/api/websocket/ws.data.service";
@@ -40,6 +30,14 @@ import {CatchWsErrors} from "@/modules/app/decorators/catch.ws.errors";
 import {MessagesFromMyRoomGuard} from "@/modules/app/guards/own.message.guard";
 import type {NestGateway} from "@nestjs/websockets/interfaces/nest-gateway.interface";
 import {OwnRoomGuard} from "@/modules/app/guards/own.room.guard";
+import {
+  GetCountryCodeWsOutMessage,
+  PrintMessageWsOutMessage,
+  ShowITypeWsOutMessage,
+  SyncHistoryWsOutMessage
+} from '@/data/shared/ws.out.messages';
+import { SyncHistoryWsInMessage } from '@/data/shared/dto';
+import { GetCountryCodeWsInMessage } from '@/data/shared/ws.in.messages';
 
 @WebSocketGateway({
   path: "/ws",
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 120248f3d..7b83e1332 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -4,7 +4,6 @@ import {
 } from "@nestjs/common";
 import {UserRepository} from "@/modules/shared/database/repository/user.repository";
 import {PasswordService} from "@/modules/shared/password/password.service";
-import type {AddOnlineUserMessage} from "@/data/types/frontend";
 import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
 import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import {SessionService} from "@/modules/shared/session/session.service";
@@ -15,6 +14,7 @@ import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import {transformSetWsId} from "@/data/transformers/out.message/set.ws.id.transformer";
 import {transformAddUserOnline} from '@/data/transformers/out.message/add.online.user.transformer';
 import {getLogoutMessage} from '@/data/transformers/out.message/remove.online.user.transformer';
+import { AddOnlineUserMessage } from '@/data/shared/ws.in.messages';
 
 
 
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index e7f466b25..d557b1bfd 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -2,7 +2,6 @@ import {
   Injectable,
   Logger,
 } from "@nestjs/common";
-import type {GetCountryCodeWsInMessage} from "@/data/types/frontend";
 import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
 import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import type {WebSocketContextData} from "@/data/types/internal";
@@ -10,6 +9,7 @@ import {ConfigService} from "@/modules/shared/config/config.service";
 import {ValidationException} from "@/data/exceptions/validation.exception";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 import {transformUserCountries} from '@/data/transformers/out.message/get.user.contries.transformer';
+import { GetCountryCodeWsInMessage } from '@/data/shared/ws.in.messages';
 
 
 @Injectable()
diff --git a/newback/src/modules/api/websocket/ws.exception.filter.ts b/newback/src/modules/api/websocket/ws.exception.filter.ts
index e1085e1ef..29944e890 100644
--- a/newback/src/modules/api/websocket/ws.exception.filter.ts
+++ b/newback/src/modules/api/websocket/ws.exception.filter.ts
@@ -5,7 +5,7 @@ import type {
 } from "@nestjs/common";
 import {Catch} from "@nestjs/common";
 import type {WebSocket} from "ws";
-import type {GrowlMessage} from "@/data/types/frontend";
+import { GrowlMessage } from '@/data/shared/ws.in.messages';
 
 @Catch(Error) // If we provide it on module Websocket it will also affect http,so fuck it
 // Since we can't decouple this from WebSocketGateway, it should be in this file
diff --git a/newback/src/modules/app/decorators/catch.ws.errors.ts b/newback/src/modules/app/decorators/catch.ws.errors.ts
index 51e9af421..20f832de2 100644
--- a/newback/src/modules/app/decorators/catch.ws.errors.ts
+++ b/newback/src/modules/app/decorators/catch.ws.errors.ts
@@ -1,7 +1,7 @@
 import type {Logger} from "@nestjs/common";
 import {UnauthorizedException} from "@nestjs/common";
-import {WS_SESSION_EXPIRED_CODE} from "@/data/types/frontend";
 import type {OnGatewayConnection} from "@nestjs/websockets";
+import { WS_SESSION_EXPIRED_CODE } from '@/data/shared/consts';
 
 export function processErrors(e, socket, logger: Logger) {
   logger.error(`Ws error ${e.message}`, e.stack, "ws");
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
index 46eb68f4c..9f1c9f331 100644
--- a/newback/src/modules/app/guards/own.message.guard.ts
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -8,7 +8,7 @@ import {
 } from "@nestjs/common";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
-import type {DefaultWsOutMessage} from "@/data/types/frontend";
+import { DefaultWsOutMessage } from '@/data/shared/ws.out.messages';
 
 
 export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
diff --git a/newback/src/modules/app/guards/own.room.guard.ts b/newback/src/modules/app/guards/own.room.guard.ts
index 6e65a9f9f..66455c71b 100644
--- a/newback/src/modules/app/guards/own.room.guard.ts
+++ b/newback/src/modules/app/guards/own.room.guard.ts
@@ -8,8 +8,7 @@ import {
 } from "@nestjs/common";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
-import type {DefaultWsOutMessage} from "@/data/types/frontend";
-
+import { DefaultWsOutMessage } from '@/data/shared/ws.out.messages';
 
 export const OwnRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
   @Injectable()
diff --git a/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
index e97048dd6..e5754cf04 100644
--- a/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
+++ b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
@@ -5,7 +5,7 @@ import {Test} from "@nestjs/testing";
 import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {ConfigModule} from "@/modules/shared/config/config.module";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
-import {MessageStatus} from '@/data/types/frontend';
+import { MessageStatus } from '@/data/model/enums';
 
 describe("MessageRepository", () => {
   let app: TestingModule;
diff --git a/newback/src/modules/shared/database/repository/messages.repository.ts b/newback/src/modules/shared/database/repository/messages.repository.ts
index 4a7dfc415..9a466c262 100644
--- a/newback/src/modules/shared/database/repository/messages.repository.ts
+++ b/newback/src/modules/shared/database/repository/messages.repository.ts
@@ -7,11 +7,11 @@ import type {
 } from "sequelize";
 import {Op} from "sequelize";
 import {MessageModel} from "@/data/model/message.model";
-import {MessageStatus} from "@/data/types/frontend";
 import {ImageModel} from "@/data/model/image.model";
 import {MessageMentionModel} from "@/data/model/message.mention.model";
 import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {CreateModel} from "@/data/types/internal";
+import { MessageStatus } from '@/data/model/enums';
 
 
 @Injectable()
diff --git a/newback/src/modules/shared/database/repository/user.repository.ts b/newback/src/modules/shared/database/repository/user.repository.ts
index a32043446..3b20776a3 100644
--- a/newback/src/modules/shared/database/repository/user.repository.ts
+++ b/newback/src/modules/shared/database/repository/user.repository.ts
@@ -2,11 +2,11 @@ import {Injectable} from "@nestjs/common";
 import {InjectModel} from "@nestjs/sequelize";
 import {UserModel} from "@/data/model/user.model";
 import {UserAuthModel} from "@/data/model/user.auth.model";
-import type {Gender} from "@/data/types/frontend";
 import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
 import type {Transaction} from "sequelize";
 import {Op} from "sequelize";
+import { Gender } from '@/data/model/enums';
 
 
 @Injectable()
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
index 9ba78e8e5..a68332ca5 100644
--- a/newback/src/modules/shared/pubsub/pubsub.service.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.service.ts
@@ -7,7 +7,7 @@ import type {
   PubSubMessage,
   WebSocketContextData
 } from "@/data/types/internal";
-import type {HandlerName} from "@/data/types/frontend";
+import { HandlerName } from '@/data/shared/common';
 
 
 interface HandlerType {
diff --git a/newback/src/modules/shared/ws.adapter/ws.adapter.ts b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
index 847ec8a37..7594ae6a2 100644
--- a/newback/src/modules/shared/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
@@ -23,11 +23,9 @@ import {
   WebSocket,
   WebSocketServer,
 } from "ws";
-import type {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-} from "@/data/types/frontend";
 import {processErrors} from "@/modules/app/decorators/catch.ws.errors";
+import { DefaultWsInMessage } from '@/data/shared/ws.in.messages';
+import { DefaultWsOutMessage } from '@/data/shared/ws.out.messages';
 
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index cb42ac0d1..7e437e341 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -6,7 +6,6 @@ import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {ConfigModule} from "@/modules/shared/config/config.module";
 import {getModelToken} from "@nestjs/sequelize";
 import {Sequelize} from "sequelize-typescript";
-import {Gender} from "@/data/types/frontend";
 import {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 import {UserAuthModel} from "@/data/model/user.auth.model";
 import {UserProfileModel} from "@/data/model/user.profile.model";
@@ -22,6 +21,7 @@ import {SubscriptionMessageModel} from "@/data/model/subscription.message.model"
 import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import {VerificationModel} from "@/data/model/verification.model";
 import {IpAddressModel} from "@/data/model/ip.address.model";
+import { Gender } from '@/data/model/enums';
 
 
 async function bootstrap() {
diff --git a/newback/src/utils/migration.runner.ts b/newback/src/utils/migration.runner.ts
index 9df4a6c7c..2c31d7f69 100644
--- a/newback/src/utils/migration.runner.ts
+++ b/newback/src/utils/migration.runner.ts
@@ -1,9 +1,9 @@
 import {createConnection} from "mysql2";
-import {generateOrmConfig} from "@/utils/helpers";
 import {
   CommandsRunner,
   MysqlDriver,
 } from "node-db-migration";
+import { generateOrmConfig } from '@/utils/generate.orm.config';
 
 const {database, host, password, port, username, define} = generateOrmConfig((sql) => {
   console.log(sql);

From adaad145e81c72a5ecd603a7ddb2c2df1dcb4a99 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Tue, 19 Apr 2022 13:48:40 +0300
Subject: [PATCH 084/221] fix imports

---
 frontend/src/ts/classes/DatabaseWrapper.ts    |  4 ----
 frontend/src/ts/classes/DefaultStore.ts       |  2 +-
 .../AbstractMessageProcessor.ts               | 12 +++++------
 frontend/src/ts/message_handlers/Api.ts       | 16 ++++++++------
 frontend/src/ts/types/converters.ts           |  4 +---
 frontend/src/ts/types/db.ts                   |  2 --
 frontend/src/ts/types/dto.ts                  | 18 +---------------
 .../src/ts/webrtc/AbstractPeerConnection.ts   |  4 ++--
 frontend/src/ts/webrtc/call/CallHandler.ts    | 21 +++++++++----------
 .../src/ts/webrtc/call/CallPeerConnection.ts  | 10 ++++-----
 frontend/src/vue/App.vue                      |  1 -
 frontend/src/vue/chat/chatbox/ChatBox.vue     |  7 +++----
 .../src/vue/chat/textarea/ChatTextArea.vue    |  1 -
 newback/src/data/model/image.model.ts         |  2 +-
 newback/src/data/model/message.model.ts       |  2 +-
 newback/src/data/model/uploaded.file.model.ts |  2 +-
 newback/src/data/model/user.model.ts          |  2 +-
 newback/src/data/model/user.settings.model.ts |  2 +-
 newback/src/data/model/verification.model.ts  |  2 +-
 newback/src/data/shared/common.ts             |  3 ++-
 newback/src/data/shared/dto.ts                |  3 ---
 newback/src/data/{model => shared}/enums.ts   |  0
 newback/src/data/shared/http.ts               |  2 +-
 newback/src/data/shared/ws.in.messages.ts     |  2 +-
 newback/src/data/shared/ws.out.messages.ts    |  2 +-
 .../transformers/model/image.transformer.ts   |  2 +-
 .../out.message/inner.transformer.ts          |  2 +-
 newback/src/modules/api/auth/auth.service.ts  |  2 +-
 .../validators/sign.up.request.validator.ts   |  2 +-
 newback/src/modules/api/file/file.service.ts  |  2 +-
 newback/src/modules/api/file/image.service.ts |  2 +-
 .../modules/api/verify/verify.module.spec.ts  |  2 +-
 .../src/modules/api/verify/verify.service.ts  |  2 +-
 .../modules/api/websocket/message.service.ts  |  2 +-
 .../repository/message.repository.e2e.spec.ts |  2 +-
 .../repository/messages.repository.ts         |  2 +-
 .../database/repository/user.repository.ts    |  2 +-
 newback/src/utils/migration.old.ts            |  2 +-
 38 files changed, 62 insertions(+), 90 deletions(-)
 rename newback/src/data/{model => shared}/enums.ts (100%)

diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 3d408f048..ce57dc226 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -36,10 +36,6 @@ import type {
 } from "@/ts/types/db";
 import type {SetStateFromStorage} from "@/ts/types/dto";
 import type {MainWindow} from "@/ts/classes/MainWindow";
-import type {ImageType} from "@/ts/types/backend";
-import {
-  MessageStatus,
-} from "@/ts/types/backend";
 import {MessageStatusInner} from "@/ts/types/model";
 
 type TransactionCb = (t: SQLTransaction, ...rest: unknown[]) => void;
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index 649b86743..bf6372198 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -80,7 +80,7 @@ import {
   Mutation,
   VuexModule,
 } from "vuex-module-decorators";
-import {Gender} from '@/ts/types/backend';
+
 
 const logger = loggerFactory.getLogger("store");
 
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index d35783f1c..73ae5bab6 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -2,14 +2,12 @@ import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {
-  DefaultWsInMessage,
-  DefaultWsOutMessage
-} from "@/ts/types/backend";
-import type {
+import {DefaultWsOutMessage} from "@/ts/types/shared/ws.out.messages";
+import {DefaultWsInMessage} from "@/ts/types/shared/ws.in.messages";
+import {
   DefaultMessage,
-  HandlerName,
-} from "@/ts/types/backend";
+  HandlerName
+} from "@/ts/types/shared/common";
 
 export default class AbstractMessageProcessor {
   protected readonly callBacks: Record<number, {resolve: Function; reject: Function}> = {};
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 78745c082..6ca975f2e 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -5,7 +5,6 @@ import {
 } from "@/ts/utils/consts";
 import type {
   OauthSessionResponse,
-  OauthStatus,
   OkResponse,
   SaveFileRequest,
   SaveFileResponse,
@@ -14,8 +13,7 @@ import type {
   SignInRequest,
   SignUpRequest,
   ValidateEmailResponse,
-  ViewUserProfileDto,
-} from "@/ts/types/dto";
+} from "@/ts/types/shared/http";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
@@ -25,18 +23,24 @@ import type {
   ConfirmEmailRequest,
   ConfirmEmailResponse,
   GoogleSignInResponse,
-  HandlerType,
-  HandlerTypes,
   SignUpResponse,
   ValidateUserEmailRequest,
   ValidateUserResponse,
   VerifyTokenRequest,
   VerifyTokenResponse,
-} from "@/ts/types/backend";
+} from "@/ts/types/shared/http";
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
 import type Fetch from "@/ts/classes/Fetch";
+import {
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {
+  OauthStatus,
+  ViewUserProfileDto
+} from "@/ts/types/dto";
 
 export default class Api extends MessageHandler {
   protected readonly handlers: HandlerTypes<keyof Api, "*"> = {
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index 530ce216b..0b1f5d840 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -17,17 +17,15 @@ import type {
   MessageModelDto,
   RoomDto,
   RoomNoUsersDto,
-  Gender,
   UserDto,
   UserProfileDtoWoImage,
   UserSettingsDto,
-} from "@/ts/types/dto";
+} from "@/ts/types/shared/dto";
 import type {
   BooleanDB,
   SexDB,
 } from "@/ts/types/db";
 import type {MessageP2pDto} from "@/ts/types/messages/p2pDto";
-import {MessageStatus} from '@/ts/types/backend';
 
 export function currentUserInfoDtoToModel(userInfo: UserProfileDtoWoImage): CurrentUserInfoWoImage {
   return {...userInfo};
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index f64e682b7..b581778f2 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,6 +1,4 @@
 import type {LogLevel} from "lines-logger";
-import type {MessageStatus} from "@/ts/types/backend";
-import {Gender} from '@/ts/types/backend';
 import {MessageStatusInner} from '@/ts/types/model';
 
 export interface UserDB {
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 6f5089d69..0c22d66aa 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -6,26 +6,12 @@ import type {
   RoomDictModel,
   UserModel,
 } from "@/ts/types/model";
-
-export * from '@/ts/types/backend';
-
-import type {LogLevel} from "lines-logger";
-import {
-  Gender,
-  UserProfileDto
-} from '@/ts/types/backend';
-
-
-
-
-
-
+import {UserProfileDto} from "@/ts/types/shared/dto";
 
 export interface ViewUserProfileDto extends UserProfileDto {
   image: string;
 }
 
-
 export interface SetStateFromWS {
   roomsDict: RoomDictModel;
   channelsDict: ChannelsDictModel;
@@ -40,13 +26,11 @@ export interface SetStateFromStorage {
   allUsersDict: Record<number, UserModel>;
 }
 
-
 export interface OauthStatus {
   google: boolean;
   facebook: boolean;
 }
 
-
 export interface WebRtcMessageModelDto extends Omit<MessageStatusModel, "roomId" | "time" | "userId"> {
   timeDiff: number;
 }
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 4583e187a..6f077ec1d 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -6,13 +6,13 @@ import {bytesToSize} from "@/ts/utils/pureFunctions";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {HandlerName} from "@/ts/types/backend";
 import type {
   CheckTransferDestroy,
   ConnectToRemoteMessage,
 } from "@/ts/types/messages/innerMessages";
-import type {SendRtcDataMessage} from "@/ts/types/backend";
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
+import {HandlerName} from "@/ts/types/shared/common";
+import {SendRtcDataMessage} from "@/ts/types/shared/ws.in.messages";
 
 
 export default abstract class AbstractPeerConnection extends MessageHandler {
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 8a63d4078..d9b5dc35b 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -31,17 +31,6 @@ import {
 } from "@/ts/utils/audioprocc";
 import CallSenderPeerConnection from "@/ts/webrtc/call/CallSenderPeerConnection";
 import CallReceiverPeerConnection from "@/ts/webrtc/call/CallReceiverPeerConnection";
-import type {
-  CallStatus,
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
-
-import type {
-  AcceptCallMessage,
-  OfferCall,
-  ReplyCallMessage,
-} from "@/ts/types/backend";
 import type {
   ChangeStreamMessage,
   CheckTransferDestroy,
@@ -51,6 +40,16 @@ import type {
 } from "@/ts/types/messages/innerMessages";
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 import {stopVideo} from "@/ts/utils/htmlApi";
+import {
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {CallStatus} from "@/ts/types/shared/dto";
+import {
+  AcceptCallMessage,
+  OfferCall,
+  ReplyCallMessage
+} from "@/ts/types/shared/ws.in.messages";
 
 
 export default class CallHandler extends FileAndCallTransfer {
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 60be25e0b..2c7b40cab 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -17,11 +17,6 @@ import type {
   ConnectToRemoteMessage,
   DestroyPeerConnectionMessage,
 } from "@/ts/types/messages/innerMessages";
-import type {DestroyCallConnection} from "@/ts/types/backend";
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
 import {
   getStreamLog,
   getTrackLog,
@@ -32,6 +27,11 @@ import type {
 } from "@/ts/types/model";
 import {stopVideo} from "@/ts/utils/htmlApi";
 import type Subscription from "@/ts/classes/Subscription";
+import {
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {DestroyCallConnection} from "@/ts/types/shared/ws.in.messages";
 
 export default abstract class CallPeerConnection extends AbstractPeerConnection {
   protected readonly handlers: HandlerTypes<keyof CallPeerConnection, "peerConnection:*"> = {
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index d9dcf8633..44285fd92 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -14,7 +14,6 @@ import {
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import Growls from "@/vue/parts/Growls.vue";
-import {Theme} from '@/ts/types/backend';
 
 @Component({
   name: "App",
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 3d6021384..724224fb4 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -121,11 +121,10 @@ import ChatTextArea from "@/vue/chat/textarea/ChatTextArea.vue";
 import ChatShowUserTyping from "@/vue/chat/chatbox/ChatShowUserTyping.vue";
 import {isMobile} from "@/ts/utils/runtimeConsts";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
-import type {
+import {
   HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
-import {MessageStatus} from "@/ts/types/backend";
+  HandlerTypes
+} from "@/ts/types/shared/common";
 
 
 @Component({
diff --git a/frontend/src/vue/chat/textarea/ChatTextArea.vue b/frontend/src/vue/chat/textarea/ChatTextArea.vue
index 5dc77ebfb..2d9054f95 100644
--- a/frontend/src/vue/chat/textarea/ChatTextArea.vue
+++ b/frontend/src/vue/chat/textarea/ChatTextArea.vue
@@ -116,7 +116,6 @@ import ChatTagging from "@/vue/chat/textarea/ChatTagging.vue";
 import {Throttle} from "@/ts/classes/Throttle";
 import GiphySearch from "@/vue/chat/textarea/GiphySearch.vue";
 import type {GIFObject} from "giphy-api";
-import {ImageType} from "@/ts/types/backend";
 
 const timePattern = /^\(\d\d:\d\d:\d\d\)\s\w+:.*&gt;&gt;&gt;\s/;
 
diff --git a/newback/src/data/model/image.model.ts b/newback/src/data/model/image.model.ts
index 8c71a60c7..ccbaa34aa 100644
--- a/newback/src/data/model/image.model.ts
+++ b/newback/src/data/model/image.model.ts
@@ -9,7 +9,7 @@ import {
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
 import {MessageModel} from "@/data/model/message.model";
-import { ImageType } from '@/data/model/enums';
+import { ImageType } from '@/data/shared/enums';
 
 const uniqueUserIdSymbMess = "unique_image_symbol_message";
 
diff --git a/newback/src/data/model/message.model.ts b/newback/src/data/model/message.model.ts
index b27653560..420fc58a6 100644
--- a/newback/src/data/model/message.model.ts
+++ b/newback/src/data/model/message.model.ts
@@ -9,7 +9,7 @@ import {
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 import {RoomModel} from "@/data/model/room.model";
-import { MessageStatus } from '@/data/model/enums';
+import { MessageStatus } from '@/data/shared/enums';
 
 @Injectable()
 @Table({tableName: "message"})
diff --git a/newback/src/data/model/uploaded.file.model.ts b/newback/src/data/model/uploaded.file.model.ts
index faa27d59b..06c5d4e52 100644
--- a/newback/src/data/model/uploaded.file.model.ts
+++ b/newback/src/data/model/uploaded.file.model.ts
@@ -8,7 +8,7 @@ import {
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
-import { ImageType } from '@/data/model/enums';
+import { ImageType } from '@/data/shared/enums';
 
 @Injectable()
 @Table({tableName: "uploaded_file"})
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index b64cb4792..d3eea72d1 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -10,7 +10,7 @@ import {UserAuthModel} from "@/data/model/user.auth.model";
 import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
 import {MAX_USERNAME_LENGTH} from '@/data/consts';
-import { Gender } from '@/data/model/enums';
+import { Gender } from '@/data/shared/enums';
 
 
 @Injectable()
diff --git a/newback/src/data/model/user.settings.model.ts b/newback/src/data/model/user.settings.model.ts
index 5fa8bfae9..6a031450d 100644
--- a/newback/src/data/model/user.settings.model.ts
+++ b/newback/src/data/model/user.settings.model.ts
@@ -13,7 +13,7 @@ import {
   logLevels,
 } from "lines-logger";
 import {MysqlBool} from "@/data/types/internal";
-import { Theme } from '@/data/model/enums';
+import { Theme } from '@/data/shared/enums';
 
 @Injectable()
 @Table({tableName: "user_settings"})
diff --git a/newback/src/data/model/verification.model.ts b/newback/src/data/model/verification.model.ts
index f2e5f70b4..e3ba9235f 100644
--- a/newback/src/data/model/verification.model.ts
+++ b/newback/src/data/model/verification.model.ts
@@ -9,7 +9,7 @@ import {
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 import {MysqlBool} from "@/data/types/internal";
-import { VerificationType } from '@/data/model/enums';
+import { VerificationType } from '@/data/shared/enums';
 
 @Injectable()
 @Table({tableName: "verification"})
diff --git a/newback/src/data/shared/common.ts b/newback/src/data/shared/common.ts
index 3443dacdd..4e7bec685 100644
--- a/newback/src/data/shared/common.ts
+++ b/newback/src/data/shared/common.ts
@@ -1,4 +1,5 @@
-import { DefaultInMessage } from '@/data/shared/ws.in.messages';
+import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
+
 
 export interface DefaultMessage<A extends string> {
   action: A;
diff --git a/newback/src/data/shared/dto.ts b/newback/src/data/shared/dto.ts
index 8b7c8c7d8..82b9a6148 100644
--- a/newback/src/data/shared/dto.ts
+++ b/newback/src/data/shared/dto.ts
@@ -1,6 +1,3 @@
-import { Gender, ImageType, MessageStatus } from '@/data/model/enums';
-import { DefaultInMessage } from '@/data/shared/ws.in.messages';
-import { HandlerName, HandlerType } from '@/data/shared/common';
 
 
 export declare type LogLevel =
diff --git a/newback/src/data/model/enums.ts b/newback/src/data/shared/enums.ts
similarity index 100%
rename from newback/src/data/model/enums.ts
rename to newback/src/data/shared/enums.ts
diff --git a/newback/src/data/shared/http.ts b/newback/src/data/shared/http.ts
index cd3b34d09..1ac5e11b8 100644
--- a/newback/src/data/shared/http.ts
+++ b/newback/src/data/shared/http.ts
@@ -1,4 +1,4 @@
-import { Gender, ImageType } from '@/data/model/enums';
+import { Gender, ImageType } from '@/data/shared/enums';
 
 
 interface TypeGeneratorForOauth1 extends SessionResponse {
diff --git a/newback/src/data/shared/ws.in.messages.ts b/newback/src/data/shared/ws.in.messages.ts
index d13972854..60f70e041 100644
--- a/newback/src/data/shared/ws.in.messages.ts
+++ b/newback/src/data/shared/ws.in.messages.ts
@@ -21,7 +21,7 @@ import {
   WebRtcDefaultMessage
 } from '@/data/shared/dto';
 import { DefaultMessage, HandlerName } from '@/data/shared/common';
-import { MessageStatus } from '@/data/model/enums';
+import { MessageStatus } from '@/data/shared/enums';
 
 
 export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
diff --git a/newback/src/data/shared/ws.out.messages.ts b/newback/src/data/shared/ws.out.messages.ts
index 426b45838..6b438bc99 100644
--- a/newback/src/data/shared/ws.out.messages.ts
+++ b/newback/src/data/shared/ws.out.messages.ts
@@ -1,5 +1,5 @@
 import { DefaultMessage } from '@/data/shared/common';
-import { MessageStatus } from '@/data/model/enums';
+import { MessageStatus } from '@/data/shared/enums';
 import { GiphyDto } from '@/data/shared/dto';
 
 
diff --git a/newback/src/data/transformers/model/image.transformer.ts b/newback/src/data/transformers/model/image.transformer.ts
index d0994ed2f..f230bebf4 100644
--- a/newback/src/data/transformers/model/image.transformer.ts
+++ b/newback/src/data/transformers/model/image.transformer.ts
@@ -2,7 +2,7 @@ import type {ImageModel} from "@/data/model/image.model";
 import type {MessageModel} from "@/data/model/message.model";
 import type {PureModel,} from "@/data/types/internal";
 import { FileModelDto } from '@/data/shared/dto';
-import { ImageType } from '@/data/model/enums';
+import { ImageType } from '@/data/shared/enums';
 
 export function getUrl(value: PureModel<ImageModel>, attribute: "img" | "preview") {
   return value.type === ImageType.GIPHY ? value.img : `/photo/${value[attribute]}`;
diff --git a/newback/src/data/transformers/out.message/inner.transformer.ts b/newback/src/data/transformers/out.message/inner.transformer.ts
index 42f671b54..e719b8365 100644
--- a/newback/src/data/transformers/out.message/inner.transformer.ts
+++ b/newback/src/data/transformers/out.message/inner.transformer.ts
@@ -3,7 +3,7 @@ import type {ImageModel} from "@/data/model/image.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {CreateModel} from "@/data/types/internal";
 import { GiphyDto } from '@/data/shared/dto';
-import { ImageType } from '@/data/model/enums';
+import { ImageType } from '@/data/shared/enums';
 import { PrintMessageWsOutMessage } from '@/data/shared/ws.out.messages';
 
 
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 467c886f2..786ad5c44 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -29,7 +29,7 @@ import {
   SignUpRequest,
   SignUpResponse
 } from '@/data/shared/http';
-import { Gender, VerificationType } from '@/data/model/enums';
+import { Gender, VerificationType } from '@/data/shared/enums';
 
 @Injectable()
 export class AuthService {
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index 2f793fafc..487e5ded2 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -8,7 +8,7 @@ import {
 } from "class-validator";
 import {MAX_USERNAME_LENGTH} from '@/data/consts';
 import { SignUpRequest } from '@/data/shared/http';
-import { Gender } from '@/data/model/enums';
+import { Gender } from '@/data/shared/enums';
 
 
 export class SignUpRequestValidator implements SignUpRequest {
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index 2924d32f8..ef36183e8 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -7,7 +7,7 @@ import {MessageRepository} from "@/modules/shared/database/repository/messages.r
 import type {FileSaveResponse} from "@/data/types/internal";
 import {Sequelize} from "sequelize-typescript";
 import {ImageService} from "@/modules/api/file/image.service";
-import { ImageType } from '@/data/model/enums';
+import { ImageType } from '@/data/shared/enums';
 import { SaveFileResponse } from '@/data/shared/http';
 
 @Injectable()
diff --git a/newback/src/modules/api/file/image.service.ts b/newback/src/modules/api/file/image.service.ts
index b8951fa63..1047ffe81 100644
--- a/newback/src/modules/api/file/image.service.ts
+++ b/newback/src/modules/api/file/image.service.ts
@@ -12,7 +12,7 @@ import {
   writeFile,
 } from "fs/promises";
 import type {FileSaveResponse} from "@/data/types/internal";
-import { ImageType } from '@/data/model/enums';
+import { ImageType } from '@/data/shared/enums';
 
 @Injectable()
 export class ImageService {
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index d7874413c..2bfa3199f 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -27,7 +27,7 @@ import {VerificationRepository} from "@/modules/shared/database/repository/verif
 import {VerifyController} from "@/modules/api/verify/verify.controller";
 import {VerifyService} from "@/modules/api/verify/verify.service";
 import {SessionService} from "@/modules/shared/session/session.service";
-import { VerificationType } from '@/data/model/enums';
+import { VerificationType } from '@/data/shared/enums';
 
 describe("VerifyModule", () => {
   let app: INestApplication;
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index a81531df6..e636c3beb 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -17,7 +17,7 @@ import {
   SendRestorePasswordRequest,
   VerifyTokenResponse
 } from '@/data/shared/http';
-import { VerificationType } from '@/data/model/enums';
+import { VerificationType } from '@/data/shared/enums';
 
 @Injectable()
 export class VerifyService {
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 98709798f..8a54755ae 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -25,7 +25,7 @@ import {
   ShowITypeWsOutMessage,
   SyncHistoryWsOutMessage
 } from '@/data/shared/ws.out.messages';
-import { MessageStatus } from '@/data/model/enums';
+import { MessageStatus } from '@/data/shared/enums';
 import { ShowITypeWsInMessage } from '@/data/shared/ws.in.messages';
 
 @Injectable()
diff --git a/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
index e5754cf04..665642cf3 100644
--- a/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
+++ b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
@@ -5,7 +5,7 @@ import {Test} from "@nestjs/testing";
 import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {ConfigModule} from "@/modules/shared/config/config.module";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
-import { MessageStatus } from '@/data/model/enums';
+import { MessageStatus } from '@/data/shared/enums';
 
 describe("MessageRepository", () => {
   let app: TestingModule;
diff --git a/newback/src/modules/shared/database/repository/messages.repository.ts b/newback/src/modules/shared/database/repository/messages.repository.ts
index 9a466c262..5384f3c5b 100644
--- a/newback/src/modules/shared/database/repository/messages.repository.ts
+++ b/newback/src/modules/shared/database/repository/messages.repository.ts
@@ -11,7 +11,7 @@ import {ImageModel} from "@/data/model/image.model";
 import {MessageMentionModel} from "@/data/model/message.mention.model";
 import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {CreateModel} from "@/data/types/internal";
-import { MessageStatus } from '@/data/model/enums';
+import { MessageStatus } from '@/data/shared/enums';
 
 
 @Injectable()
diff --git a/newback/src/modules/shared/database/repository/user.repository.ts b/newback/src/modules/shared/database/repository/user.repository.ts
index 3b20776a3..7b9d67342 100644
--- a/newback/src/modules/shared/database/repository/user.repository.ts
+++ b/newback/src/modules/shared/database/repository/user.repository.ts
@@ -6,7 +6,7 @@ import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
 import type {Transaction} from "sequelize";
 import {Op} from "sequelize";
-import { Gender } from '@/data/model/enums';
+import { Gender } from '@/data/shared/enums';
 
 
 @Injectable()
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index 7e437e341..32af5bbe1 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -21,7 +21,7 @@ import {SubscriptionMessageModel} from "@/data/model/subscription.message.model"
 import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import {VerificationModel} from "@/data/model/verification.model";
 import {IpAddressModel} from "@/data/model/ip.address.model";
-import { Gender } from '@/data/model/enums';
+import { Gender } from '@/data/shared/enums';
 
 
 async function bootstrap() {

From 9a5638013a84fdc3ecb4799e47815afe98d0e260 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Tue, 19 Apr 2022 17:33:43 +0300
Subject: [PATCH 085/221] Fixed types

---
 frontend/src/ts/classes/Fetch.ts              |  1 -
 .../src/ts/classes/NotificationHandler.ts     |  8 +++----
 .../src/ts/message_handlers/MesageHandler.ts  | 10 ++++----
 .../src/ts/message_handlers/RomHandler.ts     | 17 +++++++------
 .../src/ts/types/messages/innerMessages.ts    | 12 ++++------
 frontend/src/ts/types/messages/p2pMessages.ts | 14 ++++++-----
 frontend/src/ts/types/model.ts                |  8 +++----
 frontend/src/ts/types/types.ts                |  3 +--
 frontend/src/ts/utils/htmlApi.ts              |  2 +-
 frontend/src/ts/utils/pureFunctions.ts        |  2 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           | 24 +++++++++----------
 frontend/src/ts/webrtc/file/FileHandler.ts    | 10 ++++----
 .../file/FileReceiveerPeerConnection.ts       | 14 +++++------
 .../webrtc/file/FileSenderPeerConnection.ts   | 14 +++++------
 .../webrtc/message/MessagePeerConnection.ts   | 10 ++++----
 .../webrtc/message/MessageTransferHandler.ts  |  5 ++--
 frontend/src/vue/auth/SocialAuthSignUp.vue    |  2 +-
 frontend/src/vue/chat/right/RoomRightIcon.vue |  3 ++-
 frontend/src/vue/pages/UserProfileInfo.vue    |  6 ++---
 .../src/vue/pages/UserProfileSettings.vue     |  4 ++--
 newback/src/data/shared/dto.ts                | 10 ++++++++
 newback/src/data/shared/http.ts               |  5 +++-
 22 files changed, 98 insertions(+), 86 deletions(-)

diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index e2b8ab323..c551f9cbe 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -9,7 +9,6 @@ import {
   SetMessageProgress,
   UploadData
 } from "@/ts/types/types";
-import {SaveFileRequest} from "@/ts/types/backend";
 
 export default class Fetch {
   protected httpLogger: Logger;
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index bf923851a..f50fa6f12 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -10,14 +10,14 @@ import {
   SERVICE_WORKER_URL,
   SERVICE_WORKER_VERSION_LS_NAME,
 } from "@/ts/utils/consts";
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {MainWindow} from "@/ts/classes/MainWindow";
 import type Subscription from "@/ts/classes/Subscription";
+import {
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
 
 
 export default class NotifierHandler extends MessageHandler {
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index c9f2186ba..b86ad76ad 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,11 +1,11 @@
 import type {Logger} from "lines-logger";
-import type {
-  DefaultInMessage,
+import {IMessageHandler} from "@/ts/types/shared/dto";
+import {
   HandlerName,
   HandlerType,
-  HandlerTypes,
-  IMessageHandler,
-} from "@/ts/types/backend";
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
 
 
 export default abstract class MessageHandler implements IMessageHandler {
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index d08c1887a..0794d8be8 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -3,12 +3,6 @@ import type {
   RoomLogEntry,
   SetRoomsUsers,
 } from "@/ts/types/types";
-import type {
-  AddRoomBase,
-  ChangeDeviceType,
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
 import type {
   ChangeP2pRoomInfoMessage,
   ChangeUserOnlineInfoMessage,
@@ -32,10 +26,11 @@ import {
   getRoomsBaseDict,
 } from "@/ts/types/converters";
 import type {
+  AddRoomBase,
+  ChangeDeviceType,
   ChannelDto,
   RoomDto,
-  SetStateFromWS,
-} from "@/ts/types/dto";
+} from "@/ts/types/shared/dto";
 import type {
   AddChannelMessage,
   AddInviteMessage,
@@ -63,6 +58,11 @@ import {
   logout,
 } from "@/ts/utils/audio";
 import type Subscription from "@/ts/classes/Subscription";
+import {
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {SetStateFromWS} from "@/ts/types/dto";
 
 export class RoomHandler extends MessageHandler {
   protected readonly logger: Logger;
@@ -142,7 +142,6 @@ export class RoomHandler extends MessageHandler {
   }
 
   public addChannel(message: AddChannelMessage) {
-    // @ts-expect-error
     this.mutateRoomAddition(message, "room_created");
   }
 
diff --git a/frontend/src/ts/types/messages/innerMessages.ts b/frontend/src/ts/types/messages/innerMessages.ts
index c863ecb6d..8a9fabb49 100644
--- a/frontend/src/ts/types/messages/innerMessages.ts
+++ b/frontend/src/ts/types/messages/innerMessages.ts
@@ -4,17 +4,15 @@
  * This excludes messages that comes deserialized from websocket or any other network
  */
 import type {
+  ChangeDeviceType,
+  ChangeOnlineType,
   ChannelDto,
   RoomDto,
   UserDto,
-} from "@/ts/types/dto";
-import type {
-  ChangeDeviceType,
-  ChangeOnlineType,
-  DefaultInMessage,
-  HandlerName,
-} from "@/ts/types/backend";
+} from "@/ts/types/shared/dto";
 import type {MessageStatusModel} from "@/ts/types/model";
+import {HandlerName} from "@/ts/types/shared/common";
+import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
 
 
 export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H> {
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index efcd36a53..1ddf5021a 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -3,16 +3,18 @@
  * So if we create a structure on one PC (on frontend) and handle on another (on frontend as well)
  * this file should do it
  */
-import type {
-  CallBackMessage,
-  DefaultMessage,
-  ResolveCallbackId,
-} from "@/ts/types/backend";
+
 import type {
   MessageP2pDto,
   MessagesInfo,
 } from "@/ts/types/messages/p2pDto";
-import type {MessageStatus} from "@/ts/types/backend";
+import {DefaultMessage} from "@/ts/types/shared/common";
+import {
+  CallBackMessage,
+  ResolveCallbackId
+} from "@/ts/types/shared/dto";
+import {MessageStatus} from "@/ts/types/shared/enums";
+
 
 
 export type P2PHandlerType<A extends string> = (a: DefaultP2pMessage<A>) => Promise<void> | void;
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 767fbfeb1..5a159650d 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,9 +1,9 @@
 import type {LogLevel} from "lines-logger";
-import type {
-  ImageType,
+import {
   Gender,
-  MessageStatus,
-} from "@/ts/types/backend";
+  ImageType,
+  MessageStatus
+} from "@/ts/types/shared/enums";
 
 export enum GrowlType {
   SUCCESS = "col-success", INFO = "col-info", ERROR = "col-error",
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 7481991cb..642d93f00 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -14,14 +14,13 @@ import type {
   UserModel,
 } from "@/ts/types/model";
 import type {
-  SaveFileResponse,
   SetStateFromStorage,
 } from "@/ts/types/dto";
 import {
   MessageStatusInner,
   MessageStatusModel
 } from '@/ts/types/model';
-import {ImageType} from '@/ts/types/dto';
+import {SaveFileResponse} from "@/ts/types/shared/http";
 
 export type ValueFilterForKey<T extends object, U> = {
   [K in keyof T]: U extends T[K] ? K : never;
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index cc5206523..993c453c1 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -25,7 +25,7 @@ import {
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GIFObject} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
-import {ImageType} from "@/ts/types/backend";
+import {ImageType} from "@/ts/types/shared/enums";
 
 const tmpCanvasContext: CanvasRenderingContext2D = document.createElement("canvas").getContext("2d")!; // TODO why is it not safe?
 const yotubeTimeRegex = /(?:(\d*)h)?(?:(\d*)m)?(?:(\d*)s)?(\d)?/;
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index 168d7c61c..08d3dcd51 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -5,8 +5,8 @@ import type {
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {MessageSender} from "@/ts/types/types";
 import {ALLOW_EDIT_MESSAGE_IF_UPDATE_HAPPENED_MS_AGO} from "@/ts/utils/consts";
-import {MessageStatus} from '@/ts/types/backend';
 import {MessageStatusInner} from '@/ts/types/model';
+import {MessageStatus} from "@/ts/types/shared/enums";
 
 export function bytesToSize(bytes: number): string {
   const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index c0049ea79..6176fc9eb 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -19,18 +19,6 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {browserVersion} from "@/ts/utils/runtimeConsts";
 import MessageTransferHandler from "@/ts/webrtc/message/MessageTransferHandler";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
-import type {
-  NotifyCallActiveMessage,
-  OfferCall,
-  OfferFile,
-  OfferMessage,
-  WebRtcSetConnectionIdMessage,
-} from "@/ts/types/backend";
-import type {
-  HandlerName,
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
 import type {VideoType} from "@/ts/types/types";
 import type {
   ChangeP2pRoomInfoMessage,
@@ -40,6 +28,18 @@ import type {
 } from "@/ts/types/messages/innerMessages";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import type {MessageSenderProxy} from "@/ts/message_handlers/MessageSenderProxy";
+import {
+  HandlerName,
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {
+  NotifyCallActiveMessage,
+  OfferCall,
+  OfferFile,
+  OfferMessage,
+  WebRtcSetConnectionIdMessage
+} from "@/ts/types/shared/ws.in.messages";
 
 export default class WebRtcApi extends MessageHandler {
   protected logger: Logger;
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 24f3e26c2..8cdf088f9 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -4,12 +4,12 @@ import type WsHandler from "@/ts/message_handlers/WsHandler";
 import FileSenderPeerConnection from "@/ts/webrtc/file/FileSenderPeerConnection";
 import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
-import type {ReplyFileMessage} from "@/ts/types/backend";
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
+import {
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {ReplyFileMessage} from "@/ts/types/shared/ws.in.messages";
 
 
 export default class FileHandler extends FileAndCallTransfer {
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index bb9a149e5..687c8d48d 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -13,15 +13,15 @@ import {
 } from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {
+import type Subscription from "@/ts/classes/Subscription";
+import {
   HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
-import type {
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {
   DestroyFileConnectionMessage,
-  RetryFileMessage,
-} from "@/ts/types/backend";
-import type Subscription from "@/ts/classes/Subscription";
+  RetryFileMessage
+} from "@/ts/types/shared/ws.in.messages";
 
 export default class FileReceiverPeerConnection extends FilePeerConnection {
   protected readonly handlers: HandlerTypes<keyof FileReceiverPeerConnection, "peerConnection:*"> = {
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 569ff4795..8820d31f2 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -16,15 +16,15 @@ import {
 } from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {
+import type Subscription from "@/ts/classes/Subscription";
+import {
   HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
-import type {
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {
   AcceptFileMessage,
-  DestroyFileConnectionMessage,
-} from "@/ts/types/backend";
-import type Subscription from "@/ts/classes/Subscription";
+  DestroyFileConnectionMessage
+} from "@/ts/types/shared/ws.in.messages";
 
 export default class FileSenderPeerConnection extends FilePeerConnection {
   protected readonly handlers: HandlerTypes<keyof FileSenderPeerConnection, "peerConnection:*"> = {
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 915d742f5..3a941e891 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -4,11 +4,6 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {MessageSupplier} from "@/ts/types/types";
 import {P2PMessageProcessor} from "@/ts/message_handlers/P2PMessageProcessor";
 
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
-import {MessageStatus} from '@/ts/types/backend';
 import type {
   ConfirmReceivedP2pMessage,
   ConfirmSetMessageStatusRequest,
@@ -42,6 +37,11 @@ import type {
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Subscription from "@/ts/classes/Subscription";
+import {
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {MessageStatus} from "@/ts/types/shared/enums";
 
 export default abstract class MessagePeerConnection extends AbstractPeerConnection implements MessageSupplier {
   connectedToRemote: boolean = true;
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 38670690f..e12a0cecf 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -14,9 +14,10 @@ import type {
   SendSetMessagesStatusMessage,
   SyncP2PMessage,
 } from "@/ts/types/messages/innerMessages";
-import type {HandlerTypes} from "@/ts/types/backend";
-import {MessageStatus} from '@/ts/types/backend';
+
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
+import {HandlerTypes} from "@/ts/types/shared/common";
+import {MessageStatus} from "@/ts/types/shared/enums";
 
 /**
  *
diff --git a/frontend/src/vue/auth/SocialAuthSignUp.vue b/frontend/src/vue/auth/SocialAuthSignUp.vue
index 9d1cab4c4..9f38f685d 100644
--- a/frontend/src/vue/auth/SocialAuthSignUp.vue
+++ b/frontend/src/vue/auth/SocialAuthSignUp.vue
@@ -17,7 +17,7 @@ import {
   FACEBOOK_APP_ID,
   GOOGLE_OAUTH_2_CLIENT_ID,
 } from "@/ts/utils/consts";
-import type {OauthSessionResponse} from "@/ts/types/dto";
+import {OauthSessionResponse} from "@/ts/types/shared/http";
 
 @Component({
   name: "SocialAuthSignUp",
diff --git a/frontend/src/vue/chat/right/RoomRightIcon.vue b/frontend/src/vue/chat/right/RoomRightIcon.vue
index be38c7250..56d145d78 100644
--- a/frontend/src/vue/chat/right/RoomRightIcon.vue
+++ b/frontend/src/vue/chat/right/RoomRightIcon.vue
@@ -33,7 +33,8 @@ import {
 } from "vue-property-decorator";
 import type {MessageModel} from "@/ts/types/model";
 import {RoomModel} from "@/ts/types/model";
-import {MessageStatus} from '@/ts/types/backend';
+import {MessageStatus} from "@/ts/types/shared/enums";
+
 
 @Component({name: "RoomRightIcon"})
 export default class RoomRightIcon extends Vue {
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index b34d14c3c..cc0a880a6 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -122,13 +122,13 @@ import {
 } from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {CurrentUserInfoModel} from "@/ts/types/model";
-import type {UserProfileDtoWoImage} from "@/ts/types/dto";
 
 import {currentUserInfoModelToDto} from "@/ts/types/converters";
 import AppInputDate from "@/vue/ui/AppInputDate.vue";
-import type {SetUserProfileMessage} from "@/ts/types/backend";
 import type {LogoutMessage} from "@/ts/types/messages/innerMessages";
-import {Gender} from '@/ts/types/backend';
+import {Gender} from "@/ts/types/shared/enums";
+import {UserProfileDtoWoImage} from "@/ts/types/shared/dto";
+import {SetUserProfileMessage} from "@/ts/types/shared/ws.in.messages";
 
 @Component({
   name: "UserProfileInfo",
diff --git a/frontend/src/vue/pages/UserProfileSettings.vue b/frontend/src/vue/pages/UserProfileSettings.vue
index 395f799f2..e3b020165 100644
--- a/frontend/src/vue/pages/UserProfileSettings.vue
+++ b/frontend/src/vue/pages/UserProfileSettings.vue
@@ -127,8 +127,6 @@ import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {userSettingsDtoToModel} from "@/ts/types/converters";
-import type {UserSettingsDto} from "@/ts/types/dto";
-import type {SetSettingsMessage} from "@/ts/types/backend";
 import type {LogLevel} from "lines-logger";
 import {logLevels} from "lines-logger";
 import {
@@ -139,6 +137,8 @@ import {
   addToHomeScreen,
   canBeInstalled,
 } from "@/ts/utils/addToHomeScreen";
+import {UserSettingsDto} from "@/ts/types/shared/dto";
+import {SetSettingsMessage} from "@/ts/types/shared/ws.in.messages";
 
 @Component({
   name: "UserProfileSettings",
diff --git a/newback/src/data/shared/dto.ts b/newback/src/data/shared/dto.ts
index 82b9a6148..4356767a9 100644
--- a/newback/src/data/shared/dto.ts
+++ b/newback/src/data/shared/dto.ts
@@ -1,3 +1,13 @@
+import {
+  Gender,
+  ImageType,
+  MessageStatus
+} from "@/ts/types/shared/enums";
+import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
+import {
+  HandlerName,
+  HandlerType
+} from "@/ts/types/shared/common";
 
 
 export declare type LogLevel =
diff --git a/newback/src/data/shared/http.ts b/newback/src/data/shared/http.ts
index 1ac5e11b8..f98ab228c 100644
--- a/newback/src/data/shared/http.ts
+++ b/newback/src/data/shared/http.ts
@@ -1,4 +1,7 @@
-import { Gender, ImageType } from '@/data/shared/enums';
+import {
+  Gender,
+  ImageType
+} from "@/ts/types/shared/enums";
 
 
 interface TypeGeneratorForOauth1 extends SessionResponse {

From 8e52723a232933f8a3678893af422c48f182ef41 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 19 Apr 2022 20:52:07 +0300
Subject: [PATCH 086/221] push

---
 .../src/ts/message_handlers/WsMessageHandler.ts  |  4 +---
 frontend/src/vue/App.vue                         | 11 ++++++-----
 frontend/src/vue/chat/chatbox/ChatBox.vue        |  1 +
 newback/src/data/shared/ws.in.messages.ts        | 16 +++++++++-------
 newback/src/data/shared/ws.out.messages.ts       |  6 +++---
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index c5c8051fc..cdc3df3a9 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -20,9 +20,7 @@ import type {Logger} from "lines-logger";
 import type {
   GiphyDto,
   MessageModelDto,
-  SaveFileRequest,
-  SaveFileResponse,
-} from "@/ts/types/dto";
+} from "@/ts/types/shared/dto";
 
 import type {
   DeleteMessage,
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index 44285fd92..ec2f191e9 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -14,6 +14,7 @@ import {
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import Growls from "@/vue/parts/Growls.vue";
+import {Theme} from "@/ts/types/shared/enums";
 
 @Component({
   name: "App",
@@ -29,11 +30,11 @@ export default class App extends Vue {
 
   @Watch("mainClass")
   public onMainClassChange(value: string) {
-    document.body.parentElement!.className  = {
-      [Theme.COLOR_LOR]: 'color-lor',
-      [Theme.COLOR_REG]: 'color-reg',
-      [Theme.COLOR_WHITE]: 'color-white',
-    }[value] as string
+    document.body.parentElement!.className = {
+      [Theme.COLOR_LOR]: "color-lor",
+      [Theme.COLOR_REG]: "color-reg",
+      [Theme.COLOR_WHITE]: "color-white",
+    }[value]!;
   }
 }
 </script>
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 724224fb4..87f311507 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -125,6 +125,7 @@ import {
   HandlerType,
   HandlerTypes
 } from "@/ts/types/shared/common";
+import {MessageStatus} from "@/ts/types/shared/enums";
 
 
 @Component({
diff --git a/newback/src/data/shared/ws.in.messages.ts b/newback/src/data/shared/ws.in.messages.ts
index 60f70e041..d2b10787c 100644
--- a/newback/src/data/shared/ws.in.messages.ts
+++ b/newback/src/data/shared/ws.in.messages.ts
@@ -1,11 +1,10 @@
-import {
+import type {
   AcceptFileContent,
   AddRoomBase,
   BrowserBase,
   CallBackMessage,
   ChangeUserOnlineBase,
-  ChannelDto,
-  GiphyDto, LocationDto,
+  ChannelDto, LocationDto,
   MessageModelDto,
   NewRoom,
   OfferFileContent,
@@ -18,10 +17,13 @@ import {
   UserProfileDto,
   UserProfileDtoWoImage,
   UserSettingsDto,
-  WebRtcDefaultMessage
-} from '@/data/shared/dto';
-import { DefaultMessage, HandlerName } from '@/data/shared/common';
-import { MessageStatus } from '@/data/shared/enums';
+  WebRtcDefaultMessage,
+} from "@/ts/types/shared/dto";
+import {
+  GiphyDto,
+} from "@/ts/types/shared/dto";
+import type {DefaultMessage, HandlerName} from "@/ts/types/shared/common";
+import type {MessageStatus} from "@/ts/types/shared/enums";
 
 
 export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
diff --git a/newback/src/data/shared/ws.out.messages.ts b/newback/src/data/shared/ws.out.messages.ts
index 6b438bc99..2ba772ee1 100644
--- a/newback/src/data/shared/ws.out.messages.ts
+++ b/newback/src/data/shared/ws.out.messages.ts
@@ -1,6 +1,6 @@
-import { DefaultMessage } from '@/data/shared/common';
-import { MessageStatus } from '@/data/shared/enums';
-import { GiphyDto } from '@/data/shared/dto';
+import type {DefaultMessage} from "@/ts/types/shared/common";
+import type {MessageStatus} from "@/ts/types/shared/enums";
+import type {GiphyDto} from "@/ts/types/shared/dto";
 
 
 export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {

From ef5aeca2286490ba28bc1c3ce383932a4f344a17 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Wed, 20 Apr 2022 15:32:36 +0300
Subject: [PATCH 087/221] Fixed types

---
 frontend/package.json                         |  3 --
 frontend/src/ts/classes/DefaultStore.ts       |  5 ++-
 frontend/src/ts/message_handlers/WsHandler.ts | 40 ++++++++++---------
 .../ts/message_handlers/WsMessageHandler.ts   | 36 ++++++++++-------
 .../ts/message_handlers/WsMessageProcessor.ts | 10 ++---
 newback/src/data/shared/ws.in.messages.ts     | 12 +++---
 6 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index a76560705..50e1d58f7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -24,9 +24,6 @@
   "bugs": {
     "url": "https://github.com/akoidan/pychat/issues"
   },
-  "engines": {
-    "node": "14.17"
-  },
   "homepage": "https://github.com/akoidan/pychat#readme",
   "devDependencies": {
     "@babel/types": "^7.17.0",
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index bf6372198..98387cc8e 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -64,7 +64,6 @@ import {
   StringIdentifier,
 } from "@/ts/types/types";
 import {
-  MessageStatus,
   SetStateFromStorage,
   SetStateFromWS,
 } from "@/ts/types/dto";
@@ -80,6 +79,10 @@ import {
   Mutation,
   VuexModule,
 } from "vuex-module-decorators";
+import {
+  Gender,
+  MessageStatus
+} from "@/ts/types/shared/enums";
 
 
 const logger = loggerFactory.getLogger("store");
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 313aefec7..96eabbbd9 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -27,16 +27,19 @@ import {
 } from "@/ts/types/converters";
 import type {
   GiphyDto,
-  PrintMessageWsOutMessage
-} from "@/ts/types/dto";
+  MessagesResponseMessage,
+  RoomNoUsersDto,
+  SyncHistoryWsInMessage,
+  UserProfileDto,
+  UserProfileDtoWoImage,
+  UserSettingsDto,
+} from "@/ts/types/shared/dto";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
 import type {AddChannelMessage,
   AddInviteMessage,
   AddRoomMessage,
-  DefaultWsOutMessage,
   GetCountryCodeWsInMessage,
-  MessagesResponseMessage,
   PingMessage,
   PongMessage,
   PrintMessageWsInMessage,
@@ -45,21 +48,9 @@ import type {AddChannelMessage,
   SetSettingsMessage,
   SetUserProfileMessage,
   SetWsIdMessage,
-  SyncHistoryWsOutMessage,
-  SyncHistoryWsInMessage,
   UserProfileChangedMessage,
   WebRtcSetConnectionIdMessage,
-  ShowITypeWsOutMessage,
-  RoomNoUsersDto,
-  UserProfileDto,
-  UserProfileDtoWoImage,
-  UserSettingsDto,
-  GetCountryCodeWsOutMessage,
-  SetMessageStatusWsOutMessage,
-  HandlerTypes,
-  HandlerType,
-  MessageStatus
-} from "@/ts/types/backend";
+} from "@/ts/types/shared/ws.in.messages";
 import type {
   InternetAppearMessage,
   LogoutMessage,
@@ -67,8 +58,19 @@ import type {
 } from "@/ts/types/messages/innerMessages";
 import type Subscription from "@/ts/classes/Subscription";
 import {
-  WS_SESSION_EXPIRED_CODE,
-} from "@/ts/types/backend";
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
+import {
+  DefaultWsOutMessage,
+  GetCountryCodeWsOutMessage,
+  PrintMessageWsOutMessage,
+  SetMessageStatusWsOutMessage,
+  ShowITypeWsOutMessage,
+  SyncHistoryWsOutMessage
+} from "@/ts/types/shared/ws.out.messages";
+import {MessageStatus} from "@/ts/types/shared/enums";
+import {WS_SESSION_EXPIRED_CODE} from "@/ts/types/shared/consts";
 
 enum WsState {
   NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index cdc3df3a9..dfdd57c6b 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -20,23 +20,10 @@ import type {Logger} from "lines-logger";
 import type {
   GiphyDto,
   MessageModelDto,
-} from "@/ts/types/shared/dto";
-
-import type {
-  DeleteMessage,
-  EditMessage,
-  HandlerName,
-  HandlerType,
-  HandlerTypes,
   MessagesResponseMessage,
-  PrintMessageWsInMessage,
-  SetMessageStatusWsInMessage,
   SyncHistoryWsInMessage,
-} from "@/ts/types/backend";
-import {
-  ImageType,
-  MessageStatus,
-} from "@/ts/types/backend";
+} from "@/ts/types/shared/dto";
+
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
@@ -53,6 +40,25 @@ import {
   getMissingIds,
 } from "@/ts/utils/pureFunctions";
 import type Subscription from "@/ts/classes/Subscription";
+import {
+  SaveFileRequest,
+  SaveFileResponse
+} from "@/ts/types/shared/http";
+import {
+  ImageType,
+  MessageStatus
+} from "@/ts/types/shared/enums";
+import {
+  DeleteMessage,
+  EditMessage,
+  PrintMessageWsInMessage,
+  SetMessageStatusWsInMessage
+} from "@/ts/types/shared/ws.in.messages";
+import {
+  HandlerName,
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
 
 export default class WsMessageHandler extends MessageHandler implements MessageSender {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index 9e0b5cb38..cbbf96867 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -1,12 +1,12 @@
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
-import type {
-  DefaultWsInMessage,
-  GrowlMessage,
-} from "@/ts/types/backend";
-import type {HandlerName} from "@/ts/types/backend";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
+import {
+  DefaultWsInMessage,
+  GrowlMessage
+} from "@/ts/types/shared/ws.in.messages";
+import {HandlerName} from "@/ts/types/shared/common";
 
 export class WsMessageProcessor extends AbstractMessageProcessor {
   private readonly sub: Subscription;
diff --git a/newback/src/data/shared/ws.in.messages.ts b/newback/src/data/shared/ws.in.messages.ts
index d2b10787c..6cf356ed5 100644
--- a/newback/src/data/shared/ws.in.messages.ts
+++ b/newback/src/data/shared/ws.in.messages.ts
@@ -17,13 +17,13 @@ import type {
   UserProfileDto,
   UserProfileDtoWoImage,
   UserSettingsDto,
-  WebRtcDefaultMessage,
-} from "@/ts/types/shared/dto";
+  WebRtcDefaultMessage
+} from '@/ts/types/shared/dto';
 import {
-  GiphyDto,
-} from "@/ts/types/shared/dto";
-import type {DefaultMessage, HandlerName} from "@/ts/types/shared/common";
-import type {MessageStatus} from "@/ts/types/shared/enums";
+  DefaultMessage,
+  HandlerName
+} from "@/ts/types/shared/common";
+import {MessageStatus} from "@/ts/types/shared/enums";
 
 
 export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {

From d8b98faf810aef9e66f0f83c048c3a04622af82d Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Wed, 20 Apr 2022 15:41:13 +0300
Subject: [PATCH 088/221] Fixed types

---
 frontend/src/ts/classes/DatabaseWrapper.ts    |  1 +
 frontend/src/ts/classes/Subscription.ts       |  8 ++---
 .../src/ts/message_handlers/RomHandler.ts     | 30 +++++++++----------
 frontend/src/ts/types/converters.ts           |  4 +++
 frontend/src/ts/types/db.ts                   |  1 +
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index ce57dc226..73a4c0dd0 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -37,6 +37,7 @@ import type {
 import type {SetStateFromStorage} from "@/ts/types/dto";
 import type {MainWindow} from "@/ts/classes/MainWindow";
 import {MessageStatusInner} from "@/ts/types/model";
+import {ImageType} from "@/ts/types/shared/enums";
 
 type TransactionCb = (t: SQLTransaction, ...rest: unknown[]) => void;
 type QueryObject = [string, any[]];
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index 89195ab58..a74f9496d 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,11 +1,9 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
-import type {
-  DefaultInMessage,
-  HandlerName,
-  IMessageHandler,
-} from "@/ts/types/backend";
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/innerMessages";
+import {HandlerName} from "@/ts/types/shared/common";
+import {IMessageHandler} from "@/ts/types/shared/dto";
+import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
 
 export default class Subscription {
   // TODO sub should unsubscribe from some events on logout
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 0794d8be8..eb21f6787 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -31,21 +31,6 @@ import type {
   ChannelDto,
   RoomDto,
 } from "@/ts/types/shared/dto";
-import type {
-  AddChannelMessage,
-  AddInviteMessage,
-  AddOnlineUserMessage,
-  AddRoomMessage,
-  CreateNewUsedMessage,
-  DeleteChannelMessage,
-  DeleteRoomMessage,
-  InviteUserMessage,
-  LeaveUserMessage,
-  RemoveOnlineUserMessage,
-  SaveChannelSettingsMessage,
-  SaveRoomSettingsMessage,
-  ShowITypeWsInMessage,
-} from "@/ts/types/backend";
 import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import type {Logger} from "lines-logger";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
@@ -63,6 +48,21 @@ import {
   HandlerTypes
 } from "@/ts/types/shared/common";
 import {SetStateFromWS} from "@/ts/types/dto";
+import {
+  AddChannelMessage,
+  AddInviteMessage,
+  AddOnlineUserMessage,
+  AddRoomMessage,
+  CreateNewUsedMessage,
+  DeleteChannelMessage,
+  DeleteRoomMessage,
+  InviteUserMessage,
+  LeaveUserMessage,
+  RemoveOnlineUserMessage,
+  SaveChannelSettingsMessage,
+  SaveRoomSettingsMessage,
+  ShowITypeWsInMessage
+} from "@/ts/types/shared/ws.in.messages";
 
 export class RoomHandler extends MessageHandler {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index 0b1f5d840..aaf5eb7b0 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -26,6 +26,10 @@ import type {
   SexDB,
 } from "@/ts/types/db";
 import type {MessageP2pDto} from "@/ts/types/messages/p2pDto";
+import {
+  Gender,
+  MessageStatus
+} from "@/ts/types/shared/enums";
 
 export function currentUserInfoDtoToModel(userInfo: UserProfileDtoWoImage): CurrentUserInfoWoImage {
   return {...userInfo};
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index b581778f2..fd3941593 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,5 +1,6 @@
 import type {LogLevel} from "lines-logger";
 import {MessageStatusInner} from '@/ts/types/model';
+import {Gender} from "@/ts/types/shared/enums";
 
 export interface UserDB {
   id: number;

From 2a86e81ed825ae7a3c3bec8cd135e1b54e348472 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Wed, 20 Apr 2022 16:54:57 +0300
Subject: [PATCH 089/221] Fix types

---
 frontend/src/ts/instances/routerInstance.ts     | 8 ++++----
 frontend/src/ts/message_handlers/RomHandler.ts  | 3 ++-
 frontend/src/vue/auth/SignUp.vue                | 2 +-
 frontend/src/vue/chat/textarea/ChatTextArea.vue | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 1b69433ed..489876e61 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -30,10 +30,6 @@ import ChannelSettings from "@/vue/pages/ChannelSettings.vue";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@/ts/types/backend";
 import type {
   LoginMessage,
   LogoutMessage,
@@ -44,6 +40,10 @@ import PainterPage from "@/vue/pages/PainterPage.vue";
 import RoomUsersListPage from "@/vue/pages/RoomUsersListPage.vue";
 import ChannelAddRoom from "@/vue/pages/ChannelAddRoom.vue";
 import type Subscription from "@/ts/classes/Subscription";
+import {
+  HandlerType,
+  HandlerTypes
+} from "@/ts/types/shared/common";
 
 
 export function routerFactory(sub: Subscription) {
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index eb21f6787..d03c7072b 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -142,7 +142,8 @@ export class RoomHandler extends MessageHandler {
   }
 
   public addChannel(message: AddChannelMessage) {
-    this.mutateRoomAddition(message, "room_created");
+    // TODO
+    this.mutateRoomAddition(message as any, "room_created");
   }
 
   public inviteUser(message: InviteUserMessage) {
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index 5fe69800f..186b7850f 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -133,7 +133,7 @@ import {IconColor} from "@/ts/types/types";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import SocialAuthSignUp from "@/vue/auth/SocialAuthSignUp.vue";
 import {USERNAME_REGEX} from "@/ts/utils/consts";
-import {Gender} from '@/ts/types/backend';
+import {Gender} from "@/ts/types/shared/enums";
 
 @Component({
   name: "SignUp",
diff --git a/frontend/src/vue/chat/textarea/ChatTextArea.vue b/frontend/src/vue/chat/textarea/ChatTextArea.vue
index 2d9054f95..14b94854f 100644
--- a/frontend/src/vue/chat/textarea/ChatTextArea.vue
+++ b/frontend/src/vue/chat/textarea/ChatTextArea.vue
@@ -116,6 +116,7 @@ import ChatTagging from "@/vue/chat/textarea/ChatTagging.vue";
 import {Throttle} from "@/ts/classes/Throttle";
 import GiphySearch from "@/vue/chat/textarea/GiphySearch.vue";
 import type {GIFObject} from "giphy-api";
+import {ImageType} from "@/ts/types/shared/enums";
 
 const timePattern = /^\(\d\d:\d\d:\d\d\)\s\w+:.*&gt;&gt;&gt;\s/;
 

From 5fdb8f0624ab9320dcd6f202f73f32e6f39c799d Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Wed, 20 Apr 2022 16:57:43 +0300
Subject: [PATCH 090/221] fix

---
 newback/src/data/shared/ws.out.messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newback/src/data/shared/ws.out.messages.ts b/newback/src/data/shared/ws.out.messages.ts
index 2ba772ee1..6be31873b 100644
--- a/newback/src/data/shared/ws.out.messages.ts
+++ b/newback/src/data/shared/ws.out.messages.ts
@@ -27,7 +27,7 @@ export interface SyncHistoryWsOutMessage extends DefaultWsOutMessage<"syncHistor
   lastSynced: number;
 }
 
-export interface PrintMessageWsOutMessage extends DefaultMessage<"printMessage"> {
+export interface PrintMessageWsOutMessage extends DefaultWsOutMessage<"printMessage"> {
   content: string;
   roomId: number;
   files: number[];

From 2759a2e9bca92a18b5a2cd7ad3fed45b46f2c4f0 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 28 Apr 2022 15:55:11 +0300
Subject: [PATCH 091/221] fix

---
 {common => common-bu}/dto.ts                  |   0
 common/package.json                           |  15 +
 .../src/data/shared => common/src}/consts.ts  |   0
 common/src/helpers.ts                         |  52 +++
 common/src/http/auth/facebook.auth.ts         |   3 +
 common/src/http/auth/facebook.sign.in.ts      |   3 +
 common/src/http/auth/google.auth.ts           |   3 +
 common/src/http/auth/google.sign.in.ts        |   3 +
 common/src/http/auth/sign.in.ts               |  12 +
 common/src/http/auth/sign.up.ts               |  11 +
 common/src/http/auth/validate.user.ts         |   7 +
 common/src/http/auth/validte.email.ts         |   7 +
 common/src/http/file/save.file.ts             |  14 +
 common/src/http/verify/accept.token.ts        |   8 +
 common/src/http/verify/confirm.email.ts       |   7 +
 .../src/http/verify/send.restore.password.ts  |  11 +
 common/src/http/verify/verify.token.ts        |   9 +
 common/src/model/dto/channel.dto.ts           |   5 +
 common/src/model/dto/file.model.dto.ts        |   8 +
 common/src/model/dto/giphy.dto.ts             |   5 +
 common/src/model/dto/location.dto.ts          |   6 +
 common/src/model/dto/message.model.dto.ts     |  18 +
 common/src/model/dto/room.dto.ts              |  14 +
 common/src/model/dto/user.dto.ts              |   9 +
 common/src/model/dto/user.profile.dto.ts      |  17 +
 common/src/model/dto/user.settings.dto.ts     |  13 +
 common/src/model/enum/gender.ts               |   6 +
 common/src/model/enum/image.type.ts           |   9 +
 common/src/model/enum/theme.ts                |   5 +
 common/src/model/enum/verification.type.ts    |   5 +
 common/src/ws/common.ts                       |  42 ++
 common/src/ws/message/print.message.ts        |  19 +
 common/src/ws/message/set.message.status.ts   |  17 +
 common/tsconfig.json                          |  29 ++
 frontend/tsconfig.json                        |   3 +-
 newback/src/config/Config.d.ts                |   1 -
 newback/src/data/model/channel.model.ts       |  30 +-
 newback/src/data/model/image.model.ts         |  23 +-
 newback/src/data/model/message.model.ts       |  22 +-
 newback/src/data/model/uploaded.file.model.ts |  22 +-
 newback/src/data/model/user.model.ts          |  24 +-
 newback/src/data/model/user.settings.model.ts |  22 +-
 newback/src/data/model/verification.model.ts  |  22 +-
 newback/src/data/shared/common.ts             |  34 --
 newback/src/data/shared/dto.ts                | 130 +-----
 newback/src/data/shared/enums.ts              |  35 --
 newback/src/data/shared/http.ts               | 112 -----
 newback/src/data/shared/ws.in.messages.ts     | 381 +++++++++---------
 newback/src/data/shared/ws.out.messages.ts    |  39 --
 .../transformers/helper/generate.user.name.ts |   2 +-
 .../transformers/helper/get.max.symbol.ts     |  33 +-
 .../transformers/model/channel.transformer.ts |   4 +-
 .../transformers/model/image.transformer.ts   |   6 +-
 .../transformers/model/mention.transformer.ts |   2 +-
 .../transformers/model/message.transformer.ts |   6 +-
 .../transformers/model/profile.transformer.ts |   4 +-
 .../transformers/model/room.transformer.ts    |   2 +-
 .../model/settings.transformer.ts             |   4 +-
 .../transformers/model/user.transformer.ts    |   4 +-
 .../add.online.user.transformer.ts            |   4 +-
 .../get.user.contries.transformer.ts          |   6 +-
 .../out.message/inner.transformer.ts          |   6 +-
 .../out.message/print.message.transformer.ts  |   4 +-
 .../remove.online.user.transformer.ts         |   8 +-
 .../out.message/set.ws.id.transformer.ts      |   2 +-
 .../out.message/sync.message.transformer.ts   |  10 +-
 newback/src/data/types/internal.ts            |   4 +-
 newback/src/main.ts                           |  60 ++-
 .../src/modules/api/auth/auth.controller.ts   |  13 +-
 newback/src/modules/api/auth/auth.service.ts  |  26 +-
 .../facebook.auth.request.validator.ts        |   2 +-
 .../google.auth.reques.validator.ts           |   3 +-
 .../validators/login.request.validator.ts     |   2 +-
 .../validators/sign.up.request.validator.ts   |   6 +-
 .../validate.email.request.validator.ts       |   2 +-
 .../validate.user.request.validator.ts        |   4 +-
 .../src/modules/api/file/file.controller.ts   |   3 +-
 newback/src/modules/api/file/file.service.ts  |   4 +-
 newback/src/modules/api/file/image.service.ts |   2 +-
 .../accept.token.request.validator.ts         |  16 +-
 .../confirm.email.request.validator.ts        |   2 +-
 .../send.restore.password.validator.ts        |   2 +-
 .../verify.token.request.validator.ts         |   2 +-
 .../modules/api/verify/verify.controller.ts   |   7 +-
 .../src/modules/api/verify/verify.service.ts  |   9 +-
 .../modules/api/websocket/message.service.ts  |  26 +-
 .../api/websocket/websocket.gateway.ts        |  15 +-
 .../api/websocket/websocket.service.ts        |   5 +-
 .../modules/api/websocket/ws.data.service.ts  |   4 +-
 .../api/websocket/ws.exception.filter.ts      |   2 +-
 .../modules/app/decorators/catch.ws.errors.ts |   2 +-
 .../modules/app/guards/own.message.guard.ts   |   2 +-
 .../src/modules/app/guards/own.room.guard.ts  |   2 +-
 .../shared/database/database.module.ts        |   2 +-
 .../repository/messages.repository.ts         |   2 +-
 .../database/repository/user.repository.ts    |   2 +-
 .../modules/shared/pubsub/pubsub.service.ts   |   4 +-
 .../src/modules/shared/redis/redis.service.ts |   2 +-
 .../modules/shared/ws.adapter/ws.adapter.ts   |  21 +-
 newback/src/utils/generate.orm.config.ts      |   3 -
 newback/src/utils/jest.config.ts              |   8 +-
 newback/src/utils/migration.old.ts            |   2 +-
 newback/src/utils/migration.runner.ts         |   2 +-
 newback/tsconfig.json                         |   7 +-
 104 files changed, 982 insertions(+), 699 deletions(-)
 rename {common => common-bu}/dto.ts (100%)
 create mode 100644 common/package.json
 rename {newback/src/data/shared => common/src}/consts.ts (100%)
 create mode 100644 common/src/helpers.ts
 create mode 100644 common/src/http/auth/facebook.auth.ts
 create mode 100644 common/src/http/auth/facebook.sign.in.ts
 create mode 100644 common/src/http/auth/google.auth.ts
 create mode 100644 common/src/http/auth/google.sign.in.ts
 create mode 100644 common/src/http/auth/sign.in.ts
 create mode 100644 common/src/http/auth/sign.up.ts
 create mode 100644 common/src/http/auth/validate.user.ts
 create mode 100644 common/src/http/auth/validte.email.ts
 create mode 100644 common/src/http/file/save.file.ts
 create mode 100644 common/src/http/verify/accept.token.ts
 create mode 100644 common/src/http/verify/confirm.email.ts
 create mode 100644 common/src/http/verify/send.restore.password.ts
 create mode 100644 common/src/http/verify/verify.token.ts
 create mode 100644 common/src/model/dto/channel.dto.ts
 create mode 100644 common/src/model/dto/file.model.dto.ts
 create mode 100644 common/src/model/dto/giphy.dto.ts
 create mode 100644 common/src/model/dto/location.dto.ts
 create mode 100644 common/src/model/dto/message.model.dto.ts
 create mode 100644 common/src/model/dto/room.dto.ts
 create mode 100644 common/src/model/dto/user.dto.ts
 create mode 100644 common/src/model/dto/user.profile.dto.ts
 create mode 100644 common/src/model/dto/user.settings.dto.ts
 create mode 100644 common/src/model/enum/gender.ts
 create mode 100644 common/src/model/enum/image.type.ts
 create mode 100644 common/src/model/enum/theme.ts
 create mode 100644 common/src/model/enum/verification.type.ts
 create mode 100644 common/src/ws/common.ts
 create mode 100644 common/src/ws/message/print.message.ts
 create mode 100644 common/src/ws/message/set.message.status.ts
 create mode 100644 common/tsconfig.json
 delete mode 100644 newback/src/data/shared/common.ts
 delete mode 100644 newback/src/data/shared/enums.ts
 delete mode 100644 newback/src/data/shared/http.ts
 delete mode 100644 newback/src/data/shared/ws.out.messages.ts

diff --git a/common/dto.ts b/common-bu/dto.ts
similarity index 100%
rename from common/dto.ts
rename to common-bu/dto.ts
diff --git a/common/package.json b/common/package.json
new file mode 100644
index 000000000..40ac3f2d0
--- /dev/null
+++ b/common/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "pychat-common",
+  "version": "1.0.0",
+  "description": "Opensource chat",
+  "author": "Andrew Koidan <deathangel908@gmail.com",
+  "license": "MIT",
+  "homepage": "https://github.com/akoidan/pychat#readme",
+  "scripts": {
+    "build": "tsc"
+  },
+  "dependencies": {
+    "lines-logger": "^2.1.2",
+    "typescript": "^4.6.3"
+  }
+}
diff --git a/newback/src/data/shared/consts.ts b/common/src/consts.ts
similarity index 100%
rename from newback/src/data/shared/consts.ts
rename to common/src/consts.ts
diff --git a/common/src/helpers.ts b/common/src/helpers.ts
new file mode 100644
index 000000000..ede8ef71b
--- /dev/null
+++ b/common/src/helpers.ts
@@ -0,0 +1,52 @@
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import {Gender} from "@common/model/enum/gender";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {AcceptTokenRequest} from '@common/http/verify/accept.token';
+import {
+  ValidateEmailResponse,
+  ValidateUserEmailRequest
+} from '@common/http/auth/validte.email';
+import {
+  ValidateUserRequest,
+  ValidateUserResponse
+} from '@common/http/auth/validate.user';
+
+
+
+export interface CaptchaRequest {
+  captcha?: string;
+}
+
+interface TypeGeneratorForOauth1 extends SessionResponse {
+  isNewAccount: true;
+  username: string;
+}
+
+interface TypeGeneratorForOauth2 extends SessionResponse {
+  isNewAccount: false;
+}
+
+export type OauthSessionResponse =
+  TypeGeneratorForOauth1
+  | TypeGeneratorForOauth2;
+
+
+export interface SessionResponse {
+  session: string;
+}
+
+
+export interface OkResponse {
+  ok: true;
+}
diff --git a/common/src/http/auth/facebook.auth.ts b/common/src/http/auth/facebook.auth.ts
new file mode 100644
index 000000000..a91fc83e6
--- /dev/null
+++ b/common/src/http/auth/facebook.auth.ts
@@ -0,0 +1,3 @@
+export interface FaceBookAuthRequest {
+  token: string;
+}
diff --git a/common/src/http/auth/facebook.sign.in.ts b/common/src/http/auth/facebook.sign.in.ts
new file mode 100644
index 000000000..f3a13059a
--- /dev/null
+++ b/common/src/http/auth/facebook.sign.in.ts
@@ -0,0 +1,3 @@
+import {OauthSessionResponse} from '@common/helpers';
+
+export type FacebookSignInResponse = OauthSessionResponse;
diff --git a/common/src/http/auth/google.auth.ts b/common/src/http/auth/google.auth.ts
new file mode 100644
index 000000000..8bb405f02
--- /dev/null
+++ b/common/src/http/auth/google.auth.ts
@@ -0,0 +1,3 @@
+export interface GoogleAuthRequest {
+  token: string;
+}
diff --git a/common/src/http/auth/google.sign.in.ts b/common/src/http/auth/google.sign.in.ts
new file mode 100644
index 000000000..4d6228339
--- /dev/null
+++ b/common/src/http/auth/google.sign.in.ts
@@ -0,0 +1,3 @@
+import {OauthSessionResponse} from '@common/helpers';
+
+export type GoogleSignInResponse = OauthSessionResponse;
diff --git a/common/src/http/auth/sign.in.ts b/common/src/http/auth/sign.in.ts
new file mode 100644
index 000000000..1fa2571f4
--- /dev/null
+++ b/common/src/http/auth/sign.in.ts
@@ -0,0 +1,12 @@
+import {
+  CaptchaRequest,
+  SessionResponse
+} from '@common/helpers';
+
+export type SignInResponse = SessionResponse;
+
+export interface SignInRequest extends CaptchaRequest {
+  username?: string;
+  password: string;
+  email?: string;
+}
diff --git a/common/src/http/auth/sign.up.ts b/common/src/http/auth/sign.up.ts
new file mode 100644
index 000000000..d12c4bcac
--- /dev/null
+++ b/common/src/http/auth/sign.up.ts
@@ -0,0 +1,11 @@
+import {SessionResponse} from '@common/helpers';
+import {Gender} from '@common/model/enum/gender';
+
+export type SignUpResponse = SessionResponse;
+
+export interface SignUpRequest {
+  username: string;
+  password: string;
+  email?: string;
+  sex?: Gender;
+}
diff --git a/common/src/http/auth/validate.user.ts b/common/src/http/auth/validate.user.ts
new file mode 100644
index 000000000..c72780418
--- /dev/null
+++ b/common/src/http/auth/validate.user.ts
@@ -0,0 +1,7 @@
+import {OkResponse} from '@common/helpers';
+
+export interface ValidateUserRequest {
+  username: string;
+}
+
+export type ValidateUserResponse = OkResponse;
diff --git a/common/src/http/auth/validte.email.ts b/common/src/http/auth/validte.email.ts
new file mode 100644
index 000000000..ae402cbd9
--- /dev/null
+++ b/common/src/http/auth/validte.email.ts
@@ -0,0 +1,7 @@
+import {OkResponse} from '@common/helpers';
+
+export type ValidateEmailResponse = OkResponse;
+
+export interface ValidateUserEmailRequest {
+  email: string;
+}
diff --git a/common/src/http/file/save.file.ts b/common/src/http/file/save.file.ts
new file mode 100644
index 000000000..a0d4cb5a8
--- /dev/null
+++ b/common/src/http/file/save.file.ts
@@ -0,0 +1,14 @@
+import {ImageType} from '@common/model/enum/image.type';
+
+export interface SaveFileResponse {
+  id: number;
+  previewId?: number;
+  symbol: string;
+}
+
+export interface SaveFileRequest {
+  file: Blob;
+  name?: string;
+  symbol: string;
+  type: ImageType;
+}
diff --git a/common/src/http/verify/accept.token.ts b/common/src/http/verify/accept.token.ts
new file mode 100644
index 000000000..2a6c4bf30
--- /dev/null
+++ b/common/src/http/verify/accept.token.ts
@@ -0,0 +1,8 @@
+import {SessionResponse} from '@common/helpers';
+
+export type AcceptTokenResponse = SessionResponse;
+
+export interface AcceptTokenRequest {
+  token: string;
+  password: string;
+}
diff --git a/common/src/http/verify/confirm.email.ts b/common/src/http/verify/confirm.email.ts
new file mode 100644
index 000000000..13743dc95
--- /dev/null
+++ b/common/src/http/verify/confirm.email.ts
@@ -0,0 +1,7 @@
+import {OkResponse} from '@common/helpers';
+
+export interface ConfirmEmailRequest {
+  token: string;
+}
+
+export type ConfirmEmailResponse = OkResponse;
diff --git a/common/src/http/verify/send.restore.password.ts b/common/src/http/verify/send.restore.password.ts
new file mode 100644
index 000000000..bdace7870
--- /dev/null
+++ b/common/src/http/verify/send.restore.password.ts
@@ -0,0 +1,11 @@
+import {
+  CaptchaRequest,
+  OkResponse
+} from '@common/helpers';
+
+export type SendRestorePasswordResponse = OkResponse;
+
+export interface SendRestorePasswordRequest extends CaptchaRequest {
+  username?: string;
+  email?: string;
+}
diff --git a/common/src/http/verify/verify.token.ts b/common/src/http/verify/verify.token.ts
new file mode 100644
index 000000000..d03ded8a9
--- /dev/null
+++ b/common/src/http/verify/verify.token.ts
@@ -0,0 +1,9 @@
+import {OkResponse} from '@common/helpers';
+
+export interface VerifyTokenRequest {
+  token: string;
+}
+
+export interface VerifyTokenResponse extends OkResponse {
+  username: string;
+}
diff --git a/common/src/model/dto/channel.dto.ts b/common/src/model/dto/channel.dto.ts
new file mode 100644
index 000000000..e3b3a512f
--- /dev/null
+++ b/common/src/model/dto/channel.dto.ts
@@ -0,0 +1,5 @@
+export interface ChannelDto {
+  name: string;
+  id: number;
+  creatorId: number;
+}
diff --git a/common/src/model/dto/file.model.dto.ts b/common/src/model/dto/file.model.dto.ts
new file mode 100644
index 000000000..a76784361
--- /dev/null
+++ b/common/src/model/dto/file.model.dto.ts
@@ -0,0 +1,8 @@
+import {ImageType} from '@common/model/enum/image.type';
+
+export interface FileModelDto {
+  url: string;
+  id: number;
+  type: ImageType;
+  preview: string;
+}
diff --git a/common/src/model/dto/giphy.dto.ts b/common/src/model/dto/giphy.dto.ts
new file mode 100644
index 000000000..31f7ded03
--- /dev/null
+++ b/common/src/model/dto/giphy.dto.ts
@@ -0,0 +1,5 @@
+export interface GiphyDto {
+  webp: string;
+  url: string;
+  symbol: string;
+}
diff --git a/common/src/model/dto/location.dto.ts b/common/src/model/dto/location.dto.ts
new file mode 100644
index 000000000..cba899bcf
--- /dev/null
+++ b/common/src/model/dto/location.dto.ts
@@ -0,0 +1,6 @@
+export interface LocationDto {
+  city: string;
+  country: string;
+  countryCode: string;
+  region: string;
+}
diff --git a/common/src/model/dto/message.model.dto.ts b/common/src/model/dto/message.model.dto.ts
new file mode 100644
index 000000000..f4020dc60
--- /dev/null
+++ b/common/src/model/dto/message.model.dto.ts
@@ -0,0 +1,18 @@
+import {FileModelDto} from '@common/model/dto/file.model.dto';
+import {MessageStatus} from '@common/model/enum/message.status';
+
+export interface MessageModelDto {
+  id: number;
+  time: number;
+  parentMessage: number;
+  files: Record<number, FileModelDto>;
+  tags: Record<number, number>;
+  content: string;
+  status: MessageStatus;
+  symbol: string | null;
+  deleted: boolean;
+  threadMessagesCount: number;
+  edited: number;
+  roomId: number;
+  userId: number;
+}
diff --git a/common/src/model/dto/room.dto.ts b/common/src/model/dto/room.dto.ts
new file mode 100644
index 000000000..7420c2581
--- /dev/null
+++ b/common/src/model/dto/room.dto.ts
@@ -0,0 +1,14 @@
+export interface RoomNoUsersDto {
+  channelId: number | null;
+  notifications: boolean;
+  p2p: boolean;
+  volume: number;
+  isMainInChannel: boolean;
+  id: number;
+  name: string;
+  creatorId: number;
+}
+
+export interface RoomDto extends RoomNoUsersDto {
+  users: number[];
+}
diff --git a/common/src/model/dto/user.dto.ts b/common/src/model/dto/user.dto.ts
new file mode 100644
index 000000000..4a9be9d1b
--- /dev/null
+++ b/common/src/model/dto/user.dto.ts
@@ -0,0 +1,9 @@
+import {Gender} from '@common/model/enum/gender';
+
+export interface UserDto {
+  username: string;
+  id: number;
+  thumbnail: string;
+  lastTimeOnline: number;
+  sex: Gender;
+}
diff --git a/common/src/model/dto/user.profile.dto.ts b/common/src/model/dto/user.profile.dto.ts
new file mode 100644
index 000000000..1b9b27c33
--- /dev/null
+++ b/common/src/model/dto/user.profile.dto.ts
@@ -0,0 +1,17 @@
+import {Gender} from '@common/model/enum/gender';
+
+export interface UserProfileDtoWoImage {
+  username: string;
+  name: string;
+  city: string;
+  surname: string;
+  email: string;
+  birthday: Date;
+  contacts: string;
+  sex: Gender;
+  id: number;
+}
+
+export interface UserProfileDto extends UserProfileDtoWoImage {
+  thumbnail: string;
+}
diff --git a/common/src/model/dto/user.settings.dto.ts b/common/src/model/dto/user.settings.dto.ts
new file mode 100644
index 000000000..c281ba1c5
--- /dev/null
+++ b/common/src/model/dto/user.settings.dto.ts
@@ -0,0 +1,13 @@
+import {LogLevel} from 'lines-logger';
+
+export interface UserSettingsDto {
+  embeddedYoutube: boolean;
+  highlightCode: boolean;
+  incomingFileCallSound: boolean;
+  messageSound: boolean;
+  onlineChangeSound: boolean;
+  showWhenITyping: boolean;
+  suggestions: boolean;
+  logs: LogLevel;
+  theme: string;
+}
diff --git a/common/src/model/enum/gender.ts b/common/src/model/enum/gender.ts
new file mode 100644
index 000000000..d98d588fd
--- /dev/null
+++ b/common/src/model/enum/gender.ts
@@ -0,0 +1,6 @@
+// ISO/IEC 5218 1 male, 2 - female
+export enum Gender {
+  MALE = "MALE",
+  FEMALE = "FEMALE",
+  OTHER = "OTHER",
+}
diff --git a/common/src/model/enum/image.type.ts b/common/src/model/enum/image.type.ts
new file mode 100644
index 000000000..d20b094a5
--- /dev/null
+++ b/common/src/model/enum/image.type.ts
@@ -0,0 +1,9 @@
+export enum ImageType {
+  VIDEO = "VIDEO",
+  FILE = "FILE",
+  MEDIA_RECORD = "MEDIA_RECORD",
+  AUDIO_RECORD = "AUDIO_RECORD",
+  IMAGE = "IMAGE",
+  PREVIEW = "PREVIEW",
+  GIPHY = "GIPHY",
+}
diff --git a/common/src/model/enum/theme.ts b/common/src/model/enum/theme.ts
new file mode 100644
index 000000000..47c62e13f
--- /dev/null
+++ b/common/src/model/enum/theme.ts
@@ -0,0 +1,5 @@
+export enum Theme {
+  COLOR_LOR = "COLOR_LOR",
+  COLOR_REG = "COLOR_REG",
+  COLOR_WHITE = "COLOR_WHITE",
+}
diff --git a/common/src/model/enum/verification.type.ts b/common/src/model/enum/verification.type.ts
new file mode 100644
index 000000000..a943e6557
--- /dev/null
+++ b/common/src/model/enum/verification.type.ts
@@ -0,0 +1,5 @@
+export enum VerificationType {
+  REGISTER = "REGISTER", // When user sign up with email, we want to confirm that it's his/her email
+  PASSWORD = "PASSWORD", // When user request a pasword change
+  EMAIL = "EMAIL", // When user changes an email
+}
diff --git a/common/src/ws/common.ts b/common/src/ws/common.ts
new file mode 100644
index 000000000..797a28362
--- /dev/null
+++ b/common/src/ws/common.ts
@@ -0,0 +1,42 @@
+export interface DefaultWsInMessage<A extends string, H extends HandlerName, D> {
+  action: A;
+  data: D;
+  handler: H;
+}
+
+export interface ResponseWsInMessage <D> {
+  data: D;
+  cbBySender: string;
+  cbId: number;
+}
+
+export interface DefaultWsOutMessage<A extends string, D> {
+  data: D;
+  action: A;
+}
+
+export interface RequestWsOutMessage<A extends string, D> extends DefaultWsOutMessage<A, D> {
+  cbId: number;
+}
+
+
+export type HandlerName =
+  "*"
+  | "call"
+  | "notifier"
+  | "peerConnection:*"
+  | "room"
+  | "router"
+  | "void"
+  | "webrtc-message"
+  | "webrtc"
+  | "webrtcTransfer:*"
+  | "ws-message"
+  | "ws";
+
+
+export type HandlerType<A extends string, H extends HandlerName, D> = (a: DefaultWsInMessage<A, H | "*", D>) => Promise<void> | void;
+
+export type HandlerTypes<K extends string, H extends HandlerName, D> = {
+  [Key in K]?: HandlerType<Key, H, D>
+};
diff --git a/common/src/ws/message/print.message.ts b/common/src/ws/message/print.message.ts
new file mode 100644
index 000000000..2f8aa0240
--- /dev/null
+++ b/common/src/ws/message/print.message.ts
@@ -0,0 +1,19 @@
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage
+} from '@common/ws/common';
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
+import {GiphyDto} from '@common/model/dto/giphy.dto';
+
+export type PrintMessageWsInMessage = DefaultWsInMessage<"printMessage", "ws-message", MessageModelDto>;
+
+export type PrintMessageWsOutMessage = DefaultWsOutMessage<"printMessage", {
+  content: string;
+  roomId: number;
+  files: number[];
+  id: number;
+  timeDiff: number;
+  parentMessage: number | null;
+  tags: Record<string, number>;
+  giphies: GiphyDto[];
+}>;
diff --git a/common/src/ws/message/set.message.status.ts b/common/src/ws/message/set.message.status.ts
new file mode 100644
index 000000000..9d5a5b97e
--- /dev/null
+++ b/common/src/ws/message/set.message.status.ts
@@ -0,0 +1,17 @@
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage
+} from '@common/ws/common';
+import {MessageStatus} from '@common/model/enum/message.status';
+
+export type SetMessageStatusWsOutMessage = DefaultWsOutMessage<"setMessageStatus", {
+  messagesIds: number[];
+  status: MessageStatus;
+  roomId: number;
+}>;
+
+export type SetMessageStatusWsInMessage = DefaultWsInMessage<"setMessageStatus", "ws-message", {
+  roomId: number;
+  status: MessageStatus;
+  messagesIds: number[];
+}>;
diff --git a/common/tsconfig.json b/common/tsconfig.json
new file mode 100644
index 000000000..7fd00cbc4
--- /dev/null
+++ b/common/tsconfig.json
@@ -0,0 +1,29 @@
+{
+ "exclude": [
+    "node_modules",
+    "dist",
+  ],
+  "compilerOptions": {
+   "paths": {
+      "@common/*": ["./src/*"]
+    },
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "resolveJsonModule": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "target": "es2017",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "strictNullChecks": false,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false
+  }
+}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index ac9f53a50..9afff994b 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -2,7 +2,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["src/*"],
+      "@common/*": ["../common/src/*"]
     },
     "target": "esnext",
     "useDefineForClassFields": true,
diff --git a/newback/src/config/Config.d.ts b/newback/src/config/Config.d.ts
index cd5e7c788..43909252f 100644
--- a/newback/src/config/Config.d.ts
+++ b/newback/src/config/Config.d.ts
@@ -1,4 +1,3 @@
-/* tslint:disable */
 /* eslint-disable */
 declare module "node-ts-config" {
   interface IConfig {
diff --git a/newback/src/data/model/channel.model.ts b/newback/src/data/model/channel.model.ts
index f81e0becc..e1bc21f05 100644
--- a/newback/src/data/model/channel.model.ts
+++ b/newback/src/data/model/channel.model.ts
@@ -1,5 +1,33 @@
 import {
-  BelongsTo,
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
+import {GiphyDto} from '@common/model/dto/giphy.dto';
+import {ChannelDto} from '@common/model/dto/channel.dto';
+import {FileModelDto} from '@common/model/dto/file.model.dto';
+import {LocationDto} from '@common/model/dto/location.dto';
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
+import {RoomDto} from '@common/model/dto/room.dto';
+import {UserDto} from '@common/model/dto/user.dto';
+import {UserProfileDto} from '@common/model/dto/user.profile.dto';
+import {UserSettingsDto} from '@common/model/dto/user.settings.dto';  BelongsTo,
   Column,
   DataType,
   ForeignKey,
diff --git a/newback/src/data/model/image.model.ts b/newback/src/data/model/image.model.ts
index ccbaa34aa..58dfb320b 100644
--- a/newback/src/data/model/image.model.ts
+++ b/newback/src/data/model/image.model.ts
@@ -9,8 +9,29 @@ import {
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
 import {MessageModel} from "@/data/model/message.model";
-import { ImageType } from '@/data/shared/enums';
 
+import {generateUserName} from "@/data/transformers/helper/generate.user.name";
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
 const uniqueUserIdSymbMess = "unique_image_symbol_message";
 
 
diff --git a/newback/src/data/model/message.model.ts b/newback/src/data/model/message.model.ts
index 420fc58a6..2f82ed178 100644
--- a/newback/src/data/model/message.model.ts
+++ b/newback/src/data/model/message.model.ts
@@ -9,8 +9,28 @@ import {
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 import {RoomModel} from "@/data/model/room.model";
-import { MessageStatus } from '@/data/shared/enums';
 
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
 @Injectable()
 @Table({tableName: "message"})
 export class MessageModel extends Model<MessageModel> {
diff --git a/newback/src/data/model/uploaded.file.model.ts b/newback/src/data/model/uploaded.file.model.ts
index 06c5d4e52..711e2da26 100644
--- a/newback/src/data/model/uploaded.file.model.ts
+++ b/newback/src/data/model/uploaded.file.model.ts
@@ -8,8 +8,28 @@ import {
 } from "sequelize-typescript";
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
-import { ImageType } from '@/data/shared/enums';
 
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
 @Injectable()
 @Table({tableName: "uploaded_file"})
 export class UploadedFileModel extends Model<UploadedFileModel> {
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index d3eea72d1..acaffcc3b 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -9,10 +9,30 @@ import {Injectable} from "@nestjs/common";
 import {UserAuthModel} from "@/data/model/user.auth.model";
 import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
-import {MAX_USERNAME_LENGTH} from '@/data/consts';
-import { Gender } from '@/data/shared/enums';
+import {MAX_USERNAME_LENGTH} from "@/data/consts";
 
 
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
 @Injectable()
 @Table({tableName: "user"})
 export class UserModel extends Model<UserModel> {
diff --git a/newback/src/data/model/user.settings.model.ts b/newback/src/data/model/user.settings.model.ts
index 6a031450d..1f2c27070 100644
--- a/newback/src/data/model/user.settings.model.ts
+++ b/newback/src/data/model/user.settings.model.ts
@@ -13,7 +13,27 @@ import {
   logLevels,
 } from "lines-logger";
 import {MysqlBool} from "@/data/types/internal";
-import { Theme } from '@/data/shared/enums';
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
 
 @Injectable()
 @Table({tableName: "user_settings"})
diff --git a/newback/src/data/model/verification.model.ts b/newback/src/data/model/verification.model.ts
index e3ba9235f..61d1de6a7 100644
--- a/newback/src/data/model/verification.model.ts
+++ b/newback/src/data/model/verification.model.ts
@@ -9,7 +9,27 @@ import {
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 import {MysqlBool} from "@/data/types/internal";
-import { VerificationType } from '@/data/shared/enums';
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
 
 @Injectable()
 @Table({tableName: "verification"})
diff --git a/newback/src/data/shared/common.ts b/newback/src/data/shared/common.ts
deleted file mode 100644
index 4e7bec685..000000000
--- a/newback/src/data/shared/common.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
-
-
-export interface DefaultMessage<A extends string> {
-  action: A;
-}
-
-
-/** CODE I PUT HERE MANUALLY WS IN */
-/*
- * Any means that every every registered subscriber will be called with this handler if it exists
- * this means, that handler that registered this event will be called
- * void means that no handlers should process this signal
- */
-export type HandlerName =
-  "*"
-  | "call"
-  | "notifier"
-  | "peerConnection:*"
-  | "room"
-  | "router"
-  | "void"
-  | "webrtc-message"
-  | "webrtc"
-  | "webrtcTransfer:*"
-  | "ws-message"
-  | "ws";
-
-
-export type HandlerType<A extends string, H extends HandlerName> = (a: DefaultInMessage<A, H | "*">) => Promise<void> | void;
-
-export type HandlerTypes<K extends string, H extends HandlerName> = {
-  [Key in K]?: HandlerType<Key, H>
-};
diff --git a/newback/src/data/shared/dto.ts b/newback/src/data/shared/dto.ts
index 4356767a9..b69235637 100644
--- a/newback/src/data/shared/dto.ts
+++ b/newback/src/data/shared/dto.ts
@@ -1,13 +1,13 @@
-import {
+import type {
   Gender,
   ImageType,
-  MessageStatus
-} from "@/ts/types/shared/enums";
-import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
-import {
+  MessageStatus,
+} from "./enums";
+import type {DefaultInMessage} from "./ws.in.messages";
+import type {
   HandlerName,
-  HandlerType
-} from "@/ts/types/shared/common";
+  HandlerType,
+} from "./common";
 
 
 export declare type LogLevel =
@@ -20,103 +20,6 @@ export declare type LogLevel =
   | "trace"
   | "warn";
 
-export interface UserSettingsDto {
-  embeddedYoutube: boolean;
-  highlightCode: boolean;
-  incomingFileCallSound: boolean;
-  messageSound: boolean;
-  onlineChangeSound: boolean;
-  showWhenITyping: boolean;
-  suggestions: boolean;
-  logs: LogLevel;
-  theme: string;
-}
-
-
-export interface RoomNoUsersDto {
-  channelId: number | null;
-  notifications: boolean;
-  p2p: boolean;
-  volume: number;
-  isMainInChannel: boolean;
-  id: number;
-  name: string;
-  creatorId: number;
-}
-
-export interface UserProfileDto extends UserProfileDtoWoImage {
-  thumbnail: string;
-}
-
-
-export interface LocationDto {
-  city: string;
-  country: string;
-  countryCode: string;
-  region: string;
-}
-
-
-export interface ChannelDto {
-  name: string;
-  id: number;
-  creatorId: number;
-}
-
-export interface RoomDto extends RoomNoUsersDto {
-  users: number[];
-}
-
-
-export interface FileModelDto {
-  url: string;
-  id: number;
-  type: ImageType;
-  preview: string;
-}
-
-
-
-export interface MessageModelDto {
-  id: number;
-  time: number;
-  parentMessage: number;
-  files?: Record<number, FileModelDto>;
-  tags: Record<number, number>;
-  content: string;
-  status: MessageStatus;
-  symbol?: string;
-  deleted?: boolean;
-  threadMessagesCount: number;
-  edited: number;
-  roomId: number;
-  userId: number;
-}
-
-
-export interface UserDto {
-  username: string;
-  id: number;
-  thumbnail: string;
-  lastTimeOnline: number;
-  sex: Gender;
-}
-
-
-export interface UserProfileDtoWoImage {
-  username: string;
-  name: string;
-  city: string;
-  surname: string;
-  email: string;
-  birthday: Date;
-  contacts: string;
-  sex: Gender;
-  id: number;
-}
-
-
-
 
 export interface ChangeUserOnlineBase {
   online: Record<number, string[]>;
@@ -126,8 +29,6 @@ export interface ChangeUserOnlineBase {
 }
 
 
-
-
 export interface AcceptFileContent {
   received: number;
 }
@@ -176,11 +77,6 @@ export interface BrowserBase {
   browser: string;
 }
 
-export interface CallBackMessage {
-  // Request to send response with this callback id
-  cbId?: number;
-}
-
 
 export interface ResolveCallbackId {
   resolveCbId?: number; // If this callback id is present, resolve it
@@ -211,16 +107,4 @@ export interface MessagesResponseMessage {
   content: MessageModelDto[];
 }
 
-export interface SyncHistoryWsInMessage extends MessagesResponseMessage {
-  readMessageIds: number[];
-  receivedMessageIds: number[];
-}
-
-
-
-export interface GiphyDto {
-  webp: string;
-  url: string;
-  symbol: string;
-}
 
diff --git a/newback/src/data/shared/enums.ts b/newback/src/data/shared/enums.ts
deleted file mode 100644
index 4e1d65e9f..000000000
--- a/newback/src/data/shared/enums.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// ISO/IEC 5218 1 male, 2 - female
-export enum Gender {
-  MALE = "MALE",
-  FEMALE = "FEMALE",
-  OTHER = "OTHER",
-}
-
-export enum MessageStatus {
-  ON_SERVER = "ON_SERVER", // Uploaded to server
-  READ = "READ",
-  RECEIVED = "RECEIVED", // Sent
-}
-
-export enum Theme {
-  COLOR_LOR = "COLOR_LOR",
-  COLOR_REG = "COLOR_REG",
-  COLOR_WHITE = "COLOR_WHITE",
-}
-
-
-export enum VerificationType {
-  REGISTER = "REGISTER", // When user sign up with email, we want to confirm that it's his/her email
-  PASSWORD = "PASSWORD", // When user request a pasword change
-  EMAIL = "EMAIL", // When user changes an email
-}
-
-export enum ImageType {
-  VIDEO = "VIDEO",
-  FILE = "FILE",
-  MEDIA_RECORD = "MEDIA_RECORD",
-  AUDIO_RECORD = "AUDIO_RECORD",
-  IMAGE = "IMAGE",
-  PREVIEW = "PREVIEW",
-  GIPHY = "GIPHY",
-}
diff --git a/newback/src/data/shared/http.ts b/newback/src/data/shared/http.ts
deleted file mode 100644
index f98ab228c..000000000
--- a/newback/src/data/shared/http.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import {
-  Gender,
-  ImageType
-} from "@/ts/types/shared/enums";
-
-
-interface TypeGeneratorForOauth1 extends SessionResponse {
-  isNewAccount: true;
-  username: string;
-}
-
-interface TypeGeneratorForOauth2 extends SessionResponse {
-  isNewAccount: false;
-}
-
-export type OauthSessionResponse =
-  TypeGeneratorForOauth1
-  | TypeGeneratorForOauth2;
-
-
-export type GoogleSignInResponse = OauthSessionResponse;
-export type FacebookSignInResponse = OauthSessionResponse;
-
-export interface SignInRequest extends CaptchaRequest {
-  username?: string;
-  password: string;
-  email?: string;
-}
-
-export interface SendRestorePasswordRequest extends CaptchaRequest {
-  username?: string;
-  email?: string;
-}
-
-export interface VerifyTokenRequest {
-  token: string;
-}
-
-export interface AcceptTokenRequest {
-  token: string;
-  password: string;
-}
-
-export type AcceptTokenResponse = SessionResponse;
-
-export interface VerifyTokenResponse extends OkResponse {
-  username: string;
-}
-
-export type SendRestorePasswordResponse = OkResponse;
-
-export interface CaptchaRequest {
-  captcha?: string;
-}
-
-export interface GoogleAuthRequest {
-  token: string;
-}
-
-export interface FaceBookAuthRequest {
-  token: string;
-}
-
-export interface ValidateUserRequest {
-  username: string;
-}
-
-export interface SignUpRequest {
-  username: string;
-  password: string;
-  email?: string;
-  sex?: Gender;
-}
-
-export interface ConfirmEmailRequest {
-  token: string;
-}
-
-export type ConfirmEmailResponse = OkResponse;
-
-export interface SessionResponse {
-  session: string;
-}
-
-export type SignInResponse = SessionResponse;
-
-export type SignUpResponse = SessionResponse;
-
-export interface OkResponse {
-  ok: true;
-}
-
-export type ValidateUserResponse = OkResponse;
-
-export type ValidateEmailResponse = OkResponse;
-
-export interface ValidateUserEmailRequest {
-  email: string;
-}
-
-export interface SaveFileResponse {
-  id: number;
-  previewId?: number;
-  symbol: string;
-}
-
-export interface SaveFileRequest {
-  file: Blob;
-  name?: string;
-  symbol: string;
-  type: ImageType;
-}
diff --git a/newback/src/data/shared/ws.in.messages.ts b/newback/src/data/shared/ws.in.messages.ts
index 6cf356ed5..05395c10b 100644
--- a/newback/src/data/shared/ws.in.messages.ts
+++ b/newback/src/data/shared/ws.in.messages.ts
@@ -2,7 +2,6 @@ import type {
   AcceptFileContent,
   AddRoomBase,
   BrowserBase,
-  CallBackMessage,
   ChangeUserOnlineBase,
   ChannelDto, LocationDto,
   MessageModelDto,
@@ -17,208 +16,188 @@ import type {
   UserProfileDto,
   UserProfileDtoWoImage,
   UserSettingsDto,
-  WebRtcDefaultMessage
-} from '@/ts/types/shared/dto';
-import {
+  WebRtcDefaultMessage,
+} from "./dto";
+import type {
   DefaultMessage,
-  HandlerName
-} from "@/ts/types/shared/common";
-import {MessageStatus} from "@/ts/types/shared/enums";
-
-
-export interface DefaultInMessage<A extends string, H extends HandlerName> extends DefaultMessage <A> {
-  handler: H;
-}
-
-export interface GetCountryCodeWsInMessage extends DefaultInMessage<"getCountryCode", "void"> {
-  content: Record<string, LocationDto>;
-}
-
-export interface DefaultWsInMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H>, CallBackMessage {
-  cbBySender?: string;
-  cbId?: number;
-}
-
-export interface ShowITypeWsInMessage extends DefaultWsInMessage<"showIType", "room"> {
-  roomId: number;
-  userId: number;
-}
-
+  HandlerName,
+} from "./common";
+import type {MessageStatus} from "./enums";
 
-export interface DeleteMessage extends DefaultWsInMessage<"deleteMessage", "ws-message"> {
-  roomId: number;
-  id: number;
-  edited: number;
-}
-
-
-export interface SetMessageStatusWsInMessage extends DefaultWsInMessage<"setMessageStatus", "ws-message"> {
-  roomId: number;
-  status: MessageStatus;
-  messagesIds: number[];
-}
-
-export interface EditMessage extends DefaultWsInMessage<"editMessage", "ws-message">, MessageModelDto {
-}
 
-export interface PrintMessageWsInMessage extends DefaultWsInMessage<"printMessage", "ws-message"> {
-  message: MessageModelDto;
-}
-
-export interface AddOnlineUserMessage extends DefaultWsInMessage<"addOnlineUser", "room">, ChangeUserOnlineBase {
+interface AddOnlineUserBodyMessage extends ChangeUserOnlineBase {
   opponentWsId: string;
 }
-
-export interface CreateNewUsedMessage extends DefaultWsInMessage<"createNewUser", "room">, UserDto {
-  id: number;
-  rooms: {
-    roomId: number;
-    users: number[];
-  }[];
-}
-
-export interface RemoveOnlineUserMessage extends DefaultWsInMessage<"removeOnlineUser", "room">, ChangeUserOnlineBase {
-}
-
-export interface DeleteRoomMessage extends DefaultWsInMessage<"deleteRoom", "room"> {
-  roomId: number;
-}
-
-
-export interface LeaveUserMessage extends DefaultWsInMessage<"leaveUser", "room"> {
-  roomId: number;
-  userId: number;
-  users: number[];
-}
-
-export interface AddChannelMessage extends DefaultWsInMessage<"addChannel", "room">, ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
-  channelUsers: number[];
-}
-
-export interface InviteUserMessage extends NewRoom, RoomExistedBefore, DefaultWsInMessage<"inviteUser", "room"> {
-  roomId: number;
-  users: number[];
-}
-
-export interface AddInviteMessage extends AddRoomBase, RoomExistedBefore, DefaultWsInMessage<"addInvite", "room"> {
-}
-
-export interface SaveChannelSettingsMessage extends DefaultWsInMessage<"saveChannelSettings", "room">, ChannelDto {
-  notifications: boolean;
-  volume: number;
-  p2p: boolean;
-  userId: number;
-}
-
-export interface DeleteChannelMessage extends DefaultWsInMessage<"deleteChannel", "room"> {
-  channelId: number;
-  roomIds: number[];
-}
-
-export interface SaveRoomSettingsMessage extends DefaultWsInMessage<"saveRoomSettings", "room">, RoomNoUsersDto {
-}
-
-
-export interface SetWsIdMessage extends DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
-  rooms: RoomDto[];
-  channels: ChannelDto[];
-  users: UserDto[];
-  online: Record<number, string[]>;
-  time: number;
-  profile: UserProfileDto;
-  settings: UserSettingsDto;
-}
-
-export interface WebRtcSetConnectionIdMessage extends WebRtcDefaultMessage, DefaultWsInMessage<"setConnectionId", "void"> {
-  time: number;
-}
-
-export interface AddRoomMessage extends AddRoomBase, DefaultWsInMessage<"addRoom", "room"> {
-  channelUsers: number[];
-  channelId: number;
-}
-
-export interface OfferFile extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerFile", "webrtc"> {
-  content: OfferFileContent;
-  roomId: number;
-  threadId: number | null;
-  userId: number;
-  time: number;
-}
-
-export interface OfferCall extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerCall", "webrtc"> {
-  content: BrowserBase;
-  roomId: number;
-  userId: number;
-  time: number;
-}
-
-export interface ReplyCallMessage extends ReplyWebRtc, DefaultWsInMessage<"replyCall", "webrtcTransfer:*"> {
-
-}
-
-export interface NotifyCallActiveMessage extends DefaultWsInMessage<"notifyCallActive", "webrtc">, WebRtcDefaultMessage, OpponentWsId {
-  roomId: number;
-  userId: number;
-}
-
-export interface DestroyCallConnection extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"destroyCallConnection", "peerConnection:*"> {
-  content: string;
-}
-
-export interface OfferMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerMessage", "webrtc"> {
-  content: BrowserBase;
-  roomId: number;
-  userId: number;
-  time: number;
-}
-
-export interface SetSettingsMessage extends DefaultWsInMessage<"setSettings", "ws"> {
-  content: UserSettingsDto;
-}
-
-export interface SetUserProfileMessage extends DefaultWsInMessage<"setUserProfile", "ws"> {
-  content: UserProfileDtoWoImage;
-}
-
-export interface UserProfileChangedMessage extends DefaultWsInMessage<"userProfileChanged", "ws">, UserDto {
-
-}
-
-export interface GrowlMessage extends DefaultWsInMessage<"growlError", "void"> {
-  content: string;
-  action: "growlError";
-}
-
-export interface PingMessage extends DefaultWsInMessage<"ping", "ws"> {
-  time: string;
-}
-
-export interface PongMessage extends DefaultWsInMessage<"pong", "ws"> {
-  time: string;
-}
-
-export interface ReplyFileMessage extends ReplyWebRtc, DefaultWsInMessage<"replyFile", "webrtcTransfer:*"> {
-
-}
-
-export interface SetProfileImageMessage extends DefaultWsInMessage<"setProfileImage", "ws"> {
-  content: string;
-}
-
-export interface AcceptCallMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"acceptCall", "webrtcTransfer:*"> {
-}
-
-export interface AcceptFileMessage extends DefaultWsInMessage<"acceptFile", "peerConnection:*"> {
-  content: AcceptFileContent;
-}
-
-export interface SendRtcDataMessage extends WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"sendRtcData", "peerConnection:*"> {
-  content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
-}
-
-export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*">;
-
-export interface DestroyFileConnectionMessage extends DefaultWsInMessage<"destroyFileConnection", "peerConnection:*"> {
-  content: "decline" | "success";
-}
+export type AddOnlineUserMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserBodyMessage>;
+
+
+// Export type EditMessage = DefaultWsInMessage<"editMessage", "ws-message", MessageModelDto>;
+
+/*
+ * Export type DeleteMessage = DefaultWsInMessage<"deleteMessage", "ws-message", {
+ *   roomId: number;
+ *   id: number;
+ *   edited: number;
+ * }>;
+ */
+/*
+ * Export interface CreateNewUserBodyMessage extends UserDto {
+ *   rooms: {
+ *     roomId: number;
+ *     users: number[];
+ *   }[];
+ * }
+ *
+ * export type CreateNewUsedMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserBodyMessage>;
+ *
+ * export type RemoveOnlineUserMessage = DefaultWsInMessage<"removeOnlineUser", "room", ChangeUserOnlineBase>;
+ *
+ *
+ * export type DeleteRoomMessage = DefaultWsInMessage<"deleteRoom", "room", {
+ *   roomId: number;
+ * }>;
+ *
+ *
+ * export type LeaveUserMessage = DefaultWsInMessage<"leaveUser", "room", {
+ *   roomId: number;
+ *   userId: number;
+ *   users: number[];
+ * }>;
+ *
+ * export interface AddChannelMessageBody extends ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
+ *   channelUsers: number[];
+ * }
+ * export type AddChannelMessage = DefaultWsInMessage<"addChannel", "room", AddChannelMessageBody>;
+ *
+ * export interface InviteUserMessageBody extends NewRoom, RoomExistedBefore {
+ *   roomId: number;
+ *   users: number[];
+ * }
+ * export type InviteUserMessage = DefaultWsInMessage<"inviteUser", "room", InviteUserMessageBody>;
+ */
+
+/*
+ *
+ * Export type AddInviteMessage = AddRoomBase, RoomExistedBefore, DefaultWsInMessage<"addInvite", "room"> {
+ * }
+ *
+ * export type SaveChannelSettingsMessage = DefaultWsInMessage<"saveChannelSettings", "room">, ChannelDto {
+ *   notifications: boolean;
+ *   volume: number;
+ *   p2p: boolean;
+ *   userId: number;
+ * }
+ *
+ * export type DeleteChannelMessage = DefaultWsInMessage<"deleteChannel", "room"> {
+ *   channelId: number;
+ *   roomIds: number[];
+ * }
+ *
+ * export type SaveRoomSettingsMessage = DefaultWsInMessage<"saveRoomSettings", "room">, RoomNoUsersDto {
+ * }
+ *
+ *
+ * export type SetWsIdMessage = DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
+ *   rooms: RoomDto[];
+ *   channels: ChannelDto[];
+ *   users: UserDto[];
+ *   online: Record<number, string[]>;
+ *   time: number;
+ *   profile: UserProfileDto;
+ *   settings: UserSettingsDto;
+ * }
+ *
+ * export type WebRtcSetConnectionIdMessage = WebRtcDefaultMessage, DefaultWsInMessage<"setConnectionId", "void"> {
+ *   time: number;
+ * }
+ *
+ * export type AddRoomMessage = AddRoomBase, DefaultWsInMessage<"addRoom", "room"> {
+ *   channelUsers: number[];
+ *   channelId: number;
+ * }
+ *
+ * export type OfferFile = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerFile", "webrtc"> {
+ *   content: OfferFileContent;
+ *   roomId: number;
+ *   threadId: number | null;
+ *   userId: number;
+ *   time: number;
+ * }
+ *
+ * export type OfferCall = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerCall", "webrtc"> {
+ *   content: BrowserBase;
+ *   roomId: number;
+ *   userId: number;
+ *   time: number;
+ * }
+ *
+ * export type ReplyCallMessage = ReplyWebRtc, DefaultWsInMessage<"replyCall", "webrtcTransfer:*"> {
+ *
+ * }
+ *
+ * export type NotifyCallActiveMessage = DefaultWsInMessage<"notifyCallActive", "webrtc">, WebRtcDefaultMessage, OpponentWsId {
+ *   roomId: number;
+ *   userId: number;
+ * }
+ *
+ * export type DestroyCallConnection = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"destroyCallConnection", "peerConnection:*"> {
+ *   content: string;
+ * }
+ *
+ * export type OfferMessage = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerMessage", "webrtc"> {
+ *   content: BrowserBase;
+ *   roomId: number;
+ *   userId: number;
+ *   time: number;
+ * }
+ *
+ * export type SetSettingsMessage = DefaultWsInMessage<"setSettings", "ws"> {
+ *   content: UserSettingsDto;
+ * }
+ *
+ * export type SetUserProfileMessage = DefaultWsInMessage<"setUserProfile", "ws"> {
+ *   content: UserProfileDtoWoImage;
+ * }
+ *
+ * export type UserProfileChangedMessage = DefaultWsInMessage<"userProfileChanged", "ws">, UserDto {
+ *
+ * }
+ *
+ * export type GrowlMessage = DefaultWsInMessage<"growlError", "void"> {
+ *   content: string;
+ *   action: "growlError";
+ * }
+ *
+ * export type PingMessage = DefaultWsInMessage<"ping", "ws"> {
+ *   time: string;
+ * }
+ *
+ * export type PongMessage = DefaultWsInMessage<"pong", "ws"> {
+ *   time: string;
+ * }
+ *
+ * export type ReplyFileMessage = ReplyWebRtc, DefaultWsInMessage<"replyFile", "webrtcTransfer:*"> {
+ *
+ * }
+ *
+ * export type SetProfileImageMessage = DefaultWsInMessage<"setProfileImage", "ws"> {
+ *   content: string;
+ * }
+ *
+ * export type AcceptCallMessage = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"acceptCall", "webrtcTransfer:*"> {
+ * }
+ *
+ * export type AcceptFileMessage = DefaultWsInMessage<"acceptFile", "peerConnection:*"> {
+ *   content: AcceptFileContent;
+ * }
+ *
+ * export type SendRtcDataMessage = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"sendRtcData", "peerConnection:*"> {
+ *   content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
+ * }
+ *
+ * export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*">;
+ *
+ * export type DestroyFileConnectionMessage = DefaultWsInMessage<"destroyFileConnection", "peerConnection:*"> {
+ *   content: "decline" | "success";
+ * }
+ */
diff --git a/newback/src/data/shared/ws.out.messages.ts b/newback/src/data/shared/ws.out.messages.ts
deleted file mode 100644
index 6be31873b..000000000
--- a/newback/src/data/shared/ws.out.messages.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import type {DefaultMessage} from "@/ts/types/shared/common";
-import type {MessageStatus} from "@/ts/types/shared/enums";
-import type {GiphyDto} from "@/ts/types/shared/dto";
-
-
-export interface DefaultWsOutMessage<A extends string> extends DefaultMessage<A> {
-  cbId?: number;
-}
-
-export interface ShowITypeWsOutMessage extends DefaultWsOutMessage<"showIType"> {
-  roomId: number;
-}
-
-export interface SetMessageStatusWsOutMessage extends DefaultWsOutMessage<"setMessageStatus"> {
-  messagesIds: number[];
-  status: MessageStatus;
-  roomId: number;
-}
-
-export type GetCountryCodeWsOutMessage = DefaultWsOutMessage<"getCountryCode">;
-
-export interface SyncHistoryWsOutMessage extends DefaultWsOutMessage<"syncHistory"> {
-  roomIds: number[];
-  messagesIds: number[];
-  onServerMessageIds: number[];
-  receivedMessageIds: number[];
-  lastSynced: number;
-}
-
-export interface PrintMessageWsOutMessage extends DefaultWsOutMessage<"printMessage"> {
-  content: string;
-  roomId: number;
-  files: number[];
-  id: number;
-  timeDiff: number;
-  parentMessage: number | null;
-  tags: Record<string, number>;
-  giphies: GiphyDto[];
-}
diff --git a/newback/src/data/transformers/helper/generate.user.name.ts b/newback/src/data/transformers/helper/generate.user.name.ts
index b4b0cf851..f674f2179 100644
--- a/newback/src/data/transformers/helper/generate.user.name.ts
+++ b/newback/src/data/transformers/helper/generate.user.name.ts
@@ -1,4 +1,4 @@
-import {MAX_USERNAME_LENGTH} from '@/data/consts';
+import {MAX_USERNAME_LENGTH} from "@/data/consts";
 
 export function generateUserName(email: string) {
   return email.split("@")[0].replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, MAX_USERNAME_LENGTH);
diff --git a/newback/src/data/transformers/helper/get.max.symbol.ts b/newback/src/data/transformers/helper/get.max.symbol.ts
index 005267686..efe566c2d 100644
--- a/newback/src/data/transformers/helper/get.max.symbol.ts
+++ b/newback/src/data/transformers/helper/get.max.symbol.ts
@@ -1,5 +1,34 @@
-import {UploadedFileModel} from '@/data/model/uploaded.file.model';
-import { GiphyDto } from '@/data/shared/dto';
+import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
+import {GiphyDto} from '@common/model/dto/giphy.dto';
+import {ChannelDto} from '@common/model/dto/channel.dto';
+import {FileModelDto} from '@common/model/dto/file.model.dto';
+import {LocationDto} from '@common/model/dto/location.dto';
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
+import {RoomDto} from '@common/model/dto/room.dto';
+import {UserDto} from '@common/model/dto/user.dto';
+import {UserProfileDto} from '@common/model/dto/user.profile.dto';
+import {UserSettingsDto} from '@common/model/dto/user.settings.dto';
 
 
 export function getMaxSymbol(files: UploadedFileModel[], tags: Record<string, number>, giphies: GiphyDto[]) {
diff --git a/newback/src/data/transformers/model/channel.transformer.ts b/newback/src/data/transformers/model/channel.transformer.ts
index 6bfa5858b..0b0eb41e3 100644
--- a/newback/src/data/transformers/model/channel.transformer.ts
+++ b/newback/src/data/transformers/model/channel.transformer.ts
@@ -1,5 +1,5 @@
-import {ChannelModel} from '@/data/model/channel.model';
-import { ChannelDto } from '@/data/shared/dto';
+import type {ChannelModel} from "@/data/model/channel.model";
+
 
 
 export function transformChannelDto(c: ChannelModel): ChannelDto {
diff --git a/newback/src/data/transformers/model/image.transformer.ts b/newback/src/data/transformers/model/image.transformer.ts
index f230bebf4..f9b68aaeb 100644
--- a/newback/src/data/transformers/model/image.transformer.ts
+++ b/newback/src/data/transformers/model/image.transformer.ts
@@ -1,8 +1,8 @@
 import type {ImageModel} from "@/data/model/image.model";
 import type {MessageModel} from "@/data/model/message.model";
-import type {PureModel,} from "@/data/types/internal";
-import { FileModelDto } from '@/data/shared/dto';
-import { ImageType } from '@/data/shared/enums';
+import type {PureModel} from "@/data/types/internal";
+
+
 
 export function getUrl(value: PureModel<ImageModel>, attribute: "img" | "preview") {
   return value.type === ImageType.GIPHY ? value.img : `/photo/${value[attribute]}`;
diff --git a/newback/src/data/transformers/model/mention.transformer.ts b/newback/src/data/transformers/model/mention.transformer.ts
index 88c23c027..b444f1d8f 100644
--- a/newback/src/data/transformers/model/mention.transformer.ts
+++ b/newback/src/data/transformers/model/mention.transformer.ts
@@ -2,7 +2,7 @@ import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {MessageModel} from "@/data/model/message.model";
 import type {
   CreateModel,
-  PureModel
+  PureModel,
 } from "@/data/types/internal";
 
 export function transformMentionByPickingDto(mentions: CreateModel<MessageMentionModel>[], m: PureModel<MessageModel>): Record<string, number> {
diff --git a/newback/src/data/transformers/model/message.transformer.ts b/newback/src/data/transformers/model/message.transformer.ts
index 1a77ffdd6..489f4d069 100644
--- a/newback/src/data/transformers/model/message.transformer.ts
+++ b/newback/src/data/transformers/model/message.transformer.ts
@@ -5,9 +5,9 @@ import type {
   CreateModel,
   PureModel,
 } from "@/data/types/internal";
-import {transformMentionByPickingDto} from '@/data/transformers/model/mention.transformer';
-import {transformImageByPickingDto} from '@/data/transformers/model/image.transformer';
-import { MessageModelDto } from '@/data/shared/dto';
+import {transformMentionByPickingDto} from "@/data/transformers/model/mention.transformer";
+import {transformImageByPickingDto} from "@/data/transformers/model/image.transformer";
+
 
 
 export function transformMessageDto(message: PureModel<MessageModel>, mentions: CreateModel<MessageMentionModel>[], images: PureModel<ImageModel>[]): MessageModelDto {
diff --git a/newback/src/data/transformers/model/profile.transformer.ts b/newback/src/data/transformers/model/profile.transformer.ts
index 1fa86f1fb..391b7cfc8 100644
--- a/newback/src/data/transformers/model/profile.transformer.ts
+++ b/newback/src/data/transformers/model/profile.transformer.ts
@@ -1,5 +1,5 @@
-import {UserModel} from '@/data/model/user.model';
-import { UserProfileDto } from '@/data/shared/dto';
+import type {UserModel} from "@/data/model/user.model";
+
 
 export function transformProfileDto(user: UserModel): UserProfileDto {
   return {
diff --git a/newback/src/data/transformers/model/room.transformer.ts b/newback/src/data/transformers/model/room.transformer.ts
index 4a0920981..4f68b0344 100644
--- a/newback/src/data/transformers/model/room.transformer.ts
+++ b/newback/src/data/transformers/model/room.transformer.ts
@@ -1,6 +1,6 @@
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {GetRoomsForUser} from "@/data/types/internal";
-import { RoomDto } from '@/data/shared/dto';
+
 
 export function getTransformRoomDto(users: number[], room: GetRoomsForUser): RoomDto {
   return {
diff --git a/newback/src/data/transformers/model/settings.transformer.ts b/newback/src/data/transformers/model/settings.transformer.ts
index 899267ec0..7fc076d34 100644
--- a/newback/src/data/transformers/model/settings.transformer.ts
+++ b/newback/src/data/transformers/model/settings.transformer.ts
@@ -1,5 +1,5 @@
-import {UserModel} from '@/data/model/user.model';
-import { UserSettingsDto } from '@/data/shared/dto';
+import type {UserModel} from "@/data/model/user.model";
+
 
 export function transformSettings(user: UserModel): UserSettingsDto {
   return {
diff --git a/newback/src/data/transformers/model/user.transformer.ts b/newback/src/data/transformers/model/user.transformer.ts
index fee55f298..10990f4d2 100644
--- a/newback/src/data/transformers/model/user.transformer.ts
+++ b/newback/src/data/transformers/model/user.transformer.ts
@@ -1,5 +1,5 @@
-import {UserModel} from '@/data/model/user.model';
-import { UserDto } from '@/data/shared/dto';
+import type {UserModel} from "@/data/model/user.model";
+
 
 
 export function transformUserDto(u: UserModel): UserDto {
diff --git a/newback/src/data/transformers/out.message/add.online.user.transformer.ts b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
index 2f4cb93b4..94e0012f1 100644
--- a/newback/src/data/transformers/out.message/add.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
@@ -1,5 +1,5 @@
-import {UserModel} from '@/data/model/user.model';
-import { AddOnlineUserMessage } from '@/data/shared/ws.in.messages';
+import type {UserModel} from "@/data/model/user.model";
+
 
 export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
   return {
diff --git a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
index d55792299..fbea149da 100644
--- a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
+++ b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
@@ -1,6 +1,6 @@
-import {UserJoinedInfoModel} from '@/data/model/user.joined.info.model';
-import { GetCountryCodeWsInMessage } from '@/data/shared/ws.in.messages';
-import { LocationDto } from '@/data/shared/dto';
+import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
+
+
 
 
 export function transformUserCountries(userInfo: UserJoinedInfoModel[]): Omit<GetCountryCodeWsInMessage, "action" | "handler"> {
diff --git a/newback/src/data/transformers/out.message/inner.transformer.ts b/newback/src/data/transformers/out.message/inner.transformer.ts
index e719b8365..8b6d5f635 100644
--- a/newback/src/data/transformers/out.message/inner.transformer.ts
+++ b/newback/src/data/transformers/out.message/inner.transformer.ts
@@ -2,9 +2,9 @@ import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {ImageModel} from "@/data/model/image.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {CreateModel} from "@/data/types/internal";
-import { GiphyDto } from '@/data/shared/dto';
-import { ImageType } from '@/data/shared/enums';
-import { PrintMessageWsOutMessage } from '@/data/shared/ws.out.messages';
+
+
+
 
 
 export function getUploadedGiphies(data: GiphyDto[], messageId: number): CreateModel<ImageModel>[] {
diff --git a/newback/src/data/transformers/out.message/print.message.transformer.ts b/newback/src/data/transformers/out.message/print.message.transformer.ts
index 4e1f89474..d1f6450dc 100644
--- a/newback/src/data/transformers/out.message/print.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/print.message.transformer.ts
@@ -5,8 +5,8 @@ import type {
 } from "@/data/types/internal";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {MessageModel} from "@/data/model/message.model";
-import {transformMessageDto} from '@/data/transformers/model/message.transformer';
-import { PrintMessageWsInMessage } from '@/data/shared/ws.in.messages';
+import {transformMessageDto} from "@/data/transformers/model/message.transformer";
+
 
 export function transformPrintMessage(
   message: PureModel<MessageModel>,
diff --git a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
index 5fbb04b14..7104d08d0 100644
--- a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
@@ -1,8 +1,8 @@
-import {
+import type {
   UserOnlineData,
-  WebSocketContextData
-} from '@/data/types/internal';
-import { RemoveOnlineUserMessage } from '@/data/shared/ws.in.messages';
+  WebSocketContextData,
+} from "@/data/types/internal";
+
 
 export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage {
   return {
diff --git a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
index d2b15bb8d..e50d5a2c1 100644
--- a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
+++ b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
@@ -7,7 +7,7 @@ import {
   getRoomsOnline,
   getTransformRoomDto,
 } from "@/data/transformers/model/room.transformer";
-import { SetWsIdMessage } from '@/data/shared/ws.in.messages';
+
 
 
 export function transformSetWsId(
diff --git a/newback/src/data/transformers/out.message/sync.message.transformer.ts b/newback/src/data/transformers/out.message/sync.message.transformer.ts
index 88734efba..4d2914193 100644
--- a/newback/src/data/transformers/out.message/sync.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/sync.message.transformer.ts
@@ -1,8 +1,8 @@
-import {MessageModel} from '@/data/model/message.model';
-import {MessageMentionModel} from '@/data/model/message.mention.model';
-import {ImageModel} from '@/data/model/image.model';
-import {transformMessageDto} from '@/data/transformers/model/message.transformer';
-import { SyncHistoryWsInMessage } from '@/data/shared/dto';
+import type {MessageModel} from "@/data/model/message.model";
+import type {MessageMentionModel} from "@/data/model/message.mention.model";
+import type {ImageModel} from "@/data/model/image.model";
+import {transformMessageDto} from "@/data/transformers/model/message.transformer";
+
 
 export function getSyncMessage(
   readMessageIds: number[],
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index a0d967609..491adac09 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -2,8 +2,8 @@ import type {RoomModel} from "@/data/model/room.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {ChannelModel} from "@/data/model/channel.model";
 import type {UserModel} from "@/data/model/user.model";
-import { DefaultWsInMessage } from '@/data/shared/ws.in.messages';
-import { HandlerName } from '@/data/shared/common';
+
+
 
 export interface WebSocketContextData {
   userId: number;
diff --git a/newback/src/main.ts b/newback/src/main.ts
index c79f286da..f705e54a4 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -1,5 +1,61 @@
-import {NestFactory} from "@nestjs/core";
-import {AppModule} from "@/modules/app/app.module";
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
+import {GiphyDto} from '@common/model/dto/giphy.dto';
+import {ChannelDto} from '@common/model/dto/channel.dto';
+import {FileModelDto} from '@common/model/dto/file.model.dto';
+import {LocationDto} from '@common/model/dto/location.dto';
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
+import {RoomDto} from '@common/model/dto/room.dto';
+import {UserDto} from '@common/model/dto/user.dto';
+import {UserProfileDto} from '@common/model/dto/user.profile.dto';
+import {UserSettingsDto} from '@common/model/dto/user.settings.dto';   ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {Theme} from '@common/model/enum/theme';
+import {VerificationType} from '@common/model/enum/verification.type';
+import {GiphyDto} from '@common/model/dto/giphy.dto';
+import {ChannelDto} from '@common/model/dto/channel.dto';
+import {FileModelDto} from '@common/model/dto/file.model.dto';
+import {LocationDto} from '@common/model/dto/location.dto';
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
+import {RoomDto} from '@common/model/dto/room.dto';
+import {UserDto} from '@common/model/dto/user.dto';
+import {UserProfileDto} from '@common/model/dto/user.profile.dto';
+import {UserSettingsDto} from '@common/model/dto/user.settings.dto';import {AppModule} from "@/modules/app/app.module";
 import {config} from "node-ts-config";
 import {
   Logger,
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 2f76cc9d0..5631d2675 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -14,13 +14,12 @@ import {GoogleAuthRequestValidator} from "@/modules/api/auth/validators/google.a
 import {CaptchaGuard} from "@/modules/app/guards/captcha.guard";
 import {ValidateEmailRequestValidator} from "@/modules/api/auth/validators/validate.email.request.validator";
 import {FacebookAuthRequestValidator} from "@/modules/api/auth/validators/facebook.auth.request.validator";
-import {
-  FacebookSignInResponse, GoogleSignInResponse,
-  SignInResponse,
-  SignUpResponse,
-  ValidateEmailResponse,
-  ValidateUserResponse
-} from '@/data/shared/http';
+import type {SignInResponse} from "@common/http/auth/sign.in";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {SignUpResponse} from "@common/http/auth/sign.up";
+import type {ValidateEmailResponse} from "@common/http/auth/validte.email";
+import type {ValidateUserResponse} from "@common/http/auth/validate.user";
 
 
 @Controller({
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 786ad5c44..82dba0bba 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -17,19 +17,25 @@ import type {FacebookGetUserResponse} from "@/data/types/api";
 import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
 import {SessionService} from "@/modules/shared/session/session.service";
-import {generateUserName} from '@/data/transformers/helper/generate.user.name';
+import {generateUserName} from "@/data/transformers/helper/generate.user.name";
 import {
   ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH
-} from '@/data/consts';
-import {
-  FaceBookAuthRequest,
-  FacebookSignInResponse,
-  GoogleAuthRequest, GoogleSignInResponse, SignInRequest, SignInResponse,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import {Gender} from "@common/model/enum/gender";
+import type {
   SignUpRequest,
-  SignUpResponse
-} from '@/data/shared/http';
-import { Gender, VerificationType } from '@/data/shared/enums';
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {VerificationType} from "@common/model/enum/verification.type";
 
 @Injectable()
 export class AuthService {
diff --git a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
index ca312c1f6..1d8332601 100644
--- a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
@@ -1,5 +1,5 @@
 import {IsString} from "class-validator";
-import { FaceBookAuthRequest } from '@/data/shared/http';
+
 
 export class FacebookAuthRequestValidator implements FaceBookAuthRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
index 4a2427506..ef23edef0 100644
--- a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -1,5 +1,6 @@
 import {IsString} from "class-validator";
-import { GoogleAuthRequest } from '@/data/shared/http';
+import {GoogleAuthRequest} from '@common/http/auth/google.auth';
+
 
 export class GoogleAuthRequestValidator implements GoogleAuthRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/login.request.validator.ts b/newback/src/modules/api/auth/validators/login.request.validator.ts
index 4215808e2..8cd2a7f83 100644
--- a/newback/src/modules/api/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/login.request.validator.ts
@@ -4,7 +4,7 @@ import {
   Matches,
   ValidateIf,
 } from "class-validator";
-import { SignInRequest } from '@/data/shared/http';
+
 
 export class LoginRequestValidator implements SignInRequest {
   @ValidateIf((o) => !o.email || o.username)
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index 487e5ded2..ed8554f4d 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -6,9 +6,9 @@ import {
   Length,
   Matches,
 } from "class-validator";
-import {MAX_USERNAME_LENGTH} from '@/data/consts';
-import { SignUpRequest } from '@/data/shared/http';
-import { Gender } from '@/data/shared/enums';
+import {MAX_USERNAME_LENGTH} from "@/data/consts";
+
+
 
 
 export class SignUpRequestValidator implements SignUpRequest {
diff --git a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
index f40e4a9e7..917d7045d 100644
--- a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
@@ -2,7 +2,7 @@ import {
   IsEmail,
   IsString,
 } from "class-validator";
-import { ValidateUserEmailRequest } from '@/data/shared/http';
+
 
 export class ValidateEmailRequestValidator implements ValidateUserEmailRequest {
   @IsString()
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index af7ff9095..3917ba836 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -3,8 +3,8 @@ import {
   Length,
   Matches,
 } from "class-validator";
-import {MAX_USERNAME_LENGTH} from '@/data/consts';
-import { ValidateUserRequest } from '@/data/shared/http';
+import {MAX_USERNAME_LENGTH} from "@/data/consts";
+
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {
   @IsString()
diff --git a/newback/src/modules/api/file/file.controller.ts b/newback/src/modules/api/file/file.controller.ts
index b42e0d44d..ad2175e0f 100644
--- a/newback/src/modules/api/file/file.controller.ts
+++ b/newback/src/modules/api/file/file.controller.ts
@@ -10,7 +10,8 @@ import {FileInterceptor} from "@nestjs/platform-express";
 import {AuthGuard} from "@/modules/app/guards/auth.guard";
 import {UserId} from "@/modules/app/decorators/user.id.decorator";
 import {FileService} from "@/modules/api/file/file.service";
-import { SaveFileRequest, SaveFileResponse } from '@/data/shared/http';
+
+
 
 
 @Controller({
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index ef36183e8..4b7ce8e07 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -7,8 +7,8 @@ import {MessageRepository} from "@/modules/shared/database/repository/messages.r
 import type {FileSaveResponse} from "@/data/types/internal";
 import {Sequelize} from "sequelize-typescript";
 import {ImageService} from "@/modules/api/file/image.service";
-import { ImageType } from '@/data/shared/enums';
-import { SaveFileResponse } from '@/data/shared/http';
+
+
 
 @Injectable()
 export class FileService {
diff --git a/newback/src/modules/api/file/image.service.ts b/newback/src/modules/api/file/image.service.ts
index 1047ffe81..64ee3bb88 100644
--- a/newback/src/modules/api/file/image.service.ts
+++ b/newback/src/modules/api/file/image.service.ts
@@ -12,7 +12,7 @@ import {
   writeFile,
 } from "fs/promises";
 import type {FileSaveResponse} from "@/data/types/internal";
-import { ImageType } from '@/data/shared/enums';
+
 
 @Injectable()
 export class ImageService {
diff --git a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
index 1bd7efb56..79ff07bd5 100644
--- a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
@@ -3,7 +3,21 @@ import {
   Length,
   Matches,
 } from "class-validator";
-import { AcceptTokenRequest } from '@/data/shared/http';
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import {Gender} from "@common/model/enum/gender";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {AcceptTokenRequest} from '@common/http/verify/accept.token';
 
 
 export class AcceptTokenRequestValidator implements AcceptTokenRequest {
diff --git a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
index e21fe4daf..3b1218237 100644
--- a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
@@ -1,5 +1,5 @@
 import {IsString} from "class-validator";
-import { ConfirmEmailRequest } from '@/data/shared/http';
+
 
 
 export class ConfirmEmailRequestValidator implements ConfirmEmailRequest {
diff --git a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
index f1c23dbfa..7111af9f3 100644
--- a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
+++ b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
@@ -4,7 +4,7 @@ import {
   Matches,
   ValidateIf,
 } from "class-validator";
-import { SendRestorePasswordRequest } from '@/data/shared/http';
+
 
 export class SendRestorePasswordValidator implements SendRestorePasswordRequest {
   @ValidateIf((o) => !o.email || o.username)
diff --git a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
index 6400d91d0..97cae2257 100644
--- a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
@@ -1,5 +1,5 @@
 import {IsString} from "class-validator";
-import { VerifyTokenRequest } from '@/data/shared/http';
+
 
 
 export class VerifyTokenRequestValidator implements VerifyTokenRequest {
diff --git a/newback/src/modules/api/verify/verify.controller.ts b/newback/src/modules/api/verify/verify.controller.ts
index d7e3906ec..0dc01016c 100644
--- a/newback/src/modules/api/verify/verify.controller.ts
+++ b/newback/src/modules/api/verify/verify.controller.ts
@@ -11,12 +11,7 @@ import {VerifyTokenRequestValidator} from "@/modules/api/verify/validators/verif
 import {ConfirmEmailRequestValidator} from "@/modules/api/verify/validators/confirm.email.request.validator";
 import {AcceptTokenRequestValidator} from "@/modules/api/verify/validators/accept.token.request.validator";
 import {VerifyService} from "@/modules/api/verify/verify.service";
-import {
-  AcceptTokenResponse,
-  ConfirmEmailResponse,
-  SendRestorePasswordResponse,
-  VerifyTokenResponse
-} from '@/data/shared/http';
+
 
 
 @Controller({
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index e636c3beb..60b8d018b 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -11,13 +11,8 @@ import type {VerificationModel} from "@/data/model/verification.model";
 import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
 import {SessionService} from "@/modules/shared/session/session.service";
-import {
-  AcceptTokenRequest,
-  AcceptTokenResponse, ConfirmEmailRequest,
-  SendRestorePasswordRequest,
-  VerifyTokenResponse
-} from '@/data/shared/http';
-import { VerificationType } from '@/data/shared/enums';
+
+
 
 @Injectable()
 export class VerifyService {
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 8a54755ae..7c4a9daa1 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -12,21 +12,17 @@ import {Sequelize} from "sequelize-typescript";
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
-import {getSyncMessage} from '@/data/transformers/out.message/sync.message.transformer';
+import {getSyncMessage} from "@/data/transformers/out.message/sync.message.transformer";
 import {
   getMentionsFromTags,
   getUploadedGiphies,
-  groupUploadedFileToImages
-} from '@/data/transformers/out.message/inner.transformer';
-import {transformPrintMessage} from '@/data/transformers/out.message/print.message.transformer';
-import {getMaxSymbol} from '@/data/transformers/helper/get.max.symbol';
-import {
-  PrintMessageWsOutMessage,
-  ShowITypeWsOutMessage,
-  SyncHistoryWsOutMessage
-} from '@/data/shared/ws.out.messages';
-import { MessageStatus } from '@/data/shared/enums';
-import { ShowITypeWsInMessage } from '@/data/shared/ws.in.messages';
+  groupUploadedFileToImages,
+} from "@/data/transformers/out.message/inner.transformer";
+import {transformPrintMessage} from "@/data/transformers/out.message/print.message.transformer";
+import {getMaxSymbol} from "@/data/transformers/helper/get.max.symbol";
+
+
+
 
 @Injectable()
 export class MessageService {
@@ -43,8 +39,10 @@ export class MessageService {
     const body: ShowITypeWsInMessage = {
       action: "showIType",
       handler: "room",
-      roomId: data.roomId,
-      userId: context.userId,
+      data: {
+        roomId: data.data.roomId,
+        userId: context.userId,
+      },
     };
     this.pubsubService.emit(
       "sendToClient",
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index c5a91e3cc..e13ee5126 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -10,10 +10,10 @@ import {
   Server,
   WebSocket,
 } from "ws";
+import type {OnWsClose} from "@/data/types/internal";
 import {
-  OnWsClose,
   SendToClientPubSubMessage,
-  WebSocketContextData
+  WebSocketContextData,
 } from "@/data/types/internal";
 import {
   Logger,
@@ -30,14 +30,9 @@ import {CatchWsErrors} from "@/modules/app/decorators/catch.ws.errors";
 import {MessagesFromMyRoomGuard} from "@/modules/app/guards/own.message.guard";
 import type {NestGateway} from "@nestjs/websockets/interfaces/nest-gateway.interface";
 import {OwnRoomGuard} from "@/modules/app/guards/own.room.guard";
-import {
-  GetCountryCodeWsOutMessage,
-  PrintMessageWsOutMessage,
-  ShowITypeWsOutMessage,
-  SyncHistoryWsOutMessage
-} from '@/data/shared/ws.out.messages';
-import { SyncHistoryWsInMessage } from '@/data/shared/dto';
-import { GetCountryCodeWsInMessage } from '@/data/shared/ws.in.messages';
+
+
+
 
 @WebSocketGateway({
   path: "/ws",
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 7b83e1332..e69437f6a 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -12,9 +12,8 @@ import type {WebSocketContextData} from "@/data/types/internal";
 import {RedisService} from "@/modules/shared/redis/redis.service";
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import {transformSetWsId} from "@/data/transformers/out.message/set.ws.id.transformer";
-import {transformAddUserOnline} from '@/data/transformers/out.message/add.online.user.transformer';
-import {getLogoutMessage} from '@/data/transformers/out.message/remove.online.user.transformer';
-import { AddOnlineUserMessage } from '@/data/shared/ws.in.messages';
+import {transformAddUserOnline} from "@/data/transformers/out.message/add.online.user.transformer";
+import {getLogoutMessage} from "@/data/transformers/out.message/remove.online.user.transformer";
 
 
 
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index d557b1bfd..1672b90bc 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -8,8 +8,8 @@ import type {WebSocketContextData} from "@/data/types/internal";
 import {ConfigService} from "@/modules/shared/config/config.service";
 import {ValidationException} from "@/data/exceptions/validation.exception";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
-import {transformUserCountries} from '@/data/transformers/out.message/get.user.contries.transformer';
-import { GetCountryCodeWsInMessage } from '@/data/shared/ws.in.messages';
+import {transformUserCountries} from "@/data/transformers/out.message/get.user.contries.transformer";
+
 
 
 @Injectable()
diff --git a/newback/src/modules/api/websocket/ws.exception.filter.ts b/newback/src/modules/api/websocket/ws.exception.filter.ts
index 29944e890..a7df5a787 100644
--- a/newback/src/modules/api/websocket/ws.exception.filter.ts
+++ b/newback/src/modules/api/websocket/ws.exception.filter.ts
@@ -5,7 +5,7 @@ import type {
 } from "@nestjs/common";
 import {Catch} from "@nestjs/common";
 import type {WebSocket} from "ws";
-import { GrowlMessage } from '@/data/shared/ws.in.messages';
+
 
 @Catch(Error) // If we provide it on module Websocket it will also affect http,so fuck it
 // Since we can't decouple this from WebSocketGateway, it should be in this file
diff --git a/newback/src/modules/app/decorators/catch.ws.errors.ts b/newback/src/modules/app/decorators/catch.ws.errors.ts
index 20f832de2..c2e33219e 100644
--- a/newback/src/modules/app/decorators/catch.ws.errors.ts
+++ b/newback/src/modules/app/decorators/catch.ws.errors.ts
@@ -1,7 +1,7 @@
 import type {Logger} from "@nestjs/common";
 import {UnauthorizedException} from "@nestjs/common";
 import type {OnGatewayConnection} from "@nestjs/websockets";
-import { WS_SESSION_EXPIRED_CODE } from '@/data/shared/consts';
+
 
 export function processErrors(e, socket, logger: Logger) {
   logger.error(`Ws error ${e.message}`, e.stack, "ws");
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
index 9f1c9f331..b6ad5fbba 100644
--- a/newback/src/modules/app/guards/own.message.guard.ts
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -8,7 +8,7 @@ import {
 } from "@nestjs/common";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
-import { DefaultWsOutMessage } from '@/data/shared/ws.out.messages';
+
 
 
 export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
diff --git a/newback/src/modules/app/guards/own.room.guard.ts b/newback/src/modules/app/guards/own.room.guard.ts
index 66455c71b..a13acb304 100644
--- a/newback/src/modules/app/guards/own.room.guard.ts
+++ b/newback/src/modules/app/guards/own.room.guard.ts
@@ -8,7 +8,7 @@ import {
 } from "@nestjs/common";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
-import { DefaultWsOutMessage } from '@/data/shared/ws.out.messages';
+
 
 export const OwnRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
   @Injectable()
diff --git a/newback/src/modules/shared/database/database.module.ts b/newback/src/modules/shared/database/database.module.ts
index 2c3319b8c..72c72fc97 100644
--- a/newback/src/modules/shared/database/database.module.ts
+++ b/newback/src/modules/shared/database/database.module.ts
@@ -24,7 +24,7 @@ import {RoomRepository} from "@/modules/shared/database/repository/room.reposito
 import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
 import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
-import {generateOrmConfig} from '@/utils/generate.orm.config';
+import {generateOrmConfig} from "@/utils/generate.orm.config";
 
 const repositories = [
   UserRepository,
diff --git a/newback/src/modules/shared/database/repository/messages.repository.ts b/newback/src/modules/shared/database/repository/messages.repository.ts
index 5384f3c5b..5bf1c31ca 100644
--- a/newback/src/modules/shared/database/repository/messages.repository.ts
+++ b/newback/src/modules/shared/database/repository/messages.repository.ts
@@ -11,7 +11,7 @@ import {ImageModel} from "@/data/model/image.model";
 import {MessageMentionModel} from "@/data/model/message.mention.model";
 import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {CreateModel} from "@/data/types/internal";
-import { MessageStatus } from '@/data/shared/enums';
+
 
 
 @Injectable()
diff --git a/newback/src/modules/shared/database/repository/user.repository.ts b/newback/src/modules/shared/database/repository/user.repository.ts
index 7b9d67342..cafda3c4c 100644
--- a/newback/src/modules/shared/database/repository/user.repository.ts
+++ b/newback/src/modules/shared/database/repository/user.repository.ts
@@ -6,7 +6,7 @@ import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
 import type {Transaction} from "sequelize";
 import {Op} from "sequelize";
-import { Gender } from '@/data/shared/enums';
+
 
 
 @Injectable()
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
index a68332ca5..cb0b473c0 100644
--- a/newback/src/modules/shared/pubsub/pubsub.service.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.service.ts
@@ -5,9 +5,9 @@ import {
 } from "@nestjs/common";
 import type {
   PubSubMessage,
-  WebSocketContextData
+  WebSocketContextData,
 } from "@/data/types/internal";
-import { HandlerName } from '@/data/shared/common';
+
 
 
 interface HandlerType {
diff --git a/newback/src/modules/shared/redis/redis.service.ts b/newback/src/modules/shared/redis/redis.service.ts
index 6fb61554d..35a10b819 100644
--- a/newback/src/modules/shared/redis/redis.service.ts
+++ b/newback/src/modules/shared/redis/redis.service.ts
@@ -8,7 +8,7 @@ import {
 } from "@nestjs-modules/ioredis";
 import type {UserOnlineData} from "@/data/types/internal";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
-import { REDIS_KEYS } from "@/data/consts";
+import {REDIS_KEYS} from "@/data/consts";
 
 @Injectable()
 export class RedisService {
diff --git a/newback/src/modules/shared/ws.adapter/ws.adapter.ts b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
index 7594ae6a2..577b6c203 100644
--- a/newback/src/modules/shared/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
@@ -24,8 +24,14 @@ import {
   WebSocketServer,
 } from "ws";
 import {processErrors} from "@/modules/app/decorators/catch.ws.errors";
-import { DefaultWsInMessage } from '@/data/shared/ws.in.messages';
-import { DefaultWsOutMessage } from '@/data/shared/ws.out.messages';
+import {
+  DefaultWsInMessage,
+  ResponseWsInMessage
+} from '@/data/shared/ws.in.messages';
+import {
+  DefaultWsOutMessage,
+  DefaultWsOutRequestMessage
+} from '@/data/shared/ws.out.messages';
 
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
@@ -108,7 +114,7 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
     handlers: MessageMappingProperties[],
   ) {
     client.on(MESSAGE_METADATA, async(data) => {
-      let parsed: DefaultWsOutMessage<any>;
+      let parsed: DefaultWsOutMessage<any, any>;
       try {
         const s = String(data);
         if (s.length > 2000) {
@@ -129,14 +135,15 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
         }
         const result = await handler.callback(parsed);
         if (result) {
-          if (!parsed.cbId) {
+          if (!(parsed as DefaultWsOutRequestMessage<any, any>).cbId) {
             throw new InternalServerErrorException(`Gateway ${parsed.action} returned result ${result}, without having cbId`);
           }
-          const response: DefaultWsInMessage<any, any> = {
+          const response: ResponseWsInMessage<any, any, any> = {
             cbBySender: (client as any).context.id,
-            cbId: parsed.cbId,
+            cbId: (parsed as DefaultWsOutRequestMessage<any, any>).cbId,
             handler: "void",
-            ...result,
+            action:
+            data: result,
           };
           client.send(response);
         }
diff --git a/newback/src/utils/generate.orm.config.ts b/newback/src/utils/generate.orm.config.ts
index 9f522e812..3479eeee5 100644
--- a/newback/src/utils/generate.orm.config.ts
+++ b/newback/src/utils/generate.orm.config.ts
@@ -34,6 +34,3 @@ export function generateOrmConfig(logging: ((sql: string) => void)): Omit<Sequel
 }
 
 
-
-
-
diff --git a/newback/src/utils/jest.config.ts b/newback/src/utils/jest.config.ts
index 395d5455d..3a508068e 100644
--- a/newback/src/utils/jest.config.ts
+++ b/newback/src/utils/jest.config.ts
@@ -1,8 +1,10 @@
 import type {Config} from "@jest/types";
 
-// Sync object
-// jest should be inside of src directory, otherwise tsc will compile it, and will make src directory in build
-// which will fail node-ts-config along with __dirname for photos and etc
+/*
+ * Sync object
+ * jest should be inside of src directory, otherwise tsc will compile it, and will make src directory in build
+ * which will fail node-ts-config along with __dirname for photos and etc
+ */
 const config: Config.InitialOptions = {
   verbose: true,
 };
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index 32af5bbe1..281334236 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -21,7 +21,7 @@ import {SubscriptionMessageModel} from "@/data/model/subscription.message.model"
 import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import {VerificationModel} from "@/data/model/verification.model";
 import {IpAddressModel} from "@/data/model/ip.address.model";
-import { Gender } from '@/data/shared/enums';
+
 
 
 async function bootstrap() {
diff --git a/newback/src/utils/migration.runner.ts b/newback/src/utils/migration.runner.ts
index 2c31d7f69..7df8373ba 100644
--- a/newback/src/utils/migration.runner.ts
+++ b/newback/src/utils/migration.runner.ts
@@ -3,7 +3,7 @@ import {
   CommandsRunner,
   MysqlDriver,
 } from "node-db-migration";
-import { generateOrmConfig } from '@/utils/generate.orm.config';
+import {generateOrmConfig} from "@/utils/generate.orm.config";
 
 const {database, host, password, port, username, define} = generateOrmConfig((sql) => {
   console.log(sql);
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index 9910e43cb..c2709f922 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -1,7 +1,12 @@
 {
+ "exclude": [
+    "node_modules",
+    "**/*.spec.ts"
+  ],
   "compilerOptions": {
      "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["src/*"],
+      "@common/*": ["../common/src/*"]
     },
     "plugins": [
       { "transform": "typescript-transform-paths" },

From d1094cf5489d446baafe57873f0024a558a3c224 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 28 Apr 2022 16:08:32 +0300
Subject: [PATCH 092/221] fix

---
 newback/src/data/model/channel.model.ts       | 36 ++---------
 newback/src/data/model/image.model.ts         | 23 +------
 newback/src/data/model/message.model.ts       | 22 +------
 newback/src/data/model/uploaded.file.model.ts | 22 +------
 newback/src/data/model/user.model.ts          | 25 +-------
 newback/src/data/model/user.settings.model.ts | 22 +------
 newback/src/data/model/verification.model.ts  | 22 +------
 newback/src/data/shared/dto.ts                |  8 +--
 newback/src/data/shared/ws.in.messages.ts     | 21 +------
 .../transformers/helper/generate.user.name.ts |  2 +-
 .../transformers/helper/get.max.symbol.ts     | 33 +---------
 .../transformers/model/channel.transformer.ts |  2 +-
 .../transformers/model/image.transformer.ts   |  3 +-
 .../transformers/model/message.transformer.ts |  2 +-
 .../transformers/model/profile.transformer.ts |  1 +
 .../transformers/model/room.transformer.ts    |  1 +
 .../model/settings.transformer.ts             |  1 +
 .../transformers/model/user.transformer.ts    |  2 +-
 .../get.user.contries.transformer.ts          |  3 +-
 .../out.message/inner.transformer.ts          |  5 +-
 .../out.message/set.ws.id.transformer.ts      |  1 -
 newback/src/data/types/internal.ts            |  1 -
 newback/src/main.ts                           | 61 +------------------
 .../src/modules/api/auth/auth.controller.ts   |  8 +--
 newback/src/modules/api/auth/auth.service.ts  | 36 +++++------
 .../facebook.auth.request.validator.ts        |  1 +
 .../google.auth.reques.validator.ts           |  3 +-
 .../validators/login.request.validator.ts     |  1 +
 .../validators/sign.up.request.validator.ts   |  6 +-
 .../validate.user.request.validator.ts        |  2 +-
 .../src/modules/api/file/file.controller.ts   |  2 -
 newback/src/modules/api/file/file.service.ts  |  2 +-
 newback/src/modules/api/file/image.service.ts |  1 +
 .../accept.token.request.validator.ts         | 14 -----
 .../confirm.email.request.validator.ts        |  1 -
 .../verify.token.request.validator.ts         |  1 -
 .../modules/api/verify/verify.controller.ts   |  1 -
 .../modules/api/verify/verify.module.spec.ts  |  4 +-
 .../src/modules/api/verify/verify.service.ts  |  2 +-
 .../modules/api/websocket/message.service.ts  |  3 +-
 .../api/websocket/websocket.gateway.ts        |  2 -
 .../api/websocket/websocket.service.ts        |  1 -
 .../modules/api/websocket/ws.data.service.ts  |  1 -
 .../modules/app/guards/own.message.guard.ts   |  1 -
 .../repository/message.repository.e2e.spec.ts |  4 +-
 .../repository/messages.repository.ts         |  2 +-
 .../database/repository/user.repository.ts    |  2 +-
 .../modules/shared/pubsub/pubsub.service.ts   |  1 -
 .../src/modules/shared/redis/redis.service.ts |  2 +-
 .../modules/shared/ws.adapter/ws.adapter.ts   | 16 +++--
 newback/src/utils/migration.old.ts            |  2 +-
 51 files changed, 84 insertions(+), 357 deletions(-)

diff --git a/newback/src/data/model/channel.model.ts b/newback/src/data/model/channel.model.ts
index e1bc21f05..767102c9a 100644
--- a/newback/src/data/model/channel.model.ts
+++ b/newback/src/data/model/channel.model.ts
@@ -1,41 +1,13 @@
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
-import {GiphyDto} from '@common/model/dto/giphy.dto';
-import {ChannelDto} from '@common/model/dto/channel.dto';
-import {FileModelDto} from '@common/model/dto/file.model.dto';
-import {LocationDto} from '@common/model/dto/location.dto';
-import {MessageModelDto} from '@common/model/dto/message.model.dto';
-import {RoomDto} from '@common/model/dto/room.dto';
-import {UserDto} from '@common/model/dto/user.dto';
-import {UserProfileDto} from '@common/model/dto/user.profile.dto';
-import {UserSettingsDto} from '@common/model/dto/user.settings.dto';  BelongsTo,
+import {Injectable} from "@nestjs/common";
+import {UserModel} from "@/data/model/user.model";
+
+BelongsTo,
   Column,
   DataType,
   ForeignKey,
   Model,
   Table,
 } from "sequelize-typescript";
-import {Injectable} from "@nestjs/common";
-import {UserModel} from "@/data/model/user.model";
 
 
 @Injectable()
diff --git a/newback/src/data/model/image.model.ts b/newback/src/data/model/image.model.ts
index 58dfb320b..cd1d5e4d6 100644
--- a/newback/src/data/model/image.model.ts
+++ b/newback/src/data/model/image.model.ts
@@ -1,3 +1,4 @@
+import {ImageType} from '@common/model/enum/image.type';
 import {
   BelongsTo,
   Column,
@@ -10,28 +11,6 @@ import {
 import {Injectable} from "@nestjs/common";
 import {MessageModel} from "@/data/model/message.model";
 
-import {generateUserName} from "@/data/transformers/helper/generate.user.name";
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
 const uniqueUserIdSymbMess = "unique_image_symbol_message";
 
 
diff --git a/newback/src/data/model/message.model.ts b/newback/src/data/model/message.model.ts
index 2f82ed178..3365f608f 100644
--- a/newback/src/data/model/message.model.ts
+++ b/newback/src/data/model/message.model.ts
@@ -1,3 +1,4 @@
+import {MessageStatus} from '@common/model/enum/message.status';
 import {
   BelongsTo,
   Column,
@@ -10,27 +11,6 @@ import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 import {RoomModel} from "@/data/model/room.model";
 
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
 @Injectable()
 @Table({tableName: "message"})
 export class MessageModel extends Model<MessageModel> {
diff --git a/newback/src/data/model/uploaded.file.model.ts b/newback/src/data/model/uploaded.file.model.ts
index 711e2da26..fee89088f 100644
--- a/newback/src/data/model/uploaded.file.model.ts
+++ b/newback/src/data/model/uploaded.file.model.ts
@@ -1,3 +1,4 @@
+import {ImageType} from '@common/model/enum/image.type';
 import {
   BelongsTo,
   Column,
@@ -9,27 +10,6 @@ import {
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
 @Injectable()
 @Table({tableName: "uploaded_file"})
 export class UploadedFileModel extends Model<UploadedFileModel> {
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index acaffcc3b..bed34b406 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -1,3 +1,5 @@
+import {MAX_USERNAME_LENGTH,} from "@/data/consts";
+import {Gender} from '@common/model/enum/gender';
 import {
   Column,
   DataType,
@@ -9,30 +11,7 @@ import {Injectable} from "@nestjs/common";
 import {UserAuthModel} from "@/data/model/user.auth.model";
 import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
-import {MAX_USERNAME_LENGTH} from "@/data/consts";
-
 
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
 @Injectable()
 @Table({tableName: "user"})
 export class UserModel extends Model<UserModel> {
diff --git a/newback/src/data/model/user.settings.model.ts b/newback/src/data/model/user.settings.model.ts
index 1f2c27070..139099c18 100644
--- a/newback/src/data/model/user.settings.model.ts
+++ b/newback/src/data/model/user.settings.model.ts
@@ -1,3 +1,4 @@
+import {Theme} from '@common/model/enum/theme';
 import {
   BelongsTo,
   Column,
@@ -13,27 +14,6 @@ import {
   logLevels,
 } from "lines-logger";
 import {MysqlBool} from "@/data/types/internal";
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
 
 @Injectable()
 @Table({tableName: "user_settings"})
diff --git a/newback/src/data/model/verification.model.ts b/newback/src/data/model/verification.model.ts
index 61d1de6a7..2d112cabb 100644
--- a/newback/src/data/model/verification.model.ts
+++ b/newback/src/data/model/verification.model.ts
@@ -1,3 +1,4 @@
+import {VerificationType} from '@common/model/enum/verification.type';
 import {
   BelongsTo,
   Column,
@@ -9,27 +10,6 @@ import {
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 import {MysqlBool} from "@/data/types/internal";
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
 
 @Injectable()
 @Table({tableName: "verification"})
diff --git a/newback/src/data/shared/dto.ts b/newback/src/data/shared/dto.ts
index b69235637..7c57e554c 100644
--- a/newback/src/data/shared/dto.ts
+++ b/newback/src/data/shared/dto.ts
@@ -1,8 +1,6 @@
-import type {
-  Gender,
-  ImageType,
-  MessageStatus,
-} from "./enums";
+import {ChannelDto} from '@common/model/dto/channel.dto';
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
+import {RoomDto} from '@common/model/dto/room.dto';
 import type {DefaultInMessage} from "./ws.in.messages";
 import type {
   HandlerName,
diff --git a/newback/src/data/shared/ws.in.messages.ts b/newback/src/data/shared/ws.in.messages.ts
index 05395c10b..fda2277cc 100644
--- a/newback/src/data/shared/ws.in.messages.ts
+++ b/newback/src/data/shared/ws.in.messages.ts
@@ -1,28 +1,9 @@
 import type {
-  AcceptFileContent,
-  AddRoomBase,
-  BrowserBase,
   ChangeUserOnlineBase,
-  ChannelDto, LocationDto,
+  ChannelDto,
   MessageModelDto,
-  NewRoom,
-  OfferFileContent,
-  OpponentWsId,
-  ReplyWebRtc,
   RoomDto,
-  RoomExistedBefore,
-  RoomNoUsersDto,
-  UserDto,
-  UserProfileDto,
-  UserProfileDtoWoImage,
-  UserSettingsDto,
-  WebRtcDefaultMessage,
 } from "./dto";
-import type {
-  DefaultMessage,
-  HandlerName,
-} from "./common";
-import type {MessageStatus} from "./enums";
 
 
 interface AddOnlineUserBodyMessage extends ChangeUserOnlineBase {
diff --git a/newback/src/data/transformers/helper/generate.user.name.ts b/newback/src/data/transformers/helper/generate.user.name.ts
index f674f2179..855c70278 100644
--- a/newback/src/data/transformers/helper/generate.user.name.ts
+++ b/newback/src/data/transformers/helper/generate.user.name.ts
@@ -1,4 +1,4 @@
-import {MAX_USERNAME_LENGTH} from "@/data/consts";
+import {MAX_USERNAME_LENGTH,} from "@/data/consts";
 
 export function generateUserName(email: string) {
   return email.split("@")[0].replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, MAX_USERNAME_LENGTH);
diff --git a/newback/src/data/transformers/helper/get.max.symbol.ts b/newback/src/data/transformers/helper/get.max.symbol.ts
index efe566c2d..5298fb42b 100644
--- a/newback/src/data/transformers/helper/get.max.symbol.ts
+++ b/newback/src/data/transformers/helper/get.max.symbol.ts
@@ -1,34 +1,5 @@
-import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
 import {GiphyDto} from '@common/model/dto/giphy.dto';
-import {ChannelDto} from '@common/model/dto/channel.dto';
-import {FileModelDto} from '@common/model/dto/file.model.dto';
-import {LocationDto} from '@common/model/dto/location.dto';
-import {MessageModelDto} from '@common/model/dto/message.model.dto';
-import {RoomDto} from '@common/model/dto/room.dto';
-import {UserDto} from '@common/model/dto/user.dto';
-import {UserProfileDto} from '@common/model/dto/user.profile.dto';
-import {UserSettingsDto} from '@common/model/dto/user.settings.dto';
+import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 
 
 export function getMaxSymbol(files: UploadedFileModel[], tags: Record<string, number>, giphies: GiphyDto[]) {
@@ -41,3 +12,5 @@ export function getMaxSymbol(files: UploadedFileModel[], tags: Record<string, nu
   const symbol: string | null = maxSymInt === 0 ? null : String.fromCharCode(maxSymInt);
   return symbol;
 }
+
+
diff --git a/newback/src/data/transformers/model/channel.transformer.ts b/newback/src/data/transformers/model/channel.transformer.ts
index 0b0eb41e3..beac7af09 100644
--- a/newback/src/data/transformers/model/channel.transformer.ts
+++ b/newback/src/data/transformers/model/channel.transformer.ts
@@ -1,7 +1,7 @@
+import {ChannelDto} from '@common/model/dto/channel.dto';
 import type {ChannelModel} from "@/data/model/channel.model";
 
 
-
 export function transformChannelDto(c: ChannelModel): ChannelDto {
   return {
     name: c.name,
diff --git a/newback/src/data/transformers/model/image.transformer.ts b/newback/src/data/transformers/model/image.transformer.ts
index f9b68aaeb..a6a35b523 100644
--- a/newback/src/data/transformers/model/image.transformer.ts
+++ b/newback/src/data/transformers/model/image.transformer.ts
@@ -1,9 +1,10 @@
+import {ImageType} from '@common/model/enum/image.type';
+import {FileModelDto} from '@common/model/dto/file.model.dto';
 import type {ImageModel} from "@/data/model/image.model";
 import type {MessageModel} from "@/data/model/message.model";
 import type {PureModel} from "@/data/types/internal";
 
 
-
 export function getUrl(value: PureModel<ImageModel>, attribute: "img" | "preview") {
   return value.type === ImageType.GIPHY ? value.img : `/photo/${value[attribute]}`;
 }
diff --git a/newback/src/data/transformers/model/message.transformer.ts b/newback/src/data/transformers/model/message.transformer.ts
index 489f4d069..20a5c637a 100644
--- a/newback/src/data/transformers/model/message.transformer.ts
+++ b/newback/src/data/transformers/model/message.transformer.ts
@@ -1,3 +1,4 @@
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
 import type {MessageModel} from "@/data/model/message.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
@@ -9,7 +10,6 @@ import {transformMentionByPickingDto} from "@/data/transformers/model/mention.tr
 import {transformImageByPickingDto} from "@/data/transformers/model/image.transformer";
 
 
-
 export function transformMessageDto(message: PureModel<MessageModel>, mentions: CreateModel<MessageMentionModel>[], images: PureModel<ImageModel>[]): MessageModelDto {
   return {
     id: message.id,
diff --git a/newback/src/data/transformers/model/profile.transformer.ts b/newback/src/data/transformers/model/profile.transformer.ts
index 391b7cfc8..e50df55f9 100644
--- a/newback/src/data/transformers/model/profile.transformer.ts
+++ b/newback/src/data/transformers/model/profile.transformer.ts
@@ -1,3 +1,4 @@
+import {UserProfileDto} from '@common/model/dto/user.profile.dto';
 import type {UserModel} from "@/data/model/user.model";
 
 
diff --git a/newback/src/data/transformers/model/room.transformer.ts b/newback/src/data/transformers/model/room.transformer.ts
index 4f68b0344..b24e74481 100644
--- a/newback/src/data/transformers/model/room.transformer.ts
+++ b/newback/src/data/transformers/model/room.transformer.ts
@@ -1,3 +1,4 @@
+import {RoomDto} from '@common/model/dto/room.dto';
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {GetRoomsForUser} from "@/data/types/internal";
 
diff --git a/newback/src/data/transformers/model/settings.transformer.ts b/newback/src/data/transformers/model/settings.transformer.ts
index 7fc076d34..b6c75b2cd 100644
--- a/newback/src/data/transformers/model/settings.transformer.ts
+++ b/newback/src/data/transformers/model/settings.transformer.ts
@@ -1,3 +1,4 @@
+import {UserSettingsDto} from '@common/model/dto/user.settings.dto';
 import type {UserModel} from "@/data/model/user.model";
 
 
diff --git a/newback/src/data/transformers/model/user.transformer.ts b/newback/src/data/transformers/model/user.transformer.ts
index 10990f4d2..740c170ff 100644
--- a/newback/src/data/transformers/model/user.transformer.ts
+++ b/newback/src/data/transformers/model/user.transformer.ts
@@ -1,7 +1,7 @@
+import {UserDto} from '@common/model/dto/user.dto';
 import type {UserModel} from "@/data/model/user.model";
 
 
-
 export function transformUserDto(u: UserModel): UserDto {
   return {
     username: u.username,
diff --git a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
index fbea149da..6bcb4b3b8 100644
--- a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
+++ b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
@@ -1,8 +1,7 @@
+import {LocationDto} from '@common/model/dto/location.dto';
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 
 
-
-
 export function transformUserCountries(userInfo: UserJoinedInfoModel[]): Omit<GetCountryCodeWsInMessage, "action" | "handler"> {
   const content: GetCountryCodeWsInMessage["content"] = userInfo.reduce((previousValue, currentValue) => {
     if (currentValue.ip) {
diff --git a/newback/src/data/transformers/out.message/inner.transformer.ts b/newback/src/data/transformers/out.message/inner.transformer.ts
index 8b6d5f635..bca8c372e 100644
--- a/newback/src/data/transformers/out.message/inner.transformer.ts
+++ b/newback/src/data/transformers/out.message/inner.transformer.ts
@@ -1,12 +1,11 @@
+import {ImageType} from '@common/model/enum/image.type';
+import {GiphyDto} from '@common/model/dto/giphy.dto';
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {ImageModel} from "@/data/model/image.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {CreateModel} from "@/data/types/internal";
 
 
-
-
-
 export function getUploadedGiphies(data: GiphyDto[], messageId: number): CreateModel<ImageModel>[] {
   return data.map((g) => ({
     messageId,
diff --git a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
index e50d5a2c1..f6d30347a 100644
--- a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
+++ b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
@@ -9,7 +9,6 @@ import {
 } from "@/data/transformers/model/room.transformer";
 
 
-
 export function transformSetWsId(
   {
     myRooms,
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 491adac09..c66fc3a43 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -4,7 +4,6 @@ import type {ChannelModel} from "@/data/model/channel.model";
 import type {UserModel} from "@/data/model/user.model";
 
 
-
 export interface WebSocketContextData {
   userId: number;
   id: string;
diff --git a/newback/src/main.ts b/newback/src/main.ts
index f705e54a4..e54f40315 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -1,61 +1,4 @@
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
-import {GiphyDto} from '@common/model/dto/giphy.dto';
-import {ChannelDto} from '@common/model/dto/channel.dto';
-import {FileModelDto} from '@common/model/dto/file.model.dto';
-import {LocationDto} from '@common/model/dto/location.dto';
-import {MessageModelDto} from '@common/model/dto/message.model.dto';
-import {RoomDto} from '@common/model/dto/room.dto';
-import {UserDto} from '@common/model/dto/user.dto';
-import {UserProfileDto} from '@common/model/dto/user.profile.dto';
-import {UserSettingsDto} from '@common/model/dto/user.settings.dto';   ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {Theme} from '@common/model/enum/theme';
-import {VerificationType} from '@common/model/enum/verification.type';
-import {GiphyDto} from '@common/model/dto/giphy.dto';
-import {ChannelDto} from '@common/model/dto/channel.dto';
-import {FileModelDto} from '@common/model/dto/file.model.dto';
-import {LocationDto} from '@common/model/dto/location.dto';
-import {MessageModelDto} from '@common/model/dto/message.model.dto';
-import {RoomDto} from '@common/model/dto/room.dto';
-import {UserDto} from '@common/model/dto/user.dto';
-import {UserProfileDto} from '@common/model/dto/user.profile.dto';
-import {UserSettingsDto} from '@common/model/dto/user.settings.dto';import {AppModule} from "@/modules/app/app.module";
+import {AppModule} from "@/modules/app/app.module";
 import {config} from "node-ts-config";
 import {
   Logger,
@@ -65,6 +8,8 @@ import {readFile} from "fs/promises";
 import {WsAdapter} from "@/modules/shared/ws.adapter/ws.adapter";
 import type {HttpsOptions} from "@nestjs/common/interfaces/external/https-options.interface";
 
+$1
+
 async function bootstrap() {
   let httpsOptions: HttpsOptions = null;
   if (config.application.ssl) {
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index 5631d2675..e0c2d308c 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -1,3 +1,7 @@
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {SignUpResponse,} from "@common/http/auth/sign.up";
+import type {SignInResponse,} from "@common/http/auth/sign.in";
 import {
   Body,
   Controller,
@@ -14,10 +18,6 @@ import {GoogleAuthRequestValidator} from "@/modules/api/auth/validators/google.a
 import {CaptchaGuard} from "@/modules/app/guards/captcha.guard";
 import {ValidateEmailRequestValidator} from "@/modules/api/auth/validators/validate.email.request.validator";
 import {FacebookAuthRequestValidator} from "@/modules/api/auth/validators/facebook.auth.request.validator";
-import type {SignInResponse} from "@common/http/auth/sign.in";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {SignUpResponse} from "@common/http/auth/sign.up";
 import type {ValidateEmailResponse} from "@common/http/auth/validte.email";
 import type {ValidateUserResponse} from "@common/http/auth/validate.user";
 
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 82dba0bba..1c7c35e85 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -1,3 +1,21 @@
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
+import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {
+  SignInRequest,
+  SignInResponse,
+} from "@common/http/auth/sign.in";
+import {Gender} from '@common/model/enum/gender';
+import {VerificationType} from '@common/model/enum/verification.type';
 import {
   ConflictException,
   Injectable,
@@ -18,24 +36,6 @@ import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
 import {SessionService} from "@/modules/shared/session/session.service";
 import {generateUserName} from "@/data/transformers/helper/generate.user.name";
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import {Gender} from "@common/model/enum/gender";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {VerificationType} from "@common/model/enum/verification.type";
 
 @Injectable()
 export class AuthService {
diff --git a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
index 1d8332601..d05e577eb 100644
--- a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
@@ -1,3 +1,4 @@
+import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
 import {IsString} from "class-validator";
 
 
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
index ef23edef0..805ff79d5 100644
--- a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -1,5 +1,6 @@
-import {IsString} from "class-validator";
+import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
 import {GoogleAuthRequest} from '@common/http/auth/google.auth';
+import {IsString} from "class-validator";
 
 
 export class GoogleAuthRequestValidator implements GoogleAuthRequest {
diff --git a/newback/src/modules/api/auth/validators/login.request.validator.ts b/newback/src/modules/api/auth/validators/login.request.validator.ts
index 8cd2a7f83..0aa713640 100644
--- a/newback/src/modules/api/auth/validators/login.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/login.request.validator.ts
@@ -1,3 +1,4 @@
+import type {SignInRequest,} from "@common/http/auth/sign.in";
 import {
   IsEmail,
   IsString,
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index ed8554f4d..8b387d0ae 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -1,3 +1,6 @@
+import {MAX_USERNAME_LENGTH,} from "@/data/consts";
+import type {SignUpRequest,} from "@common/http/auth/sign.up";
+import {Gender} from '@common/model/enum/gender';
 import {
   IsEmail,
   IsEnum,
@@ -6,9 +9,6 @@ import {
   Length,
   Matches,
 } from "class-validator";
-import {MAX_USERNAME_LENGTH} from "@/data/consts";
-
-
 
 
 export class SignUpRequestValidator implements SignUpRequest {
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index 3917ba836..bc9930437 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -1,9 +1,9 @@
+import {MAX_USERNAME_LENGTH,} from "@/data/consts";
 import {
   IsString,
   Length,
   Matches,
 } from "class-validator";
-import {MAX_USERNAME_LENGTH} from "@/data/consts";
 
 
 export class ValidateUserRequestValidator implements ValidateUserRequest {
diff --git a/newback/src/modules/api/file/file.controller.ts b/newback/src/modules/api/file/file.controller.ts
index ad2175e0f..382713d1d 100644
--- a/newback/src/modules/api/file/file.controller.ts
+++ b/newback/src/modules/api/file/file.controller.ts
@@ -12,8 +12,6 @@ import {UserId} from "@/modules/app/decorators/user.id.decorator";
 import {FileService} from "@/modules/api/file/file.service";
 
 
-
-
 @Controller({
   path: "/api/file",
 })
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index 4b7ce8e07..62cb8a625 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -1,3 +1,4 @@
+import {ImageType} from '@common/model/enum/image.type';
 import {
   Injectable,
   Logger,
@@ -9,7 +10,6 @@ import {Sequelize} from "sequelize-typescript";
 import {ImageService} from "@/modules/api/file/image.service";
 
 
-
 @Injectable()
 export class FileService {
   private readonly savePath: string = join(__dirname, "..", "..", "..", "..", "photos");
diff --git a/newback/src/modules/api/file/image.service.ts b/newback/src/modules/api/file/image.service.ts
index 64ee3bb88..84df44509 100644
--- a/newback/src/modules/api/file/image.service.ts
+++ b/newback/src/modules/api/file/image.service.ts
@@ -1,3 +1,4 @@
+import {ImageType} from '@common/model/enum/image.type';
 import {
   Injectable,
   Logger,
diff --git a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
index 79ff07bd5..3850da961 100644
--- a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
@@ -3,20 +3,6 @@ import {
   Length,
   Matches,
 } from "class-validator";
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import {Gender} from "@common/model/enum/gender";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {VerificationType} from "@common/model/enum/verification.type";
 import {AcceptTokenRequest} from '@common/http/verify/accept.token';
 
 
diff --git a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
index 3b1218237..1888b8a4b 100644
--- a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
@@ -1,7 +1,6 @@
 import {IsString} from "class-validator";
 
 
-
 export class ConfirmEmailRequestValidator implements ConfirmEmailRequest {
   @IsString()
   public token: string;
diff --git a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
index 97cae2257..a6b326f1e 100644
--- a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
@@ -1,7 +1,6 @@
 import {IsString} from "class-validator";
 
 
-
 export class VerifyTokenRequestValidator implements VerifyTokenRequest {
   @IsString()
   public token: string;
diff --git a/newback/src/modules/api/verify/verify.controller.ts b/newback/src/modules/api/verify/verify.controller.ts
index 0dc01016c..e4ad5904e 100644
--- a/newback/src/modules/api/verify/verify.controller.ts
+++ b/newback/src/modules/api/verify/verify.controller.ts
@@ -13,7 +13,6 @@ import {AcceptTokenRequestValidator} from "@/modules/api/verify/validators/accep
 import {VerifyService} from "@/modules/api/verify/verify.service";
 
 
-
 @Controller({
   path: "/api/verify",
 })
diff --git a/newback/src/modules/api/verify/verify.module.spec.ts b/newback/src/modules/api/verify/verify.module.spec.ts
index 2bfa3199f..f3e3709a9 100644
--- a/newback/src/modules/api/verify/verify.module.spec.ts
+++ b/newback/src/modules/api/verify/verify.module.spec.ts
@@ -1,3 +1,4 @@
+import {VerificationType} from '@common/model/enum/verification.type';
 import type {INestApplication} from "@nestjs/common";
 import {
   ConsoleLogger,
@@ -27,7 +28,8 @@ import {VerificationRepository} from "@/modules/shared/database/repository/verif
 import {VerifyController} from "@/modules/api/verify/verify.controller";
 import {VerifyService} from "@/modules/api/verify/verify.service";
 import {SessionService} from "@/modules/shared/session/session.service";
-import { VerificationType } from '@/data/shared/enums';
+
+;
 
 describe("VerifyModule", () => {
   let app: INestApplication;
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index 60b8d018b..a06f7e5d4 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -1,3 +1,4 @@
+import {VerificationType} from '@common/model/enum/verification.type';
 import {
   BadRequestException,
   Injectable,
@@ -13,7 +14,6 @@ import {VerificationRepository} from "@/modules/shared/database/repository/verif
 import {SessionService} from "@/modules/shared/session/session.service";
 
 
-
 @Injectable()
 export class VerifyService {
   constructor(
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 7c4a9daa1..010ce4626 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -1,3 +1,4 @@
+import {MessageStatus} from '@common/model/enum/message.status';
 import {
   Injectable,
   Logger,
@@ -22,8 +23,6 @@ import {transformPrintMessage} from "@/data/transformers/out.message/print.messa
 import {getMaxSymbol} from "@/data/transformers/helper/get.max.symbol";
 
 
-
-
 @Injectable()
 export class MessageService {
   public constructor(
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index e13ee5126..5f5b55454 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -32,8 +32,6 @@ import type {NestGateway} from "@nestjs/websockets/interfaces/nest-gateway.inter
 import {OwnRoomGuard} from "@/modules/app/guards/own.room.guard";
 
 
-
-
 @WebSocketGateway({
   path: "/ws",
 })
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index e69437f6a..44e57e673 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -16,7 +16,6 @@ import {transformAddUserOnline} from "@/data/transformers/out.message/add.online
 import {getLogoutMessage} from "@/data/transformers/out.message/remove.online.user.transformer";
 
 
-
 @Injectable()
 export class WebsocketService {
   constructor(
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index 1672b90bc..9fbb62b7e 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -11,7 +11,6 @@ import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 import {transformUserCountries} from "@/data/transformers/out.message/get.user.contries.transformer";
 
 
-
 @Injectable()
 export class WsDataService {
   constructor(
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
index b6ad5fbba..7a6659548 100644
--- a/newback/src/modules/app/guards/own.message.guard.ts
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -10,7 +10,6 @@ import {MessageRepository} from "@/modules/shared/database/repository/messages.r
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 
 
-
 export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
   @Injectable()
   class OwnMessageGuardMixin implements CanActivate {
diff --git a/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
index 665642cf3..103761131 100644
--- a/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
+++ b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
@@ -1,3 +1,4 @@
+import {MessageStatus} from '@common/model/enum/message.status';
 import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {ConsoleLogger} from "@nestjs/common";
 import type {TestingModule} from "@nestjs/testing";
@@ -5,7 +6,8 @@ import {Test} from "@nestjs/testing";
 import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {ConfigModule} from "@/modules/shared/config/config.module";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
-import { MessageStatus } from '@/data/shared/enums';
+
+;
 
 describe("MessageRepository", () => {
   let app: TestingModule;
diff --git a/newback/src/modules/shared/database/repository/messages.repository.ts b/newback/src/modules/shared/database/repository/messages.repository.ts
index 5bf1c31ca..95dfd1350 100644
--- a/newback/src/modules/shared/database/repository/messages.repository.ts
+++ b/newback/src/modules/shared/database/repository/messages.repository.ts
@@ -1,3 +1,4 @@
+import {MessageStatus} from '@common/model/enum/message.status';
 import {Injectable} from "@nestjs/common";
 import {InjectModel} from "@nestjs/sequelize";
 import type {
@@ -13,7 +14,6 @@ import {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {CreateModel} from "@/data/types/internal";
 
 
-
 @Injectable()
 export class MessageRepository {
   public constructor(
diff --git a/newback/src/modules/shared/database/repository/user.repository.ts b/newback/src/modules/shared/database/repository/user.repository.ts
index cafda3c4c..8b3f1bb3e 100644
--- a/newback/src/modules/shared/database/repository/user.repository.ts
+++ b/newback/src/modules/shared/database/repository/user.repository.ts
@@ -1,3 +1,4 @@
+import {Gender} from '@common/model/enum/gender';
 import {Injectable} from "@nestjs/common";
 import {InjectModel} from "@nestjs/sequelize";
 import {UserModel} from "@/data/model/user.model";
@@ -8,7 +9,6 @@ import type {Transaction} from "sequelize";
 import {Op} from "sequelize";
 
 
-
 @Injectable()
 export class UserRepository {
   public constructor(
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
index cb0b473c0..25d264708 100644
--- a/newback/src/modules/shared/pubsub/pubsub.service.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.service.ts
@@ -9,7 +9,6 @@ import type {
 } from "@/data/types/internal";
 
 
-
 interface HandlerType {
   target: WebsocketGateway;
   memberName: keyof WebsocketGateway;
diff --git a/newback/src/modules/shared/redis/redis.service.ts b/newback/src/modules/shared/redis/redis.service.ts
index 35a10b819..9b4eb0f03 100644
--- a/newback/src/modules/shared/redis/redis.service.ts
+++ b/newback/src/modules/shared/redis/redis.service.ts
@@ -1,3 +1,4 @@
+import {REDIS_KEYS,} from "@/data/consts";
 import {
   Injectable,
   Logger,
@@ -8,7 +9,6 @@ import {
 } from "@nestjs-modules/ioredis";
 import type {UserOnlineData} from "@/data/types/internal";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
-import {REDIS_KEYS} from "@/data/consts";
 
 @Injectable()
 export class RedisService {
diff --git a/newback/src/modules/shared/ws.adapter/ws.adapter.ts b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
index 577b6c203..adcac3074 100644
--- a/newback/src/modules/shared/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
@@ -6,7 +6,10 @@ import {
   BadRequestException,
   InternalServerErrorException,
 } from "@nestjs/common";
-import type {BaseWsInstance, MessageMappingProperties} from "@nestjs/websockets";
+import type {
+  BaseWsInstance,
+  MessageMappingProperties
+} from "@nestjs/websockets";
 import {
   CLOSE_EVENT,
   CONNECTION_EVENT,
@@ -24,14 +27,9 @@ import {
   WebSocketServer,
 } from "ws";
 import {processErrors} from "@/modules/app/decorators/catch.ws.errors";
-import {
-  DefaultWsInMessage,
-  ResponseWsInMessage
-} from '@/data/shared/ws.in.messages';
-import {
-  DefaultWsOutMessage,
-  DefaultWsOutRequestMessage
-} from '@/data/shared/ws.out.messages';
+
+;
+;
 
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
diff --git a/newback/src/utils/migration.old.ts b/newback/src/utils/migration.old.ts
index 281334236..f2eebca8c 100755
--- a/newback/src/utils/migration.old.ts
+++ b/newback/src/utils/migration.old.ts
@@ -1,3 +1,4 @@
+import {Gender} from '@common/model/enum/gender';
 import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {ConsoleLogger} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
@@ -23,7 +24,6 @@ import {VerificationModel} from "@/data/model/verification.model";
 import {IpAddressModel} from "@/data/model/ip.address.model";
 
 
-
 async function bootstrap() {
 
   /*

From a38c044c0cefcf767d37d0032c7b05f6d2e78e29 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 30 Apr 2022 21:27:59 +0300
Subject: [PATCH 093/221] fix

---
 common/.nvmrc                                 |   1 +
 common/package.json                           |  18 +-
 common/src/consts.ts                          |   2 +
 common/src/helpers.ts                         |  11 +-
 common/src/http/auth/facebook.sign.in.ts      |   2 +-
 common/src/http/auth/google.sign.in.ts        |   2 +-
 common/src/http/auth/sign.in.ts               |   6 +-
 common/src/http/auth/sign.up.ts               |   4 +-
 common/src/http/auth/validate.user.ts         |   2 +-
 common/src/http/auth/validte.email.ts         |   2 +-
 common/src/http/file/save.file.ts             |   2 +-
 common/src/http/verify/accept.token.ts        |   2 +-
 common/src/http/verify/confirm.email.ts       |   2 +-
 .../src/http/verify/send.restore.password.ts  |   6 +-
 common/src/http/verify/verify.token.ts        |   2 +-
 common/src/legacy.ts                          | 252 ++++++++++++++++++
 common/src/model/dto/file.model.dto.ts        |   2 +-
 common/src/model/dto/message.model.dto.ts     |   4 +-
 common/src/model/dto/user.dto.ts              |   2 +-
 common/src/model/dto/user.profile.dto.ts      |   2 +-
 common/src/model/dto/user.settings.dto.ts     |   2 +-
 common/src/ws/message/growl.message.ts        |   8 +
 common/src/ws/message/print.message.ts        |  16 +-
 common/src/ws/message/set.message.status.ts   |  20 +-
 common/src/ws/message/set.ws.id.ts            |  19 ++
 frontend/src/ts/message_handlers/WsHandler.ts |   4 +-
 .../ts/message_handlers/WsMessageHandler.ts   |   2 +-
 frontend/src/ts/types/shared                  |   1 -
 newback/.eslintrc.json                        |   2 +-
 newback/src/data/consts.ts                    |   3 -
 newback/src/data/model/channel.model.ts       |   3 +-
 newback/src/data/model/user.model.ts          |   3 +-
 newback/src/data/shared/dto.ts                | 108 --------
 newback/src/data/shared/ws.in.messages.ts     | 184 -------------
 .../add.online.user.transformer.ts            |  13 +-
 .../get.user.contries.transformer.ts          |   9 +-
 .../out.message/inner.transformer.ts          |   3 +-
 .../out.message/print.message.transformer.ts  |   3 +-
 .../remove.online.user.transformer.ts         |  11 +-
 .../out.message/set.ws.id.transformer.ts      |  21 +-
 .../out.message/sync.message.transformer.ts   |   5 +-
 newback/src/data/types/internal.ts            |  11 +-
 newback/src/main.ts                           |   2 +-
 .../src/modules/api/auth/auth.controller.ts   |   8 +-
 newback/src/modules/api/auth/auth.service.ts  |   9 +-
 .../google.auth.reques.validator.ts           |   1 -
 .../validators/sign.up.request.validator.ts   |   3 +-
 .../validate.email.request.validator.ts       |   2 +
 .../validate.user.request.validator.ts        |   3 +-
 .../src/modules/api/file/file.controller.ts   |   5 +-
 newback/src/modules/api/file/file.service.ts  |   1 +
 .../accept.token.request.validator.ts         |   2 +-
 .../confirm.email.request.validator.ts        |   2 +
 .../send.restore.password.validator.ts        |   4 +-
 .../verify.token.request.validator.ts         |   2 +
 .../modules/api/verify/verify.controller.ts   |   4 +
 .../src/modules/api/verify/verify.service.ts  |   7 +
 .../modules/api/websocket/message.service.ts  |  16 +-
 .../api/websocket/websocket.gateway.ts        |  46 ++--
 .../modules/api/websocket/ws.data.service.ts  |   3 +-
 .../api/websocket/ws.exception.filter.ts      |  11 +-
 .../modules/app/decorators/catch.ws.errors.ts |   2 +
 .../modules/app/guards/own.message.guard.ts   |   2 +-
 .../src/modules/app/guards/own.room.guard.ts  |   2 +-
 .../modules/shared/pubsub/pubsub.service.ts   |   5 +
 .../modules/shared/ws.adapter/ws.adapter.ts   |  33 ++-
 newback/tsconfig.json                         |   3 +-
 67 files changed, 523 insertions(+), 432 deletions(-)
 create mode 100644 common/.nvmrc
 create mode 100644 common/src/legacy.ts
 create mode 100644 common/src/ws/message/growl.message.ts
 create mode 100644 common/src/ws/message/set.ws.id.ts
 delete mode 120000 frontend/src/ts/types/shared
 delete mode 100644 newback/src/data/shared/dto.ts
 delete mode 100644 newback/src/data/shared/ws.in.messages.ts

diff --git a/common/.nvmrc b/common/.nvmrc
new file mode 100644
index 000000000..89eb257ef
--- /dev/null
+++ b/common/.nvmrc
@@ -0,0 +1 @@
+v16.14
diff --git a/common/package.json b/common/package.json
index 40ac3f2d0..14a7080bd 100644
--- a/common/package.json
+++ b/common/package.json
@@ -6,10 +6,24 @@
   "license": "MIT",
   "homepage": "https://github.com/akoidan/pychat#readme",
   "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "lint": "eslint --ext .ts --max-warnings=0 src",
+    "lint:fix": "eslint --fix --ext .ts src"
+  },
+  "engines": {
+    "node": ">=16.0.0"
   },
   "dependencies": {
     "lines-logger": "^2.1.2",
-    "typescript": "^4.6.3"
+    "typescript": "^4.6.3",
+        "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0",
+    "eslint": "^8.12.0",
+    "eslint-find-rules": "^4.1.0",
+    "eslint-plugin-babel": "^5.3.1",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jest": "^26.1.4",
+    "eslint-plugin-only-warn": "^1.0.3",
+    "eslint-plugin-sonarjs": "^0.13.0"
   }
 }
diff --git a/common/src/consts.ts b/common/src/consts.ts
index fb93f9a3f..88ea6943c 100644
--- a/common/src/consts.ts
+++ b/common/src/consts.ts
@@ -1 +1,3 @@
 export const WS_SESSION_EXPIRED_CODE = 4001;
+export const ALL_ROOM_ID = 1;
+export const MAX_USERNAME_LENGTH = 16;
diff --git a/common/src/helpers.ts b/common/src/helpers.ts
index ede8ef71b..f796aefe9 100644
--- a/common/src/helpers.ts
+++ b/common/src/helpers.ts
@@ -12,16 +12,15 @@ import type {
   SignInResponse,
 } from "@common/http/auth/sign.in";
 import {VerificationType} from "@common/model/enum/verification.type";
-import {AcceptTokenRequest} from '@common/http/verify/accept.token';
+import {AcceptTokenRequest} from "@common/http/verify/accept.token";
 import {
   ValidateEmailResponse,
-  ValidateUserEmailRequest
-} from '@common/http/auth/validte.email';
+  ValidateUserEmailRequest,
+} from "@common/http/auth/validte.email";
 import {
   ValidateUserRequest,
-  ValidateUserResponse
-} from '@common/http/auth/validate.user';
-
+  ValidateUserResponse,
+} from "@common/http/auth/validate.user";
 
 
 export interface CaptchaRequest {
diff --git a/common/src/http/auth/facebook.sign.in.ts b/common/src/http/auth/facebook.sign.in.ts
index f3a13059a..811bd1fde 100644
--- a/common/src/http/auth/facebook.sign.in.ts
+++ b/common/src/http/auth/facebook.sign.in.ts
@@ -1,3 +1,3 @@
-import {OauthSessionResponse} from '@common/helpers';
+import type {OauthSessionResponse} from "@common/helpers";
 
 export type FacebookSignInResponse = OauthSessionResponse;
diff --git a/common/src/http/auth/google.sign.in.ts b/common/src/http/auth/google.sign.in.ts
index 4d6228339..09efe2771 100644
--- a/common/src/http/auth/google.sign.in.ts
+++ b/common/src/http/auth/google.sign.in.ts
@@ -1,3 +1,3 @@
-import {OauthSessionResponse} from '@common/helpers';
+import type {OauthSessionResponse} from "@common/helpers";
 
 export type GoogleSignInResponse = OauthSessionResponse;
diff --git a/common/src/http/auth/sign.in.ts b/common/src/http/auth/sign.in.ts
index 1fa2571f4..1a06a24b8 100644
--- a/common/src/http/auth/sign.in.ts
+++ b/common/src/http/auth/sign.in.ts
@@ -1,7 +1,7 @@
-import {
+import type {
   CaptchaRequest,
-  SessionResponse
-} from '@common/helpers';
+  SessionResponse,
+} from "@common/helpers";
 
 export type SignInResponse = SessionResponse;
 
diff --git a/common/src/http/auth/sign.up.ts b/common/src/http/auth/sign.up.ts
index d12c4bcac..bc122ff42 100644
--- a/common/src/http/auth/sign.up.ts
+++ b/common/src/http/auth/sign.up.ts
@@ -1,5 +1,5 @@
-import {SessionResponse} from '@common/helpers';
-import {Gender} from '@common/model/enum/gender';
+import type {SessionResponse} from "@common/helpers";
+import type {Gender} from "@common/model/enum/gender";
 
 export type SignUpResponse = SessionResponse;
 
diff --git a/common/src/http/auth/validate.user.ts b/common/src/http/auth/validate.user.ts
index c72780418..9cb63685f 100644
--- a/common/src/http/auth/validate.user.ts
+++ b/common/src/http/auth/validate.user.ts
@@ -1,4 +1,4 @@
-import {OkResponse} from '@common/helpers';
+import type {OkResponse} from "@common/helpers";
 
 export interface ValidateUserRequest {
   username: string;
diff --git a/common/src/http/auth/validte.email.ts b/common/src/http/auth/validte.email.ts
index ae402cbd9..332df9872 100644
--- a/common/src/http/auth/validte.email.ts
+++ b/common/src/http/auth/validte.email.ts
@@ -1,4 +1,4 @@
-import {OkResponse} from '@common/helpers';
+import type {OkResponse} from "@common/helpers";
 
 export type ValidateEmailResponse = OkResponse;
 
diff --git a/common/src/http/file/save.file.ts b/common/src/http/file/save.file.ts
index a0d4cb5a8..50dafbdee 100644
--- a/common/src/http/file/save.file.ts
+++ b/common/src/http/file/save.file.ts
@@ -1,4 +1,4 @@
-import {ImageType} from '@common/model/enum/image.type';
+import type {ImageType} from "@common/model/enum/image.type";
 
 export interface SaveFileResponse {
   id: number;
diff --git a/common/src/http/verify/accept.token.ts b/common/src/http/verify/accept.token.ts
index 2a6c4bf30..5eb2ee48e 100644
--- a/common/src/http/verify/accept.token.ts
+++ b/common/src/http/verify/accept.token.ts
@@ -1,4 +1,4 @@
-import {SessionResponse} from '@common/helpers';
+import type {SessionResponse} from "@common/helpers";
 
 export type AcceptTokenResponse = SessionResponse;
 
diff --git a/common/src/http/verify/confirm.email.ts b/common/src/http/verify/confirm.email.ts
index 13743dc95..c63edc99c 100644
--- a/common/src/http/verify/confirm.email.ts
+++ b/common/src/http/verify/confirm.email.ts
@@ -1,4 +1,4 @@
-import {OkResponse} from '@common/helpers';
+import type {OkResponse} from "@common/helpers";
 
 export interface ConfirmEmailRequest {
   token: string;
diff --git a/common/src/http/verify/send.restore.password.ts b/common/src/http/verify/send.restore.password.ts
index bdace7870..8814c2320 100644
--- a/common/src/http/verify/send.restore.password.ts
+++ b/common/src/http/verify/send.restore.password.ts
@@ -1,7 +1,7 @@
-import {
+import type {
   CaptchaRequest,
-  OkResponse
-} from '@common/helpers';
+  OkResponse,
+} from "@common/helpers";
 
 export type SendRestorePasswordResponse = OkResponse;
 
diff --git a/common/src/http/verify/verify.token.ts b/common/src/http/verify/verify.token.ts
index d03ded8a9..09311bddb 100644
--- a/common/src/http/verify/verify.token.ts
+++ b/common/src/http/verify/verify.token.ts
@@ -1,4 +1,4 @@
-import {OkResponse} from '@common/helpers';
+import type {OkResponse} from "@common/helpers";
 
 export interface VerifyTokenRequest {
   token: string;
diff --git a/common/src/legacy.ts b/common/src/legacy.ts
new file mode 100644
index 000000000..7796e4907
--- /dev/null
+++ b/common/src/legacy.ts
@@ -0,0 +1,252 @@
+import type {
+  DefaultWsInMessage,
+  HandlerName,
+  HandlerType,
+} from "@common/ws/common";
+import type {UserDto} from "@common/model/dto/user.dto";
+import type {ChannelDto} from "@common/model/dto/channel.dto";
+import type {MessageModelDto} from "@common/model/dto/message.model.dto";
+import type {
+  RoomDto,
+  RoomNoUsersDto,
+} from "@common/model/dto/room.dto";
+import type {
+  UserProfileDto,
+  UserProfileDtoWoImage,
+} from "@common/model/dto/user.profile.dto";
+import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+
+
+export interface ChangeUserOnlineBase {
+  online: Record<number, string[]>;
+  userId: number;
+  lastTimeOnline: number;
+  time: number;
+}
+
+
+export interface AcceptFileContent {
+  received: number;
+}
+
+export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
+  content: BrowserBase;
+  userId: number;
+}
+
+export interface NewRoom {
+  inviterUserId: number;
+  time: number;
+}
+
+export interface RoomExistedBefore {
+  inviteeUserId: number[];
+}
+
+export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
+}
+
+export interface OpponentWsId {
+  opponentWsId: string;
+}
+
+export interface WebRtcDefaultMessage {
+  connId: string;
+}
+
+export interface OfferFileContent extends BrowserBase {
+  size: number;
+  name: string;
+}
+
+export type ChangeDeviceType =
+  "i_deleted"
+  | "invited"
+  | "room_created"
+  | "someone_joined"
+  | "someone_left";
+export type ChangeOnlineType =
+  "appear_online"
+  | "gone_offline";
+
+export interface BrowserBase {
+  browser: string;
+}
+
+
+export interface ResolveCallbackId {
+  resolveCbId?: number; // If this callback id is present, resolve it
+}
+
+export interface IMessageHandler {
+  handle<H extends HandlerName>(message: DefaultWsInMessage<string, H, HandlerName>): void;
+
+  // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
+  getHandler<H extends HandlerName, A extends string>(message: DefaultWsInMessage<A, H, any>): HandlerType<A, H, any> | undefined;
+}
+
+export type CallStatus =
+  "accepted"
+  | "not_inited"
+  | "received_offer"
+  | "sent_offer";
+
+
+/** WsInMessages.ts */
+/**
+ * This file should only contain structures created by server. Only BE -> FE by websockets
+ * and processed by MessageHandler
+ */
+
+
+export interface MessagesResponseMessage {
+  content: MessageModelDto[];
+}
+
+
+export interface AddOnlineUserBodyMessage extends ChangeUserOnlineBase {
+  opponentWsId: string;
+}
+export type AddOnlineUserMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserBodyMessage>;
+
+
+// Export type EditMessage = DefaultWsInMessage<"editMessage", "ws-message", MessageModelDto>;
+
+
+export type DeleteMessage = DefaultWsInMessage<"deleteMessage", "ws-message", {
+  roomId: number;
+  id: number;
+  edited: number;
+}>;
+
+
+export interface CreateNewUserBodyMessage extends UserDto {
+  rooms: {
+    roomId: number;
+    users: number[];
+  }[];
+}
+
+export type CreateNewUsedMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserBodyMessage>;
+
+export type RemoveOnlineUserMessage = DefaultWsInMessage<"removeOnlineUser", "room", ChangeUserOnlineBase>;
+
+
+export type DeleteRoomMessage = DefaultWsInMessage<"deleteRoom", "room", {
+  roomId: number;
+}>;
+
+
+export type LeaveUserMessage = DefaultWsInMessage<"leaveUser", "room", {
+  roomId: number;
+  userId: number;
+  users: number[];
+}>;
+
+export interface AddChannelMessageBody extends ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
+  channelUsers: number[];
+}
+export type AddChannelMessage = DefaultWsInMessage<"addChannel", "room", AddChannelMessageBody>;
+
+export interface InviteUserMessageBody extends NewRoom, RoomExistedBefore {
+  roomId: number;
+  users: number[];
+}
+export type InviteUserMessage = DefaultWsInMessage<"inviteUser", "room", InviteUserMessageBody>;
+
+
+export type AddInviteMessage = DefaultWsInMessage<"addInvite", "room", AddRoomBase | RoomExistedBefore | {
+} >;
+
+export type SaveChannelSettingsMessage = DefaultWsInMessage<"saveChannelSettings", "room", ChannelDto | {
+  notifications: boolean;
+  volume: number;
+  p2p: boolean;
+  userId: number;
+}>;
+
+export type DeleteChannelMessage = DefaultWsInMessage<"deleteChannel", "room", {
+  channelId: number;
+  roomIds: number[];
+}>;
+
+export type SaveRoomSettingsMessage = DefaultWsInMessage<"saveRoomSettings", "room", RoomNoUsersDto | {
+
+}>;
+
+
+
+export type WebRtcSetConnectionIdMessage = DefaultWsInMessage<"setConnectionId", "void", WebRtcDefaultMessage | {
+  time: number;
+}>;
+
+export type AddRoomMessage = DefaultWsInMessage<"addRoom", "room", AddRoomBase | {
+  channelUsers: number[];
+  channelId: number;
+}>;
+
+export type OfferFile = DefaultWsInMessage<"offerFile", "webrtc", OpponentWsId | WebRtcDefaultMessage | {
+  content: OfferFileContent;
+  roomId: number;
+  threadId: number | null;
+  userId: number;
+  time: number;
+}>;
+
+export type OfferCall = DefaultWsInMessage<"offerCall", "webrtc", OpponentWsId | WebRtcDefaultMessage | {
+  content: BrowserBase;
+  roomId: number;
+  userId: number;
+  time: number;
+}>;
+
+export type ReplyCallMessage = DefaultWsInMessage<"replyCall", "webrtcTransfer:*", ReplyWebRtc>;
+
+export type NotifyCallActiveMessage = DefaultWsInMessage<"notifyCallActive", "webrtc", OpponentWsId | WebRtcDefaultMessage | {
+  roomId: number;
+  userId: number;
+}>;
+
+export type DestroyCallConnection = DefaultWsInMessage<"destroyCallConnection", "peerConnection:*", OpponentWsId | WebRtcDefaultMessage | {
+  content: string;
+}>;
+
+export type OfferMessage = DefaultWsInMessage<"offerMessage", "webrtc", OpponentWsId | WebRtcDefaultMessage | {
+  content: BrowserBase;
+  roomId: number;
+  userId: number;
+  time: number;
+}>;
+
+export type SetSettingsMessage = DefaultWsInMessage<"setSettings", "ws", UserSettingsDto>;
+
+export type SetUserProfileMessage = DefaultWsInMessage<"setUserProfile", "ws", UserProfileDtoWoImage>;
+
+export type UserProfileChangedMessage = DefaultWsInMessage<"userProfileChanged", "ws", UserDto>;
+
+
+
+export type PingMessage = DefaultWsInMessage<"ping", "ws", {
+  time: string;
+}>;
+
+export type PongMessage = DefaultWsInMessage<"pong", "ws", {
+  time: string;
+}>;
+
+export type ReplyFileMessage = DefaultWsInMessage<"replyFile", "webrtcTransfer:*", ReplyWebRtc>;
+
+export type SetProfileImageMessage = DefaultWsInMessage<"setProfileImage", "ws", string>;
+
+export type AcceptCallMessage = DefaultWsInMessage<"acceptCall", "webrtcTransfer:*", OpponentWsId | WebRtcDefaultMessage>;
+
+export type AcceptFileMessage = DefaultWsInMessage<"acceptFile", "peerConnection:*", AcceptFileContent>;
+
+export type SendRtcDataMessage = DefaultWsInMessage<"sendRtcData", "peerConnection:*", OpponentWsId | WebRtcDefaultMessage | {
+  content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
+}>;
+
+export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*", {}>;
+
+export type DestroyFileConnectionMessage = DefaultWsInMessage<"destroyFileConnection", "peerConnection:*", "decline" | "success">;
+
diff --git a/common/src/model/dto/file.model.dto.ts b/common/src/model/dto/file.model.dto.ts
index a76784361..6190c58d5 100644
--- a/common/src/model/dto/file.model.dto.ts
+++ b/common/src/model/dto/file.model.dto.ts
@@ -1,4 +1,4 @@
-import {ImageType} from '@common/model/enum/image.type';
+import type {ImageType} from "@common/model/enum/image.type";
 
 export interface FileModelDto {
   url: string;
diff --git a/common/src/model/dto/message.model.dto.ts b/common/src/model/dto/message.model.dto.ts
index f4020dc60..69414ec0f 100644
--- a/common/src/model/dto/message.model.dto.ts
+++ b/common/src/model/dto/message.model.dto.ts
@@ -1,5 +1,5 @@
-import {FileModelDto} from '@common/model/dto/file.model.dto';
-import {MessageStatus} from '@common/model/enum/message.status';
+import type {FileModelDto} from "@common/model/dto/file.model.dto";
+import type {MessageStatus} from "@common/model/enum/message.status";
 
 export interface MessageModelDto {
   id: number;
diff --git a/common/src/model/dto/user.dto.ts b/common/src/model/dto/user.dto.ts
index 4a9be9d1b..547368d08 100644
--- a/common/src/model/dto/user.dto.ts
+++ b/common/src/model/dto/user.dto.ts
@@ -1,4 +1,4 @@
-import {Gender} from '@common/model/enum/gender';
+import type {Gender} from "@common/model/enum/gender";
 
 export interface UserDto {
   username: string;
diff --git a/common/src/model/dto/user.profile.dto.ts b/common/src/model/dto/user.profile.dto.ts
index 1b9b27c33..31e3e853c 100644
--- a/common/src/model/dto/user.profile.dto.ts
+++ b/common/src/model/dto/user.profile.dto.ts
@@ -1,4 +1,4 @@
-import {Gender} from '@common/model/enum/gender';
+import type {Gender} from "@common/model/enum/gender";
 
 export interface UserProfileDtoWoImage {
   username: string;
diff --git a/common/src/model/dto/user.settings.dto.ts b/common/src/model/dto/user.settings.dto.ts
index c281ba1c5..d29f327c8 100644
--- a/common/src/model/dto/user.settings.dto.ts
+++ b/common/src/model/dto/user.settings.dto.ts
@@ -1,4 +1,4 @@
-import {LogLevel} from 'lines-logger';
+import type {LogLevel} from "lines-logger";
 
 export interface UserSettingsDto {
   embeddedYoutube: boolean;
diff --git a/common/src/ws/message/growl.message.ts b/common/src/ws/message/growl.message.ts
new file mode 100644
index 000000000..95eff4910
--- /dev/null
+++ b/common/src/ws/message/growl.message.ts
@@ -0,0 +1,8 @@
+import type {ResponseWsInMessage,} from "@common/ws/common";
+
+export interface GrowlWsInBody {
+  error: string;
+}
+export interface GrowlWsInMessage extends ResponseWsInMessage<GrowlWsInBody> {
+  action: "growlError";
+}
diff --git a/common/src/ws/message/print.message.ts b/common/src/ws/message/print.message.ts
index 2f8aa0240..1d2d1aa2f 100644
--- a/common/src/ws/message/print.message.ts
+++ b/common/src/ws/message/print.message.ts
@@ -1,13 +1,13 @@
-import {
+import type {
   DefaultWsInMessage,
-  DefaultWsOutMessage
-} from '@common/ws/common';
-import {MessageModelDto} from '@common/model/dto/message.model.dto';
-import {GiphyDto} from '@common/model/dto/giphy.dto';
+  DefaultWsOutMessage,
+} from "@common/ws/common";
+import type {MessageModelDto} from "@common/model/dto/message.model.dto";
+import type {GiphyDto} from "@common/model/dto/giphy.dto";
 
 export type PrintMessageWsInMessage = DefaultWsInMessage<"printMessage", "ws-message", MessageModelDto>;
 
-export type PrintMessageWsOutMessage = DefaultWsOutMessage<"printMessage", {
+export interface PrintMessageWsOutBody {
   content: string;
   roomId: number;
   files: number[];
@@ -16,4 +16,6 @@ export type PrintMessageWsOutMessage = DefaultWsOutMessage<"printMessage", {
   parentMessage: number | null;
   tags: Record<string, number>;
   giphies: GiphyDto[];
-}>;
+}
+
+export type PrintMessageWsOutMessage = DefaultWsOutMessage<"printMessage", PrintMessageWsOutBody>;
diff --git a/common/src/ws/message/set.message.status.ts b/common/src/ws/message/set.message.status.ts
index 9d5a5b97e..795337dac 100644
--- a/common/src/ws/message/set.message.status.ts
+++ b/common/src/ws/message/set.message.status.ts
@@ -1,17 +1,21 @@
-import {
+import type {
   DefaultWsInMessage,
-  DefaultWsOutMessage
-} from '@common/ws/common';
-import {MessageStatus} from '@common/model/enum/message.status';
+  DefaultWsOutMessage,
+} from "@common/ws/common";
+import type {MessageStatus} from "@common/model/enum/message.status";
 
-export type SetMessageStatusWsOutMessage = DefaultWsOutMessage<"setMessageStatus", {
+export interface SetMessageStatusWsOutBody  {
   messagesIds: number[];
   status: MessageStatus;
   roomId: number;
-}>;
+}
 
-export type SetMessageStatusWsInMessage = DefaultWsInMessage<"setMessageStatus", "ws-message", {
+export type SetMessageStatusWsOutMessage = DefaultWsOutMessage<"setMessageStatus", SetMessageStatusWsOutBody>;
+
+export interface SetMessageStatusWsInBody {
   roomId: number;
   status: MessageStatus;
   messagesIds: number[];
-}>;
+}
+
+export type SetMessageStatusWsInMessage = DefaultWsInMessage<"setMessageStatus", "ws-message",SetMessageStatusWsInBody>;
diff --git a/common/src/ws/message/set.ws.id.ts b/common/src/ws/message/set.ws.id.ts
new file mode 100644
index 000000000..4351e3d11
--- /dev/null
+++ b/common/src/ws/message/set.ws.id.ts
@@ -0,0 +1,19 @@
+import {DefaultWsInMessage} from "@common/ws/common";
+import {RoomDto} from "@common/model/dto/room.dto";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {OpponentWsId} from "@common/legacy";
+
+export interface SetWsIdWsOutBody {
+  rooms: RoomDto[];
+  opponentWsId: string;
+  channels: ChannelDto[];
+  users: UserDto[];
+  online: Record<number, string[]>;
+  time: number;
+  profile: UserProfileDto;
+  settings: UserSettingsDto;
+}
+export type SetWsIdWsOutMessage = DefaultWsInMessage<"setWsId", "ws", SetWsIdWsOutBody>;
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 96eabbbd9..3523ddad9 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -47,7 +47,7 @@ import type {AddChannelMessage,
   SetProfileImageMessage,
   SetSettingsMessage,
   SetUserProfileMessage,
-  SetWsIdMessage,
+  SetWsIdWsOutMessage,
   UserProfileChangedMessage,
   WebRtcSetConnectionIdMessage,
 } from "@/ts/types/shared/ws.in.messages";
@@ -558,7 +558,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     return serverTime + this.timeDiffWithServer; // ServerTime + (Date.now - serverTime) === Date.now
   }
 
-  public async setWsId(message: SetWsIdMessage) {
+  public async setWsId(message: SetWsIdWsOutMessage) {
     this.wsConnectionId = message.opponentWsId;
     this.setUserInfo(message.profile);
     this.setUserSettings(message.settings);
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index dfdd57c6b..81ee253c0 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -510,7 +510,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     this.setAllMessagesStatus(result.readMessageIds, MessageStatus.READ);
     this.setAllMessagesStatus(result.receivedMessageIds, MessageStatus.RECEIVED);
 
-    const messagesByStatus = this.groupMessagesIdsByStatus(result.content, () => true);
+    const messagesByStatus = this.groupMessagesIdsByStatus(result.messages, () => true);
     Object.entries(messagesByStatus).forEach(([k, messagesInGroup]) => {
       const roomId = parseInt(k);
       this.addMessages(roomId, messagesInGroup, true);
diff --git a/frontend/src/ts/types/shared b/frontend/src/ts/types/shared
deleted file mode 120000
index 325f1cb08..000000000
--- a/frontend/src/ts/types/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../../newback/src/data/shared/
\ No newline at end of file
diff --git a/newback/.eslintrc.json b/newback/.eslintrc.json
index 4e3475ca0..9de8f01a5 100644
--- a/newback/.eslintrc.json
+++ b/newback/.eslintrc.json
@@ -83,7 +83,7 @@
     "babel/semi": 1,
     "babel/no-unused-expressions": 1,
     "babel/valid-typeof": 1,
-    "babel/new-cap": 1,
+    "babel/new-cap": 0, // Decorators 
     "@typescript-eslint/no-parameter-properties": 0,
     "babel/camelcase": 0, // use typescript-eslint/naming-convention
     "babel/no-invalid-this": 1,
diff --git a/newback/src/data/consts.ts b/newback/src/data/consts.ts
index 906486ded..95da6dc41 100644
--- a/newback/src/data/consts.ts
+++ b/newback/src/data/consts.ts
@@ -1,6 +1,3 @@
-export const ALL_ROOM_ID = 1;
-export const MAX_USERNAME_LENGTH = 16;
-
 export enum REDIS_KEYS {
   REDIS_SESSIONS_KEY = "sessions",
   REDIS_ONLINE_KEY = "online",
diff --git a/newback/src/data/model/channel.model.ts b/newback/src/data/model/channel.model.ts
index 767102c9a..e92fb0220 100644
--- a/newback/src/data/model/channel.model.ts
+++ b/newback/src/data/model/channel.model.ts
@@ -1,7 +1,8 @@
 import {Injectable} from "@nestjs/common";
 import {UserModel} from "@/data/model/user.model";
 
-BelongsTo,
+import {
+  BelongsTo,
   Column,
   DataType,
   ForeignKey,
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index bed34b406..b1a738789 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -1,5 +1,6 @@
-import {MAX_USERNAME_LENGTH,} from "@/data/consts";
 import {Gender} from '@common/model/enum/gender';
+
+import {MAX_USERNAME_LENGTH,} from "@/data/consts";
 import {
   Column,
   DataType,
diff --git a/newback/src/data/shared/dto.ts b/newback/src/data/shared/dto.ts
deleted file mode 100644
index 7c57e554c..000000000
--- a/newback/src/data/shared/dto.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import {ChannelDto} from '@common/model/dto/channel.dto';
-import {MessageModelDto} from '@common/model/dto/message.model.dto';
-import {RoomDto} from '@common/model/dto/room.dto';
-import type {DefaultInMessage} from "./ws.in.messages";
-import type {
-  HandlerName,
-  HandlerType,
-} from "./common";
-
-
-export declare type LogLevel =
-  "debug"
-  | "disable"
-  | "error"
-  | "info"
-  | "log_raise_error"
-  | "log_with_warnings"
-  | "trace"
-  | "warn";
-
-
-export interface ChangeUserOnlineBase {
-  online: Record<number, string[]>;
-  userId: number;
-  lastTimeOnline: number;
-  time: number;
-}
-
-
-export interface AcceptFileContent {
-  received: number;
-}
-
-export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
-  content: BrowserBase;
-  userId: number;
-}
-
-export interface NewRoom {
-  inviterUserId: number;
-  time: number;
-}
-
-export interface RoomExistedBefore {
-  inviteeUserId: number[];
-}
-
-export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
-}
-
-export interface OpponentWsId {
-  opponentWsId: string;
-}
-
-export interface WebRtcDefaultMessage {
-  connId: string;
-}
-
-export interface OfferFileContent extends BrowserBase {
-  size: number;
-  name: string;
-}
-
-export type ChangeDeviceType =
-  "i_deleted"
-  | "invited"
-  | "room_created"
-  | "someone_joined"
-  | "someone_left";
-export type ChangeOnlineType =
-  "appear_online"
-  | "gone_offline";
-
-export interface BrowserBase {
-  browser: string;
-}
-
-
-export interface ResolveCallbackId {
-  resolveCbId?: number; // If this callback id is present, resolve it
-}
-
-export interface IMessageHandler {
-  handle(message: DefaultInMessage<string, HandlerName>): void;
-
-  // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-  getHandler<H extends HandlerName, A extends string>(message: DefaultInMessage<A, H>): HandlerType<A, H> | undefined;
-}
-
-export type CallStatus =
-  "accepted"
-  | "not_inited"
-  | "received_offer"
-  | "sent_offer";
-
-
-/** WsInMessages.ts */
-/**
- * This file should only contain structures created by server. Only BE -> FE by websockets
- * and processed by MessageHandler
- */
-
-
-export interface MessagesResponseMessage {
-  content: MessageModelDto[];
-}
-
-
diff --git a/newback/src/data/shared/ws.in.messages.ts b/newback/src/data/shared/ws.in.messages.ts
deleted file mode 100644
index fda2277cc..000000000
--- a/newback/src/data/shared/ws.in.messages.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import type {
-  ChangeUserOnlineBase,
-  ChannelDto,
-  MessageModelDto,
-  RoomDto,
-} from "./dto";
-
-
-interface AddOnlineUserBodyMessage extends ChangeUserOnlineBase {
-  opponentWsId: string;
-}
-export type AddOnlineUserMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserBodyMessage>;
-
-
-// Export type EditMessage = DefaultWsInMessage<"editMessage", "ws-message", MessageModelDto>;
-
-/*
- * Export type DeleteMessage = DefaultWsInMessage<"deleteMessage", "ws-message", {
- *   roomId: number;
- *   id: number;
- *   edited: number;
- * }>;
- */
-/*
- * Export interface CreateNewUserBodyMessage extends UserDto {
- *   rooms: {
- *     roomId: number;
- *     users: number[];
- *   }[];
- * }
- *
- * export type CreateNewUsedMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserBodyMessage>;
- *
- * export type RemoveOnlineUserMessage = DefaultWsInMessage<"removeOnlineUser", "room", ChangeUserOnlineBase>;
- *
- *
- * export type DeleteRoomMessage = DefaultWsInMessage<"deleteRoom", "room", {
- *   roomId: number;
- * }>;
- *
- *
- * export type LeaveUserMessage = DefaultWsInMessage<"leaveUser", "room", {
- *   roomId: number;
- *   userId: number;
- *   users: number[];
- * }>;
- *
- * export interface AddChannelMessageBody extends ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
- *   channelUsers: number[];
- * }
- * export type AddChannelMessage = DefaultWsInMessage<"addChannel", "room", AddChannelMessageBody>;
- *
- * export interface InviteUserMessageBody extends NewRoom, RoomExistedBefore {
- *   roomId: number;
- *   users: number[];
- * }
- * export type InviteUserMessage = DefaultWsInMessage<"inviteUser", "room", InviteUserMessageBody>;
- */
-
-/*
- *
- * Export type AddInviteMessage = AddRoomBase, RoomExistedBefore, DefaultWsInMessage<"addInvite", "room"> {
- * }
- *
- * export type SaveChannelSettingsMessage = DefaultWsInMessage<"saveChannelSettings", "room">, ChannelDto {
- *   notifications: boolean;
- *   volume: number;
- *   p2p: boolean;
- *   userId: number;
- * }
- *
- * export type DeleteChannelMessage = DefaultWsInMessage<"deleteChannel", "room"> {
- *   channelId: number;
- *   roomIds: number[];
- * }
- *
- * export type SaveRoomSettingsMessage = DefaultWsInMessage<"saveRoomSettings", "room">, RoomNoUsersDto {
- * }
- *
- *
- * export type SetWsIdMessage = DefaultWsInMessage<"setWsId", "ws">, OpponentWsId {
- *   rooms: RoomDto[];
- *   channels: ChannelDto[];
- *   users: UserDto[];
- *   online: Record<number, string[]>;
- *   time: number;
- *   profile: UserProfileDto;
- *   settings: UserSettingsDto;
- * }
- *
- * export type WebRtcSetConnectionIdMessage = WebRtcDefaultMessage, DefaultWsInMessage<"setConnectionId", "void"> {
- *   time: number;
- * }
- *
- * export type AddRoomMessage = AddRoomBase, DefaultWsInMessage<"addRoom", "room"> {
- *   channelUsers: number[];
- *   channelId: number;
- * }
- *
- * export type OfferFile = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerFile", "webrtc"> {
- *   content: OfferFileContent;
- *   roomId: number;
- *   threadId: number | null;
- *   userId: number;
- *   time: number;
- * }
- *
- * export type OfferCall = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerCall", "webrtc"> {
- *   content: BrowserBase;
- *   roomId: number;
- *   userId: number;
- *   time: number;
- * }
- *
- * export type ReplyCallMessage = ReplyWebRtc, DefaultWsInMessage<"replyCall", "webrtcTransfer:*"> {
- *
- * }
- *
- * export type NotifyCallActiveMessage = DefaultWsInMessage<"notifyCallActive", "webrtc">, WebRtcDefaultMessage, OpponentWsId {
- *   roomId: number;
- *   userId: number;
- * }
- *
- * export type DestroyCallConnection = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"destroyCallConnection", "peerConnection:*"> {
- *   content: string;
- * }
- *
- * export type OfferMessage = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"offerMessage", "webrtc"> {
- *   content: BrowserBase;
- *   roomId: number;
- *   userId: number;
- *   time: number;
- * }
- *
- * export type SetSettingsMessage = DefaultWsInMessage<"setSettings", "ws"> {
- *   content: UserSettingsDto;
- * }
- *
- * export type SetUserProfileMessage = DefaultWsInMessage<"setUserProfile", "ws"> {
- *   content: UserProfileDtoWoImage;
- * }
- *
- * export type UserProfileChangedMessage = DefaultWsInMessage<"userProfileChanged", "ws">, UserDto {
- *
- * }
- *
- * export type GrowlMessage = DefaultWsInMessage<"growlError", "void"> {
- *   content: string;
- *   action: "growlError";
- * }
- *
- * export type PingMessage = DefaultWsInMessage<"ping", "ws"> {
- *   time: string;
- * }
- *
- * export type PongMessage = DefaultWsInMessage<"pong", "ws"> {
- *   time: string;
- * }
- *
- * export type ReplyFileMessage = ReplyWebRtc, DefaultWsInMessage<"replyFile", "webrtcTransfer:*"> {
- *
- * }
- *
- * export type SetProfileImageMessage = DefaultWsInMessage<"setProfileImage", "ws"> {
- *   content: string;
- * }
- *
- * export type AcceptCallMessage = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"acceptCall", "webrtcTransfer:*"> {
- * }
- *
- * export type AcceptFileMessage = DefaultWsInMessage<"acceptFile", "peerConnection:*"> {
- *   content: AcceptFileContent;
- * }
- *
- * export type SendRtcDataMessage = WebRtcDefaultMessage, OpponentWsId, DefaultWsInMessage<"sendRtcData", "peerConnection:*"> {
- *   content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
- * }
- *
- * export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*">;
- *
- * export type DestroyFileConnectionMessage = DefaultWsInMessage<"destroyFileConnection", "peerConnection:*"> {
- *   content: "decline" | "success";
- * }
- */
diff --git a/newback/src/data/transformers/out.message/add.online.user.transformer.ts b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
index 94e0012f1..a68ca0c0e 100644
--- a/newback/src/data/transformers/out.message/add.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
@@ -1,14 +1,17 @@
 import type {UserModel} from "@/data/model/user.model";
+import type {AddOnlineUserMessage} from "@common/legacy";
 
 
 export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
   return {
     action: "addOnlineUser",
     handler: "room",
-    online,
-    userId: user.id,
-    lastTimeOnline: user.lastTimeOnline,
-    time: Date.now(),
-    opponentWsId,
+    data: {
+      online,
+      userId: user.id,
+      lastTimeOnline: user.lastTimeOnline,
+      time: Date.now(),
+      opponentWsId,
+    },
   };
 }
diff --git a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
index 6bcb4b3b8..f447b2b93 100644
--- a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
+++ b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
@@ -1,9 +1,12 @@
+import type {LocationDto} from "@common/model/dto/location.dto";
 import {LocationDto} from '@common/model/dto/location.dto';
+import type {GetCountryCodeWsInMessage} from "@common/ws/message/get.country.code";
+import {GetCountryCodeWsInMessage} from '@common/ws/message/get.country.code';
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 
 
-export function transformUserCountries(userInfo: UserJoinedInfoModel[]): Omit<GetCountryCodeWsInMessage, "action" | "handler"> {
-  const content: GetCountryCodeWsInMessage["content"] = userInfo.reduce((previousValue, currentValue) => {
+export function transformUserCountries(userInfo: UserJoinedInfoModel[]): GetCountryCodeWsInMessage["data"] {
+  const userLocation: GetCountryCodeWsInMessage["data"]["userLocation"] = userInfo.reduce((previousValue, currentValue) => {
     if (currentValue.ip) {
       const value: LocationDto = {
         country: currentValue.ip.country,
@@ -15,5 +18,5 @@ export function transformUserCountries(userInfo: UserJoinedInfoModel[]): Omit<Ge
     }
     return previousValue;
   }, {});
-  return {content};
+  return {userLocation};
 }
diff --git a/newback/src/data/transformers/out.message/inner.transformer.ts b/newback/src/data/transformers/out.message/inner.transformer.ts
index bca8c372e..a1bdd9905 100644
--- a/newback/src/data/transformers/out.message/inner.transformer.ts
+++ b/newback/src/data/transformers/out.message/inner.transformer.ts
@@ -1,5 +1,6 @@
 import {ImageType} from '@common/model/enum/image.type';
 import {GiphyDto} from '@common/model/dto/giphy.dto';
+import {PrintMessageWsOutMessage} from '@common/ws/message/print.message';
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {ImageModel} from "@/data/model/image.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
@@ -16,7 +17,7 @@ export function getUploadedGiphies(data: GiphyDto[], messageId: number): CreateM
   }));
 }
 
-export function getMentionsFromTags(data: PrintMessageWsOutMessage, messageId: number): CreateModel<MessageMentionModel>[] {
+export function getMentionsFromTags(data: PrintMessageWsOutMessage["data"], messageId: number): CreateModel<MessageMentionModel>[] {
   return Object.entries(data.tags).map(([symbol, userId]) => ({
     messageId,
     userId,
diff --git a/newback/src/data/transformers/out.message/print.message.transformer.ts b/newback/src/data/transformers/out.message/print.message.transformer.ts
index d1f6450dc..f3121b8a9 100644
--- a/newback/src/data/transformers/out.message/print.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/print.message.transformer.ts
@@ -1,3 +1,4 @@
+import {PrintMessageWsInMessage} from '@common/ws/message/print.message';
 import type {ImageModel} from "@/data/model/image.model";
 import type {
   CreateModel,
@@ -16,6 +17,6 @@ export function transformPrintMessage(
   return {
     action: "printMessage",
     handler: "ws-message",
-    message: transformMessageDto(message, mentions, images),
+    data: transformMessageDto(message, mentions, images),
   };
 }
diff --git a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
index 7104d08d0..6ee553bc3 100644
--- a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
@@ -2,15 +2,18 @@ import type {
   UserOnlineData,
   WebSocketContextData,
 } from "@/data/types/internal";
+import type {RemoveOnlineUserMessage} from "@common/legacy";
 
 
 export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage {
   return {
-    online,
+    data: {
+      online,
+      lastTimeOnline,
+      time,
+      userId: context.userId,
+    },
     action: "removeOnlineUser",
-    lastTimeOnline,
-    time,
     handler: "room",
-    userId: context.userId,
   };
 }
diff --git a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
index f6d30347a..14f9ec357 100644
--- a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
+++ b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
@@ -7,6 +7,7 @@ import {
   getRoomsOnline,
   getTransformRoomDto,
 } from "@/data/transformers/model/room.transformer";
+import type {SetWsIdWsOutMessage,} from "@common/ws/message/set.ws.id";
 
 
 export function transformSetWsId(
@@ -20,18 +21,20 @@ export function transformSetWsId(
     user,
     time,
   }: TransformSetWsIdDataParams
-): SetWsIdMessage {
+): SetWsIdWsOutMessage {
   const roomsOnlineDict = getRoomsOnline(allUsersInTheseRooms);
   return {
     action: "setWsId",
-    channels: channels.map(transformChannelDto),
-    rooms: myRooms.map((room) => getTransformRoomDto(roomsOnlineDict[room.id], room)),
     handler: "ws",
-    time,
-    users: users.map(transformUserDto),
-    online,
-    opponentWsId: id,
-    profile: transformProfileDto(user),
-    settings: transformSettings(user),
+    data: {
+      channels: channels.map(transformChannelDto),
+      rooms: myRooms.map((room) => getTransformRoomDto(roomsOnlineDict[room.id], room)),
+      time,
+      users: users.map(transformUserDto),
+      online,
+      opponentWsId: id,
+      profile: transformProfileDto(user),
+      settings: transformSettings(user),
+    },
   };
 }
diff --git a/newback/src/data/transformers/out.message/sync.message.transformer.ts b/newback/src/data/transformers/out.message/sync.message.transformer.ts
index 4d2914193..b066a5c91 100644
--- a/newback/src/data/transformers/out.message/sync.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/sync.message.transformer.ts
@@ -1,3 +1,4 @@
+import {SyncHistoryWsInBody} from '@common/ws/message/sync.history';
 import type {MessageModel} from "@/data/model/message.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
 import type {ImageModel} from "@/data/model/image.model";
@@ -10,10 +11,10 @@ export function getSyncMessage(
   messages: MessageModel[],
   mentions: MessageMentionModel[],
   images: ImageModel[]
-): SyncHistoryWsInMessage {
+): SyncHistoryWsInBody {
   return {
     readMessageIds,
     receivedMessageIds,
-    content: messages.map((m) => transformMessageDto(m, mentions, images)),
+    messages: messages.map((m) => transformMessageDto(m, mentions, images)),
   };
 }
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index c66fc3a43..3d833bba7 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,3 +1,8 @@
+import {
+  DefaultWsInMessage,
+  HandlerName
+} from "@common/ws/common";
+
 import type {RoomModel} from "@/data/model/room.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {ChannelModel} from "@/data/model/channel.model";
@@ -8,7 +13,7 @@ export interface WebSocketContextData {
   userId: number;
   id: string;
 
-  sendToClient(data: DefaultWsInMessage<any, any>);
+  sendToClient<H extends HandlerName>(data: DefaultWsInMessage<any, H, any>);
 }
 
 export type UserOnlineData = Record<string, string[]>;
@@ -30,14 +35,14 @@ export interface OnWsClose {
 }
 
 export interface PubSubMessage<A extends string, H extends HandlerName> {
-  body: DefaultWsInMessage<A, H>;
+  body: DefaultWsInMessage<A, H, any>;
 }
 
 /*
  * Export interface SendToClientPubSubMessage<A extends string, H extends HandlerName> extends PubSubMessage<A, H>{
  * }
  */
-export type SendToClientPubSubMessage<DATA extends DefaultWsInMessage<A, H>, A extends string, H extends HandlerName> = PubSubMessage<A, H>;
+export type SendToClientPubSubMessage<DATA extends DefaultWsInMessage<A, H, any>, A extends string, H extends HandlerName> = PubSubMessage<A, H>;
 
 
 export interface TransformSetWsIdDataParams {
diff --git a/newback/src/main.ts b/newback/src/main.ts
index e54f40315..350d54828 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -7,8 +7,8 @@ import {
 import {readFile} from "fs/promises";
 import {WsAdapter} from "@/modules/shared/ws.adapter/ws.adapter";
 import type {HttpsOptions} from "@nestjs/common/interfaces/external/https-options.interface";
+import {NestFactory} from "@nestjs/core";
 
-$1
 
 async function bootstrap() {
   let httpsOptions: HttpsOptions = null;
diff --git a/newback/src/modules/api/auth/auth.controller.ts b/newback/src/modules/api/auth/auth.controller.ts
index e0c2d308c..a31fc3af4 100644
--- a/newback/src/modules/api/auth/auth.controller.ts
+++ b/newback/src/modules/api/auth/auth.controller.ts
@@ -1,7 +1,9 @@
 import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
 import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {SignUpResponse,} from "@common/http/auth/sign.up";
-import type {SignInResponse,} from "@common/http/auth/sign.in";
+import type {SignUpResponse} from "@common/http/auth/sign.up";
+import type {SignInResponse} from "@common/http/auth/sign.in";
+import type {ValidateUserResponse} from "@common/http/auth/validate.user";
+import type {ValidateEmailResponse} from "@common/http/auth/validte.email";
 import {
   Body,
   Controller,
@@ -18,8 +20,6 @@ import {GoogleAuthRequestValidator} from "@/modules/api/auth/validators/google.a
 import {CaptchaGuard} from "@/modules/app/guards/captcha.guard";
 import {ValidateEmailRequestValidator} from "@/modules/api/auth/validators/validate.email.request.validator";
 import {FacebookAuthRequestValidator} from "@/modules/api/auth/validators/facebook.auth.request.validator";
-import type {ValidateEmailResponse} from "@common/http/auth/validte.email";
-import type {ValidateUserResponse} from "@common/http/auth/validate.user";
 
 
 @Controller({
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 1c7c35e85..7e2200663 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -1,7 +1,3 @@
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
 import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
 import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
 import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
@@ -16,6 +12,11 @@ import type {
 } from "@common/http/auth/sign.in";
 import {Gender} from '@common/model/enum/gender';
 import {VerificationType} from '@common/model/enum/verification.type';
+
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH,
+} from "@/data/consts";
 import {
   ConflictException,
   Injectable,
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
index 805ff79d5..19a20fcd8 100644
--- a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -1,5 +1,4 @@
 import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import {GoogleAuthRequest} from '@common/http/auth/google.auth';
 import {IsString} from "class-validator";
 
 
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index 8b387d0ae..6d6f80755 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -1,6 +1,7 @@
-import {MAX_USERNAME_LENGTH,} from "@/data/consts";
 import type {SignUpRequest,} from "@common/http/auth/sign.up";
 import {Gender} from '@common/model/enum/gender';
+
+import {MAX_USERNAME_LENGTH,} from "@/data/consts";
 import {
   IsEmail,
   IsEnum,
diff --git a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
index 917d7045d..851446fe5 100644
--- a/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.email.request.validator.ts
@@ -1,3 +1,5 @@
+import {ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+
 import {
   IsEmail,
   IsString,
diff --git a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
index bc9930437..b52c4e6ba 100644
--- a/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/validate.user.request.validator.ts
@@ -1,4 +1,5 @@
-import {MAX_USERNAME_LENGTH,} from "@/data/consts";
+import {MAX_USERNAME_LENGTH,} from "@common/consts";
+import {ValidateUserRequest} from "@common/http/auth/validate.user";
 import {
   IsString,
   Length,
diff --git a/newback/src/modules/api/file/file.controller.ts b/newback/src/modules/api/file/file.controller.ts
index 382713d1d..778936476 100644
--- a/newback/src/modules/api/file/file.controller.ts
+++ b/newback/src/modules/api/file/file.controller.ts
@@ -1,3 +1,7 @@
+import {
+  SaveFileRequest,
+  SaveFileResponse
+} from '@common/http/file/save.file';
 import {
   Body,
   Controller,
@@ -11,7 +15,6 @@ import {AuthGuard} from "@/modules/app/guards/auth.guard";
 import {UserId} from "@/modules/app/decorators/user.id.decorator";
 import {FileService} from "@/modules/api/file/file.service";
 
-
 @Controller({
   path: "/api/file",
 })
diff --git a/newback/src/modules/api/file/file.service.ts b/newback/src/modules/api/file/file.service.ts
index 62cb8a625..33fff0051 100644
--- a/newback/src/modules/api/file/file.service.ts
+++ b/newback/src/modules/api/file/file.service.ts
@@ -1,4 +1,5 @@
 import {ImageType} from '@common/model/enum/image.type';
+import {SaveFileResponse} from '@common/http/file/save.file';
 import {
   Injectable,
   Logger,
diff --git a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
index 3850da961..b37bc16d3 100644
--- a/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/accept.token.request.validator.ts
@@ -1,9 +1,9 @@
+import {AcceptTokenRequest} from '@common/http/verify/accept.token';
 import {
   IsString,
   Length,
   Matches,
 } from "class-validator";
-import {AcceptTokenRequest} from '@common/http/verify/accept.token';
 
 
 export class AcceptTokenRequestValidator implements AcceptTokenRequest {
diff --git a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
index 1888b8a4b..13dcb8f25 100644
--- a/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/confirm.email.request.validator.ts
@@ -1,3 +1,5 @@
+import {ConfirmEmailRequest} from '@common/http/verify/confirm.email';
+
 import {IsString} from "class-validator";
 
 
diff --git a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
index 7111af9f3..12b88ccd3 100644
--- a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
+++ b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
@@ -1,3 +1,6 @@
+import type {SendRestorePasswordRequest} from "@common/http/verify/send.restore.password";
+import {SendRestorePasswordRequest} from '@common/http/verify/send.restore.password';
+
 import {
   IsEmail,
   IsString,
@@ -5,7 +8,6 @@ import {
   ValidateIf,
 } from "class-validator";
 
-
 export class SendRestorePasswordValidator implements SendRestorePasswordRequest {
   @ValidateIf((o) => !o.email || o.username)
   @IsString()
diff --git a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
index a6b326f1e..38566c263 100644
--- a/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
+++ b/newback/src/modules/api/verify/validators/verify.token.request.validator.ts
@@ -1,3 +1,5 @@
+import {VerifyTokenRequest} from '@common/http/verify/verify.token';
+
 import {IsString} from "class-validator";
 
 
diff --git a/newback/src/modules/api/verify/verify.controller.ts b/newback/src/modules/api/verify/verify.controller.ts
index e4ad5904e..7159cf438 100644
--- a/newback/src/modules/api/verify/verify.controller.ts
+++ b/newback/src/modules/api/verify/verify.controller.ts
@@ -1,3 +1,7 @@
+import {SendRestorePasswordResponse} from '@common/http/verify/send.restore.password';
+import {VerifyTokenResponse} from '@common/http/verify/verify.token';
+import {ConfirmEmailResponse} from '@common/http/verify/confirm.email';
+import {AcceptTokenResponse} from '@common/http/verify/accept.token';
 import {
   Body,
   Controller,
diff --git a/newback/src/modules/api/verify/verify.service.ts b/newback/src/modules/api/verify/verify.service.ts
index a06f7e5d4..57b5b7c30 100644
--- a/newback/src/modules/api/verify/verify.service.ts
+++ b/newback/src/modules/api/verify/verify.service.ts
@@ -1,4 +1,11 @@
 import {VerificationType} from '@common/model/enum/verification.type';
+import {SendRestorePasswordRequest} from '@common/http/verify/send.restore.password';
+import {VerifyTokenResponse} from '@common/http/verify/verify.token';
+import {ConfirmEmailRequest} from '@common/http/verify/confirm.email';
+import {
+  AcceptTokenRequest,
+  AcceptTokenResponse
+} from '@common/http/verify/accept.token';
 import {
   BadRequestException,
   Injectable,
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 010ce4626..97f083a38 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -1,4 +1,12 @@
 import {MessageStatus} from '@common/model/enum/message.status';
+
+import {SyncHistoryWsOutBody} from '@common/ws/message/sync.history';
+import type {
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+} from "@common/ws/message/show.i.type";
+import {ShowITypeWsInMessage} from '@common/ws/message/show.i.type';
+import {PrintMessageWsOutBody} from '@common/ws/message/print.message';
 import {
   Injectable,
   Logger,
@@ -34,12 +42,12 @@ export class MessageService {
     this.messageRepository.attachHooks();
   }
 
-  public showIType(data: ShowITypeWsOutMessage, context: WebSocketContextData): void {
+  public showIType(data: ShowITypeWsOutBody, context: WebSocketContextData): void {
     const body: ShowITypeWsInMessage = {
       action: "showIType",
       handler: "room",
       data: {
-        roomId: data.data.roomId,
+        roomId: data.roomId,
         userId: context.userId,
       },
     };
@@ -52,7 +60,7 @@ export class MessageService {
     );
   }
 
-  public async syncHistory(data: SyncHistoryWsOutMessage, context: WebSocketContextData) {
+  public async syncHistory(data: SyncHistoryWsOutBody, context: WebSocketContextData) {
     // MessageStatus.ON_SERVER
     const messages = await this.messageRepository.getNewOnServerMessages(
       data.roomIds,
@@ -86,7 +94,7 @@ export class MessageService {
     return getSyncMessage(readmesageIds, receivedMessageIds, messages, mentions, images);
   }
 
-  public async printMessage(data: PrintMessageWsOutMessage, context: WebSocketContextData): Promise<void> {
+  public async printMessage(data: PrintMessageWsOutBody, context: WebSocketContextData): Promise<void> {
     await this.sequelize.transaction(async(transaction) => {
       const files: UploadedFileModel[] = await this.messageRepository.getUploadedFiles(
         data.files,
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 5f5b55454..5a62b4940 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -1,3 +1,15 @@
+import type {SyncHistoryWsInMessage} from "@common/ws/message/sync.history";
+import {
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody
+} from '@common/ws/message/sync.history';
+import {ShowITypeWsOutBody} from '@common/ws/message/show.i.type';
+import {PrintMessageWsOutBody} from '@common/ws/message/print.message';
+import type {GetCountryCodeWsInMessage} from "@common/ws/message/get.country.code";
+import {
+  GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody
+} from '@common/ws/message/get.country.code';
 import type {OnGatewayConnection} from "@nestjs/websockets";
 import {
   MessageBody,
@@ -31,7 +43,6 @@ import {MessagesFromMyRoomGuard} from "@/modules/app/guards/own.message.guard";
 import type {NestGateway} from "@nestjs/websockets/interfaces/nest-gateway.interface";
 import {OwnRoomGuard} from "@/modules/app/guards/own.room.guard";
 
-
 @WebSocketGateway({
   path: "/ws",
 })
@@ -40,7 +51,7 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
   @WebSocketServer()
   public readonly server!: Server;
 
-  constructor(
+  public constructor(
     public readonly logger: Logger,
     public readonly websocketService: WebsocketService,
     public readonly wsDataService: WsDataService,
@@ -49,27 +60,27 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
   }
 
   @SubscribeMessage("closeConnection")
-  public async closeConnection(@WsContext() context: WebSocketContextData) {
+  public async closeConnection(@WsContext() context: WebSocketContextData): Promise<void> {
     await this.websocketService.closeConnection(context);
   }
 
   @CatchWsErrors
-  async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) {
+  async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) : Promise<void> {
     await this.websocketService.handleConnection(message.url, context, (socket as any)._socket.remoteAddress);
   }
 
   @SubscribePuBSub("sendToClient")
-  public sendToClient(ctx: WebSocketContextData, data: SendToClientPubSubMessage<any, any, any>) {
+  public sendToClient(ctx: WebSocketContextData, data: SendToClientPubSubMessage<any, any, any>): void {
     ctx.sendToClient(data.body);
   }
 
   @SubscribeMessage("syncHistory")
   @UseGuards(
     // Messages ids are checked within roomsId
-    OwnRoomGuard((data: SyncHistoryWsOutMessage) => data.roomIds)
+    OwnRoomGuard((data: SyncHistoryWsOutBody) => data.roomIds)
   )
   public async syncHistory(
-    @MessageBody() data: SyncHistoryWsOutMessage,
+    @MessageBody() data: SyncHistoryWsOutBody,
       @WsContext() context: WebSocketContextData
   ): Promise<SyncHistoryWsInMessage> {
     return this.messageService.syncHistory(data, context);
@@ -84,11 +95,11 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
   // @UseGuards(OwnMessageGuard)
   @SubscribeMessage("printMessage")
   @UseGuards(
-    MessagesFromMyRoomGuard((data: PrintMessageWsOutMessage) => [data.parentMessage]),
-    OwnRoomGuard((data: PrintMessageWsOutMessage) => [data.roomId])
+    MessagesFromMyRoomGuard((data: PrintMessageWsOutBody) => [data.parentMessage]),
+    OwnRoomGuard((data: PrintMessageWsOutBody) => [data.roomId])
   )
   public async printMessage(
-    @MessageBody() data: PrintMessageWsOutMessage,
+    @MessageBody() data: PrintMessageWsOutBody,
       @WsContext() context: WebSocketContextData
   ): Promise<void> {
     await this.messageService.printMessage(data, context);
@@ -96,21 +107,20 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
 
   @SubscribeMessage("showIType")
   @UseGuards(
-    OwnRoomGuard((data: ShowITypeWsOutMessage) => [data.roomId])
+    OwnRoomGuard((data: ShowITypeWsOutBody) => [data.roomId])
   )
-  public async showIType(
-    @MessageBody() data: ShowITypeWsOutMessage,
+  public showIType(
+    @MessageBody() data: ShowITypeWsOutBody,
       @WsContext() context: WebSocketContextData
-  ): Promise<void> {
-    await this.messageService.showIType(data, context);
+  ): void {
+    this.messageService.showIType(data, context);
   }
 
   @SubscribeMessage("getCountryCode")
-  // TODO add cache here
   public async getCountryCode(
-    @MessageBody() data: GetCountryCodeWsOutMessage,
+    @MessageBody() data: GetCountryCodeWsOutBody,
       @WsContext() context: WebSocketContextData
-  ): Promise<Omit<GetCountryCodeWsInMessage, "action" | "handler">> {
+  ): Promise<GetCountryCodeWsInMessage["data"]> {
     return this.wsDataService.getCountryCodes(context);
   }
 }
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index 9fbb62b7e..4c0e6fd01 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -1,3 +1,4 @@
+import {GetCountryCodeWsInMessage} from '@common/ws/message/get.country.code';
 import {
   Injectable,
   Logger,
@@ -21,7 +22,7 @@ export class WsDataService {
   ) {
   }
 
-  public async getCountryCodes(context: WebSocketContextData): Promise<Omit<GetCountryCodeWsInMessage, "action" | "handler">> {
+  public async getCountryCodes(context: WebSocketContextData): Promise<GetCountryCodeWsInMessage["data"]> {
     if (!this.configService.getConfig().settings.flags) {
       throw new ValidationException("Flags api is not enabled");
     }
diff --git a/newback/src/modules/api/websocket/ws.exception.filter.ts b/newback/src/modules/api/websocket/ws.exception.filter.ts
index a7df5a787..d2f120d7b 100644
--- a/newback/src/modules/api/websocket/ws.exception.filter.ts
+++ b/newback/src/modules/api/websocket/ws.exception.filter.ts
@@ -4,7 +4,7 @@ import type {
   HttpException,
 } from "@nestjs/common";
 import {Catch} from "@nestjs/common";
-import type {WebSocket} from "ws";
+import {WebSocket} from "ws";
 
 
 @Catch(Error) // If we provide it on module Websocket it will also affect http,so fuck it
@@ -12,12 +12,15 @@ import type {WebSocket} from "ws";
 export class WsExceptionFilter implements ExceptionFilter {
   catch(exception: HttpException, host: ArgumentsHost) {
     const cbId = host.getArgByIndex(1)?.cbId;
+     const websocket: WebSocket = host.getArgByIndex(0);
     if (cbId) {
-      const response: GrowlMessage = {
+      const response: GrowlWsInMessage = {
         cbId,
+        cbBySender: websocket.context.id,
         action: "growlError",
-        content: exception.message,
-        handler: "void",
+        data: {
+          error: exception.message,
+        },
       };
       const websocket: WebSocket = host.getArgByIndex(0);
       websocket.send(response);
diff --git a/newback/src/modules/app/decorators/catch.ws.errors.ts b/newback/src/modules/app/decorators/catch.ws.errors.ts
index c2e33219e..723992edc 100644
--- a/newback/src/modules/app/decorators/catch.ws.errors.ts
+++ b/newback/src/modules/app/decorators/catch.ws.errors.ts
@@ -1,3 +1,5 @@
+import {WS_SESSION_EXPIRED_CODE,} from "@common/consts";
+
 import type {Logger} from "@nestjs/common";
 import {UnauthorizedException} from "@nestjs/common";
 import type {OnGatewayConnection} from "@nestjs/websockets";
diff --git a/newback/src/modules/app/guards/own.message.guard.ts b/newback/src/modules/app/guards/own.message.guard.ts
index 7a6659548..aff9ca5ac 100644
--- a/newback/src/modules/app/guards/own.message.guard.ts
+++ b/newback/src/modules/app/guards/own.message.guard.ts
@@ -10,7 +10,7 @@ import {MessageRepository} from "@/modules/shared/database/repository/messages.r
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 
 
-export const MessagesFromMyRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
+export const MessagesFromMyRoomGuard = (selector: (dto: any) => number[]): any => {
   @Injectable()
   class OwnMessageGuardMixin implements CanActivate {
     constructor(
diff --git a/newback/src/modules/app/guards/own.room.guard.ts b/newback/src/modules/app/guards/own.room.guard.ts
index a13acb304..4a9f26a0e 100644
--- a/newback/src/modules/app/guards/own.room.guard.ts
+++ b/newback/src/modules/app/guards/own.room.guard.ts
@@ -10,7 +10,7 @@ import {MessageRepository} from "@/modules/shared/database/repository/messages.r
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 
 
-export const OwnRoomGuard = (selector: (dto: DefaultWsOutMessage<any>) => number[]): any => {
+export const OwnRoomGuard = (selector: (dto: any) => number[]): any => {
   @Injectable()
   class OwnMessageGuardMixin implements CanActivate {
     constructor(
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
index 25d264708..f33759a4f 100644
--- a/newback/src/modules/shared/pubsub/pubsub.service.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.service.ts
@@ -1,3 +1,8 @@
+import {
+  HandlerName,
+  HandlerType
+} from "@common/ws/common";
+
 import type {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
 import {
   Injectable,
diff --git a/newback/src/modules/shared/ws.adapter/ws.adapter.ts b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
index adcac3074..0a9fa2690 100644
--- a/newback/src/modules/shared/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
@@ -1,3 +1,14 @@
+import type {
+  DefaultWsInMessage,
+  RequestWsOutMessage,
+  ResponseWsInMessage,
+} from "@common/ws/common";
+import {
+  DefaultWsInMessage,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+
 import type {
   Logger,
   WebSocketAdapter,
@@ -8,7 +19,7 @@ import {
 } from "@nestjs/common";
 import type {
   BaseWsInstance,
-  MessageMappingProperties
+  MessageMappingProperties,
 } from "@nestjs/websockets";
 import {
   CLOSE_EVENT,
@@ -28,9 +39,6 @@ import {
 } from "ws";
 import {processErrors} from "@/modules/app/decorators/catch.ws.errors";
 
-;
-;
-
 
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
   private wsServer: WebSocketServer;
@@ -47,7 +55,7 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
       const ws: WebSocket = args.find((a) => a instanceof WebSocket);
       const oldSend: WebSocket["send"] = ws.send.bind(ws);
       (ws as any).context = {
-        sendToClient: (data: DefaultWsInMessage<any, any>) => {
+        sendToClient: (data: DefaultWsInMessage<any, any, any>) => {
           let message;
           try {
             message = JSON.stringify(data);
@@ -112,7 +120,7 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
     handlers: MessageMappingProperties[],
   ) {
     client.on(MESSAGE_METADATA, async(data) => {
-      let parsed: DefaultWsOutMessage<any, any>;
+      let parsed: RequestWsOutMessage<any, any>;
       try {
         const s = String(data);
         if (s.length > 2000) {
@@ -131,16 +139,17 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
         if (!handler) {
           throw new BadRequestException(`Unknown handler ${parsed.action}`);
         }
-        const result = await handler.callback(parsed);
+        if (!parsed.data) {
+          throw new BadRequestException(`No data for ${parsed.action}`);
+        }
+        const result: any | undefined = await handler.callback(parsed.data);
         if (result) {
-          if (!(parsed as DefaultWsOutRequestMessage<any, any>).cbId) {
+          if (!parsed.cbId) {
             throw new InternalServerErrorException(`Gateway ${parsed.action} returned result ${result}, without having cbId`);
           }
-          const response: ResponseWsInMessage<any, any, any> = {
+          const response: ResponseWsInMessage<any> = {
             cbBySender: (client as any).context.id,
-            cbId: (parsed as DefaultWsOutRequestMessage<any, any>).cbId,
-            handler: "void",
-            action:
+            cbId: parsed.cbId,
             data: result,
           };
           client.send(response);
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index c2709f922..c8b32cc98 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -1,7 +1,8 @@
 {
  "exclude": [
     "node_modules",
-    "**/*.spec.ts"
+    "**/*.spec.ts",
+    "dist"
   ],
   "compilerOptions": {
      "paths": {

From 44d691623983b2890840a9deaf133b7d5b6c3665 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 30 Apr 2022 21:28:36 +0300
Subject: [PATCH 094/221] Added more fles

---
 common/.eslintrc.json                         |    1 +
 common/.gitignore                             |    2 +
 common/src/model/enum/message.status.ts       |    5 +
 common/src/ws/message/get.country.code.ts     |   16 +
 common/src/ws/message/show.i.type.ts          |   16 +
 common/src/ws/message/sync.history.ts         |   22 +
 common/yarn.lock                              | 1477 +++++++++++++++++
 newback/src/modules/shared/ws.adapter/ws.d.ts |    5 +
 8 files changed, 1544 insertions(+)
 create mode 120000 common/.eslintrc.json
 create mode 100644 common/.gitignore
 create mode 100644 common/src/model/enum/message.status.ts
 create mode 100644 common/src/ws/message/get.country.code.ts
 create mode 100644 common/src/ws/message/show.i.type.ts
 create mode 100644 common/src/ws/message/sync.history.ts
 create mode 100644 common/yarn.lock
 create mode 100644 newback/src/modules/shared/ws.adapter/ws.d.ts

diff --git a/common/.eslintrc.json b/common/.eslintrc.json
new file mode 120000
index 000000000..e57bc20c2
--- /dev/null
+++ b/common/.eslintrc.json
@@ -0,0 +1 @@
+../newback/.eslintrc.json
\ No newline at end of file
diff --git a/common/.gitignore b/common/.gitignore
new file mode 100644
index 000000000..de4d1f007
--- /dev/null
+++ b/common/.gitignore
@@ -0,0 +1,2 @@
+dist
+node_modules
diff --git a/common/src/model/enum/message.status.ts b/common/src/model/enum/message.status.ts
new file mode 100644
index 000000000..739bb3660
--- /dev/null
+++ b/common/src/model/enum/message.status.ts
@@ -0,0 +1,5 @@
+export enum MessageStatus {
+  ON_SERVER = "ON_SERVER", // Uploaded to server
+  READ = "READ",
+  RECEIVED = "RECEIVED", // Sent
+}
diff --git a/common/src/ws/message/get.country.code.ts b/common/src/ws/message/get.country.code.ts
new file mode 100644
index 000000000..b2ae767cb
--- /dev/null
+++ b/common/src/ws/message/get.country.code.ts
@@ -0,0 +1,16 @@
+import type {
+  RequestWsOutMessage,
+  ResponseWsInMessage,
+} from "@common/ws/common";
+import type {LocationDto} from "@common/model/dto/location.dto";
+
+export interface GetCountryCodeWsOutBody {
+}
+
+export type GetCountryCodeWsOutMessage = RequestWsOutMessage<"getCountryCode", GetCountryCodeWsOutBody>;
+
+export interface GetCountryCodeWsInBody {
+  userLocation: Record<string, LocationDto>;
+}
+
+export type GetCountryCodeWsInMessage = ResponseWsInMessage<GetCountryCodeWsInBody>;
diff --git a/common/src/ws/message/show.i.type.ts b/common/src/ws/message/show.i.type.ts
new file mode 100644
index 000000000..1909834b8
--- /dev/null
+++ b/common/src/ws/message/show.i.type.ts
@@ -0,0 +1,16 @@
+import type {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+} from "@common/ws/common";
+
+export interface ShowITypeWsInBody {
+  roomId: number;
+  userId: number;
+}
+export type ShowITypeWsInMessage = DefaultWsInMessage<"showIType", "room", ShowITypeWsInBody>;
+
+export interface ShowITypeWsOutBody {
+  roomId: number;
+};
+
+export type ShowITypeWsOutMessage = DefaultWsOutMessage<"showIType", ShowITypeWsOutBody>;
diff --git a/common/src/ws/message/sync.history.ts b/common/src/ws/message/sync.history.ts
new file mode 100644
index 000000000..5211a54af
--- /dev/null
+++ b/common/src/ws/message/sync.history.ts
@@ -0,0 +1,22 @@
+import type {
+  DefaultWsOutMessage,
+  ResponseWsInMessage,
+} from "@common/ws/common";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+
+export interface SyncHistoryWsOutBody {
+  roomIds: number[];
+  messagesIds: number[];
+  onServerMessageIds: number[];
+  receivedMessageIds: number[];
+  lastSynced: number;
+}
+export type SyncHistoryWsOutMessage = DefaultWsOutMessage<"syncHistory", SyncHistoryWsOutBody>;
+
+export interface SyncHistoryWsInBody {
+  readMessageIds: number[];
+  receivedMessageIds: number[];
+  messages: MessageModelDto[];
+};
+
+export type SyncHistoryWsInMessage = ResponseWsInMessage<SyncHistoryWsInBody>
diff --git a/common/yarn.lock b/common/yarn.lock
new file mode 100644
index 000000000..91da40833
--- /dev/null
+++ b/common/yarn.lock
@@ -0,0 +1,1477 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@eslint/eslintrc@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.2.tgz#4989b9e8c0216747ee7cca314ae73791bb281aae"
+  integrity sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.3.1"
+    globals "^13.9.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
+"@humanwhocodes/config-array@^0.9.2":
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
+  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.1"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+"@types/json-schema@^7.0.9":
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
+"@typescript-eslint/eslint-plugin@^5.17.0":
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.21.0.tgz#bfc22e0191e6404ab1192973b3b4ea0461c1e878"
+  integrity sha512-fTU85q8v5ZLpoZEyn/u1S2qrFOhi33Edo2CZ0+q1gDaWWm0JuPh3bgOyU8lM0edIEYgKLDkPFiZX2MOupgjlyg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.21.0"
+    "@typescript-eslint/type-utils" "5.21.0"
+    "@typescript-eslint/utils" "5.21.0"
+    debug "^4.3.2"
+    functional-red-black-tree "^1.0.1"
+    ignore "^5.1.8"
+    regexpp "^3.2.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/parser@^5.17.0":
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.21.0.tgz#6cb72673dbf3e1905b9c432175a3c86cdaf2071f"
+  integrity sha512-8RUwTO77hstXUr3pZoWZbRQUxXcSXafZ8/5gpnQCfXvgmP9gpNlRGlWzvfbEQ14TLjmtU8eGnONkff8U2ui2Eg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.21.0"
+    "@typescript-eslint/types" "5.21.0"
+    "@typescript-eslint/typescript-estree" "5.21.0"
+    debug "^4.3.2"
+
+"@typescript-eslint/scope-manager@5.21.0":
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.21.0.tgz#a4b7ed1618f09f95e3d17d1c0ff7a341dac7862e"
+  integrity sha512-XTX0g0IhvzcH/e3393SvjRCfYQxgxtYzL3UREteUneo72EFlt7UNoiYnikUtmGVobTbhUDByhJ4xRBNe+34kOQ==
+  dependencies:
+    "@typescript-eslint/types" "5.21.0"
+    "@typescript-eslint/visitor-keys" "5.21.0"
+
+"@typescript-eslint/type-utils@5.21.0":
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.21.0.tgz#ff89668786ad596d904c21b215e5285da1b6262e"
+  integrity sha512-MxmLZj0tkGlkcZCSE17ORaHl8Th3JQwBzyXL/uvC6sNmu128LsgjTX0NIzy+wdH2J7Pd02GN8FaoudJntFvSOw==
+  dependencies:
+    "@typescript-eslint/utils" "5.21.0"
+    debug "^4.3.2"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.21.0":
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.21.0.tgz#8cdb9253c0dfce3f2ab655b9d36c03f72e684017"
+  integrity sha512-XnOOo5Wc2cBlq8Lh5WNvAgHzpjnEzxn4CJBwGkcau7b/tZ556qrWXQz4DJyChYg8JZAD06kczrdgFPpEQZfDsA==
+
+"@typescript-eslint/typescript-estree@5.21.0":
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.21.0.tgz#9f0c233e28be2540eaed3df050f0d54fb5aa52de"
+  integrity sha512-Y8Y2T2FNvm08qlcoSMoNchh9y2Uj3QmjtwNMdRQkcFG7Muz//wfJBGBxh8R7HAGQFpgYpdHqUpEoPQk+q9Kjfg==
+  dependencies:
+    "@typescript-eslint/types" "5.21.0"
+    "@typescript-eslint/visitor-keys" "5.21.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.21.0", "@typescript-eslint/utils@^5.10.0":
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.21.0.tgz#51d7886a6f0575e23706e5548c7e87bce42d7c18"
+  integrity sha512-q/emogbND9wry7zxy7VYri+7ydawo2HDZhRZ5k6yggIvXa7PvBbAAZ4PFH/oZLem72ezC4Pr63rJvDK/sTlL8Q==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.21.0"
+    "@typescript-eslint/types" "5.21.0"
+    "@typescript-eslint/typescript-estree" "5.21.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/visitor-keys@5.21.0":
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.21.0.tgz#453fb3662409abaf2f8b1f65d515699c888dd8ae"
+  integrity sha512-SX8jNN+iHqAF0riZQMkm7e8+POXa/fXw5cxL+gjpyP+FI+JVNhii53EmQgDAfDcBpFekYSlO0fGytMQwRiMQCA==
+  dependencies:
+    "@typescript-eslint/types" "5.21.0"
+    eslint-visitor-keys "^3.0.0"
+
+acorn-jsx@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+acorn@^8.7.0:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+
+ajv@^6.10.0, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+array-includes@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
+  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    is-string "^1.0.7"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+array.prototype.flat@^1.2.5:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
+  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.2"
+    es-shim-unscopables "^1.0.0"
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.1.1, debug@^4.3.2:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
+define-properties@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
+  dependencies:
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+  dependencies:
+    esutils "^2.0.2"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+es-abstract@^1.19.1, es-abstract@^1.19.2:
+  version "1.19.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.5.tgz#a2cb01eb87f724e815b278b0dd0d00f36ca9a7f1"
+  integrity sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-find-rules@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-find-rules/-/eslint-find-rules-4.1.0.tgz#f32671050cafbbf140592ab7fd04c2acc9117f5c"
+  integrity sha512-2nLJ0UrQRUGbOX8ksSxTgDNWGBW0RidIEIMlwNe1YR4RkjYksFDPYWf3WO9QFWM2NqkuHlTTeyOM94vaNwaFVw==
+  dependencies:
+    cliui "^3.2.0"
+    eslint-rule-documentation "^1.0.23"
+    glob "^7.2.0"
+    which "^1.3.1"
+    window-size "^0.3.0"
+    yargs "^16.2.0"
+
+eslint-import-resolver-node@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
+  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
+  dependencies:
+    debug "^3.2.7"
+    resolve "^1.20.0"
+
+eslint-module-utils@^2.7.3:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
+  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
+  dependencies:
+    debug "^3.2.7"
+    find-up "^2.1.0"
+
+eslint-plugin-babel@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz#75a2413ffbf17e7be57458301c60291f2cfbf560"
+  integrity sha512-VsQEr6NH3dj664+EyxJwO4FCYm/00JhYb3Sk3ft8o+fpKuIfQ9TaW6uVUfvwMXHcf/lsnRIoyFPsLMyiWCSL/g==
+  dependencies:
+    eslint-rule-composer "^0.3.0"
+
+eslint-plugin-import@^2.25.4:
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
+  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
+  dependencies:
+    array-includes "^3.1.4"
+    array.prototype.flat "^1.2.5"
+    debug "^2.6.9"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-module-utils "^2.7.3"
+    has "^1.0.3"
+    is-core-module "^2.8.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.values "^1.1.5"
+    resolve "^1.22.0"
+    tsconfig-paths "^3.14.1"
+
+eslint-plugin-jest@^26.1.4:
+  version "26.1.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.5.tgz#6cfca264818d6d6aa120b019dab4d62b6aa8e775"
+  integrity sha512-su89aDuljL9bTjEufTXmKUMSFe2kZUL9bi7+woq+C2ukHZordhtfPm4Vg+tdioHBaKf8v3/FXW9uV0ksqhYGFw==
+  dependencies:
+    "@typescript-eslint/utils" "^5.10.0"
+
+eslint-plugin-only-warn@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-only-warn/-/eslint-plugin-only-warn-1.0.3.tgz#a75f3a9ded7f03e9808e75ec27f22b644084506e"
+  integrity sha512-XQOX/TfLoLw6h8ky51d29uUjXRTQHqBGXPylDEmy5fe/w7LIOnp8MA24b1OSMEn9BQoKow1q3g1kLe5/9uBTvw==
+
+eslint-plugin-sonarjs@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-0.13.0.tgz#c34d140cc90abaaed38f5a5201a2ccdebe398862"
+  integrity sha512-t3m7ta0EspzDxSOZh3cEOJIJVZgN/TlJYaBGnQlK6W/PZNbWep8q4RQskkJkA7/zwNpX0BaoEOSUUrqaADVoqA==
+
+eslint-rule-composer@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
+  integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
+
+eslint-rule-documentation@^1.0.23:
+  version "1.0.23"
+  resolved "https://registry.yarnpkg.com/eslint-rule-documentation/-/eslint-rule-documentation-1.0.23.tgz#4e0886145597a78d24524ec7e0cf18c6fedc23a8"
+  integrity sha512-pWReu3fkohwyvztx/oQWWgld2iad25TfUdi6wvhhaDPIQjHU/pyvlKgXFw1kX31SQK2Nq9MH+vRDWB0ZLy8fYw==
+
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+  dependencies:
+    eslint-visitor-keys "^2.0.0"
+
+eslint-visitor-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
+eslint@^8.12.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.14.0.tgz#62741f159d9eb4a79695b28ec4989fcdec623239"
+  integrity sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==
+  dependencies:
+    "@eslint/eslintrc" "^1.2.2"
+    "@humanwhocodes/config-array" "^0.9.2"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.1.1"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.1"
+    esquery "^1.4.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^6.0.1"
+    globals "^13.6.0"
+    ignore "^5.2.0"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.0.4"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
+    strip-json-comments "^3.1.0"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+espree@^9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
+  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^3.3.0"
+
+esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.2.9:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fastq@^1.6.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  dependencies:
+    reusify "^1.0.4"
+
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
+flatted@^3.1.0:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
+  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
+glob-parent@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-parent@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob@^7.1.3, glob@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^13.6.0, globals@^13.9.0:
+  version "13.13.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
+  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+  dependencies:
+    type-fest "^0.20.2"
+
+globby@^11.0.4:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
+has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+ignore@^5.1.8, ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
+import-fresh@^3.0.0, import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+  dependencies:
+    get-intrinsic "^1.1.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
+is-bigint@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
+
+is-boolean-object@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-callable@^1.1.4, is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+
+is-core-module@^2.8.1:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
+  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
+  dependencies:
+    has "^1.0.3"
+
+is-date-object@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+
+is-number-object@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
+
+is-string@^1.0.5, is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  dependencies:
+    has-symbols "^1.0.2"
+
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+  dependencies:
+    call-bind "^1.0.2"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+lines-logger@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/lines-logger/-/lines-logger-2.1.2.tgz#85b619ee849938323615e40fa8cee76d24532de7"
+  integrity sha512-pSn6qr2K0tf28TgrVMMQxinADrZP3xObxxUBlhTNWWRZToRtrjHihzW7UOKlOypKDDiP3uk/DRjd6dqQsg1coA==
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  dependencies:
+    braces "^3.0.2"
+    picomatch "^2.3.1"
+
+minimatch@^3.0.4, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.0, minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+object-inspect@^1.12.0, object-inspect@^1.9.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
+  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+
+object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.values@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
+  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+regexpp@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve@^1.20.0, resolve@^1.22.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+  dependencies:
+    is-core-module "^2.8.1"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+tsconfig-paths@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
+tslib@^1.8.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+typescript@^4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
+  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
+
+unbox-primitive@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+  dependencies:
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
+    which-boxed-primitive "^1.0.2"
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+v8-compile-cache@^2.0.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
+which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+window-size@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.3.0.tgz#b8f0b66e325d22160751e496337e44b45b727546"
+  integrity sha1-uPC2bjJdIhYHUeSWM35EtFtydUY=
+
+word-wrap@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
diff --git a/newback/src/modules/shared/ws.adapter/ws.d.ts b/newback/src/modules/shared/ws.adapter/ws.d.ts
new file mode 100644
index 000000000..875e17d97
--- /dev/null
+++ b/newback/src/modules/shared/ws.adapter/ws.d.ts
@@ -0,0 +1,5 @@
+declare module "@types/ws" {
+  declare class WebSocket {
+    context: any;
+  }
+}

From f23d6655cc2f9d31cf5f0cbb4e9a293ff6ff2ec5 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 1 May 2022 13:48:48 +0300
Subject: [PATCH 095/221] it compiles

---
 common-bu/dto.ts                              | 148 ------------------
 common/src/helpers.ts                         |   7 +
 common/src/legacy.ts                          |   6 -
 common/src/ws/message/add.online.user.ts      |   9 ++
 common/src/ws/message/set.ws.id.ts            |   1 -
 newback/src/data/model/user.model.ts          |   2 +-
 .../transformers/helper/generate.user.name.ts |   2 +-
 .../add.online.user.transformer.ts            |   3 +-
 .../get.user.contries.transformer.ts          |   4 +-
 .../remove.online.user.transformer.ts         |   2 +-
 newback/src/data/types/internal.ts            |   5 -
 newback/src/data/types/patch.d.ts             |  21 +++
 newback/src/modules/api/auth/auth.service.ts  |   9 +-
 .../validators/sign.up.request.validator.ts   |   2 +-
 .../send.restore.password.validator.ts        |   1 -
 .../modules/api/websocket/message.service.ts  |   4 +-
 .../api/websocket/websocket.gateway.ts        |  27 ++--
 .../api/websocket/websocket.service.ts        |   5 +-
 .../modules/api/websocket/ws.data.service.ts  |   2 +-
 .../api/websocket/ws.exception.filter.ts      |   4 +-
 .../app/decorators/ws.context.decorator.ts    |   5 +-
 .../modules/shared/pubsub/pubsub.service.ts   |   8 +-
 .../src/modules/shared/redis/redis.service.ts |   2 +-
 .../modules/shared/ws.adapter/ws.adapter.ts   |  16 +-
 newback/src/modules/shared/ws.adapter/ws.d.ts |   5 -
 newback/src/utils/jest.config.ts              |   2 +-
 newback/tsconfig.json                         |   7 +
 27 files changed, 86 insertions(+), 223 deletions(-)
 delete mode 100644 common-bu/dto.ts
 create mode 100644 common/src/ws/message/add.online.user.ts
 create mode 100644 newback/src/data/types/patch.d.ts

diff --git a/common-bu/dto.ts b/common-bu/dto.ts
deleted file mode 100644
index bd33bc8e1..000000000
--- a/common-bu/dto.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/** BasemessagesInterfaces.ts */
-
-
-export interface ChangeUserOnlineBase {
-  online: Record<number, string[]>;
-  userId: number;
-  lastTimeOnline: number;
-  time: number;
-}
-
-
-
-
-export interface AcceptFileContent {
-  received: number;
-}
-
-export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
-  content: BrowserBase;
-  userId: number;
-}
-
-export interface NewRoom {
-  inviterUserId: number;
-  time: number;
-}
-
-export interface RoomExistedBefore {
-  inviteeUserId: number[];
-}
-
-export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
-}
-
-export interface OpponentWsId {
-  opponentWsId: string;
-}
-
-export interface WebRtcDefaultMessage {
-  connId: string;
-}
-
-export interface OfferFileContent extends BrowserBase {
-  size: number;
-  name: string;
-}
-
-export type ChangeDeviceType =
-  "i_deleted"
-  | "invited"
-  | "room_created"
-  | "someone_joined"
-  | "someone_left";
-export type ChangeOnlineType =
-  "appear_online"
-  | "gone_offline";
-
-export interface BrowserBase {
-  browser: string;
-}
-
-export interface CallBackMessage {
-  // Request to send response with this callback id
-  cbId?: number;
-}
-
-
-export interface ResolveCallbackId {
-  resolveCbId?: number; // If this callback id is present, resolve it
-}
-
-export interface IMessageHandler {
-  handle(message: DefaultInMessage<string, HandlerName>): void;
-
-  getHandler<H extends HandlerName, A extends string>(message: DefaultInMessage<A, H>): HandlerType<A, H> | undefined;
-}
-
-export type CallStatus =
-  "accepted"
-  | "not_inited"
-  | "received_offer"
-  | "sent_offer";
-
-
-/** WsInMessages.ts */
-/**
- * This file should only contain structures created by server. Only BE -> FE by websockets
- * and processed by MessageHandler
- */
-
-/*
- * Import type {
- *   ChannelDto,
- *   LocationDto,
- *   MessageModelDto,
- *   RoomDto,
- *   RoomNoUsersDto,
- *   UserDto,
- *   UserProfileDto,
- *   UserProfileDtoWoImage,
- *   UserSettingsDto,
- * } from "@/ts/types/dto";
- *
- * import type {
- *   AcceptFileContent,
- *   AddRoomBase,
- *   BrowserBase,
- *   CallBackMessage,
- *   ChangeUserOnlineBase,
- *   DefaultInMessage,
- *   HandlerName,
- *   NewRoom,
- *   OfferFileContent,
- *   OpponentWsId,
- *   ReplyWebRtc,
- *   RoomExistedBefore,
- *   WebRtcDefaultMessage,
- * } from "@/ts/types/backend";
- * import type {MessageStatus} from "@/ts/types/model";
- */
-
-
-export interface MessagesResponseMessage {
-  content: MessageModelDto[];
-}
-
-export interface SyncHistoryWsInMessage extends MessagesResponseMessage {
-  readMessageIds: number[];
-  receivedMessageIds: number[];
-}
-
-
-
-export interface GiphyDto {
-  webp: string;
-  url: string;
-  symbol: string;
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/common/src/helpers.ts b/common/src/helpers.ts
index f796aefe9..9ce47a576 100644
--- a/common/src/helpers.ts
+++ b/common/src/helpers.ts
@@ -32,6 +32,13 @@ interface TypeGeneratorForOauth1 extends SessionResponse {
   username: string;
 }
 
+export interface ChangeUserOnlineBase {
+  online: Record<number, string[]>;
+  userId: number;
+  lastTimeOnline: number;
+  time: number;
+}
+
 interface TypeGeneratorForOauth2 extends SessionResponse {
   isNewAccount: false;
 }
diff --git a/common/src/legacy.ts b/common/src/legacy.ts
index 7796e4907..5f354c98d 100644
--- a/common/src/legacy.ts
+++ b/common/src/legacy.ts
@@ -104,12 +104,6 @@ export interface MessagesResponseMessage {
 }
 
 
-export interface AddOnlineUserBodyMessage extends ChangeUserOnlineBase {
-  opponentWsId: string;
-}
-export type AddOnlineUserMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserBodyMessage>;
-
-
 // Export type EditMessage = DefaultWsInMessage<"editMessage", "ws-message", MessageModelDto>;
 
 
diff --git a/common/src/ws/message/add.online.user.ts b/common/src/ws/message/add.online.user.ts
new file mode 100644
index 000000000..1ba88e3cf
--- /dev/null
+++ b/common/src/ws/message/add.online.user.ts
@@ -0,0 +1,9 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {ChangeUserOnlineBase} from "@common/helpers";
+
+
+export interface AddOnlineUserBodyMessage extends ChangeUserOnlineBase {
+  opponentWsId: string;
+}
+
+export type AddOnlineUserMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserBodyMessage>;
diff --git a/common/src/ws/message/set.ws.id.ts b/common/src/ws/message/set.ws.id.ts
index 4351e3d11..0c710a257 100644
--- a/common/src/ws/message/set.ws.id.ts
+++ b/common/src/ws/message/set.ws.id.ts
@@ -4,7 +4,6 @@ import {ChannelDto} from "@common/model/dto/channel.dto";
 import {UserDto} from "@common/model/dto/user.dto";
 import {UserProfileDto} from "@common/model/dto/user.profile.dto";
 import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {OpponentWsId} from "@common/legacy";
 
 export interface SetWsIdWsOutBody {
   rooms: RoomDto[];
diff --git a/newback/src/data/model/user.model.ts b/newback/src/data/model/user.model.ts
index b1a738789..b3b501d63 100644
--- a/newback/src/data/model/user.model.ts
+++ b/newback/src/data/model/user.model.ts
@@ -1,6 +1,5 @@
 import {Gender} from '@common/model/enum/gender';
 
-import {MAX_USERNAME_LENGTH,} from "@/data/consts";
 import {
   Column,
   DataType,
@@ -12,6 +11,7 @@ import {Injectable} from "@nestjs/common";
 import {UserAuthModel} from "@/data/model/user.auth.model";
 import {UserProfileModel} from "@/data/model/user.profile.model";
 import {UserSettingsModel} from "@/data/model/user.settings.model";
+import {MAX_USERNAME_LENGTH} from "@common/consts";
 
 @Injectable()
 @Table({tableName: "user"})
diff --git a/newback/src/data/transformers/helper/generate.user.name.ts b/newback/src/data/transformers/helper/generate.user.name.ts
index 855c70278..f151fb252 100644
--- a/newback/src/data/transformers/helper/generate.user.name.ts
+++ b/newback/src/data/transformers/helper/generate.user.name.ts
@@ -1,4 +1,4 @@
-import {MAX_USERNAME_LENGTH,} from "@/data/consts";
+import {MAX_USERNAME_LENGTH} from "@common/consts";
 
 export function generateUserName(email: string) {
   return email.split("@")[0].replace(/[^0-9a-zA-Z-_]+/g, "-").substring(0, MAX_USERNAME_LENGTH);
diff --git a/newback/src/data/transformers/out.message/add.online.user.transformer.ts b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
index a68ca0c0e..8b5b9a104 100644
--- a/newback/src/data/transformers/out.message/add.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
@@ -1,6 +1,5 @@
 import type {UserModel} from "@/data/model/user.model";
-import type {AddOnlineUserMessage} from "@common/legacy";
-
+import type {AddOnlineUserMessage} from "@common/ws/message/add.online.user";
 
 export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
   return {
diff --git a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
index f447b2b93..d700a04b6 100644
--- a/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
+++ b/newback/src/data/transformers/out.message/get.user.contries.transformer.ts
@@ -1,7 +1,5 @@
 import type {LocationDto} from "@common/model/dto/location.dto";
-import {LocationDto} from '@common/model/dto/location.dto';
-import type {GetCountryCodeWsInMessage} from "@common/ws/message/get.country.code";
-import {GetCountryCodeWsInMessage} from '@common/ws/message/get.country.code';
+import type {GetCountryCodeWsInMessage} from "@common/ws/message/get.country.code";;
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 
 
diff --git a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
index 6ee553bc3..116e6b506 100644
--- a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
@@ -1,8 +1,8 @@
 import type {
   UserOnlineData,
-  WebSocketContextData,
 } from "@/data/types/internal";
 import type {RemoveOnlineUserMessage} from "@common/legacy";
+import {WebSocketContextData} from "@/data/types/patch";
 
 
 export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage {
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 3d833bba7..9f56e434d 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -9,12 +9,7 @@ import type {ChannelModel} from "@/data/model/channel.model";
 import type {UserModel} from "@/data/model/user.model";
 
 
-export interface WebSocketContextData {
-  userId: number;
-  id: string;
 
-  sendToClient<H extends HandlerName>(data: DefaultWsInMessage<any, H, any>);
-}
 
 export type UserOnlineData = Record<string, string[]>;
 
diff --git a/newback/src/data/types/patch.d.ts b/newback/src/data/types/patch.d.ts
new file mode 100644
index 000000000..19bbc4353
--- /dev/null
+++ b/newback/src/data/types/patch.d.ts
@@ -0,0 +1,21 @@
+import type {
+  DefaultWsInMessage,
+  HandlerName,
+} from "@common/ws/common";
+import type {BaseWsInstance} from "@nestjs/websockets/adapters/ws-adapter";
+
+
+export interface WebSocketContextData {
+  userId: number;
+  id: string;
+
+  sendToClient<H extends HandlerName>(data: DefaultWsInMessage<any, H, any>);
+}
+
+// https://github.com/websockets/ws/issues/1517
+declare module "ws" {
+  class _WS extends WebSocket { }
+  export interface WebSocket extends _WS, BaseWsInstance {
+    context: WebSocketContextData;
+  }
+}
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index 7e2200663..c3bd4794f 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -13,10 +13,7 @@ import type {
 import {Gender} from '@common/model/enum/gender';
 import {VerificationType} from '@common/model/enum/verification.type';
 
-import {
-  ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH,
-} from "@/data/consts";
+
 import {
   ConflictException,
   Injectable,
@@ -37,6 +34,10 @@ import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
 import {SessionService} from "@/modules/shared/session/session.service";
 import {generateUserName} from "@/data/transformers/helper/generate.user.name";
+import {
+  ALL_ROOM_ID,
+  MAX_USERNAME_LENGTH
+} from "@common/consts";
 
 @Injectable()
 export class AuthService {
diff --git a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
index 6d6f80755..e3e369a92 100644
--- a/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/sign.up.request.validator.ts
@@ -1,7 +1,6 @@
 import type {SignUpRequest,} from "@common/http/auth/sign.up";
 import {Gender} from '@common/model/enum/gender';
 
-import {MAX_USERNAME_LENGTH,} from "@/data/consts";
 import {
   IsEmail,
   IsEnum,
@@ -10,6 +9,7 @@ import {
   Length,
   Matches,
 } from "class-validator";
+import {MAX_USERNAME_LENGTH} from "@common/consts";
 
 
 export class SignUpRequestValidator implements SignUpRequest {
diff --git a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
index 12b88ccd3..4208ad09e 100644
--- a/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
+++ b/newback/src/modules/api/verify/validators/send.restore.password.validator.ts
@@ -1,5 +1,4 @@
 import type {SendRestorePasswordRequest} from "@common/http/verify/send.restore.password";
-import {SendRestorePasswordRequest} from '@common/http/verify/send.restore.password';
 
 import {
   IsEmail,
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index 97f083a38..b4d4229ba 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -5,7 +5,7 @@ import type {
   ShowITypeWsInMessage,
   ShowITypeWsOutBody,
 } from "@common/ws/message/show.i.type";
-import {ShowITypeWsInMessage} from '@common/ws/message/show.i.type';
+
 import {PrintMessageWsOutBody} from '@common/ws/message/print.message';
 import {
   Injectable,
@@ -14,7 +14,6 @@ import {
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import type {
   CreateModel,
-  WebSocketContextData,
 } from "@/data/types/internal";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import {Sequelize} from "sequelize-typescript";
@@ -29,6 +28,7 @@ import {
 } from "@/data/transformers/out.message/inner.transformer";
 import {transformPrintMessage} from "@/data/transformers/out.message/print.message.transformer";
 import {getMaxSymbol} from "@/data/transformers/helper/get.max.symbol";
+import {WebSocketContextData} from "@/data/types/patch";
 
 
 @Injectable()
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 5a62b4940..c3742acd2 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -1,15 +1,13 @@
-import type {SyncHistoryWsInMessage} from "@common/ws/message/sync.history";
-import {
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody
-} from '@common/ws/message/sync.history';
-import {ShowITypeWsOutBody} from '@common/ws/message/show.i.type';
-import {PrintMessageWsOutBody} from '@common/ws/message/print.message';
-import type {GetCountryCodeWsInMessage} from "@common/ws/message/get.country.code";
+import {SyncHistoryWsOutBody} from "@common/ws/message/sync.history";
+import type {SyncHistoryWsInMessage, SyncHistoryWsInBody} from "@common/ws/message/sync.history";
+import {ShowITypeWsOutBody} from "@common/ws/message/show.i.type";
+import {PrintMessageWsOutBody} from "@common/ws/message/print.message";
 import {
+  GetCountryCodeWsOutBody,
+} from "@common/ws/message/get.country.code";
+import type {
   GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody
-} from '@common/ws/message/get.country.code';
+} from "@common/ws/message/get.country.code";
 import type {OnGatewayConnection} from "@nestjs/websockets";
 import {
   MessageBody,
@@ -19,13 +17,11 @@ import {
 } from "@nestjs/websockets";
 import {IncomingMessage} from "http";
 import {
-  Server,
   WebSocket,
 } from "ws";
 import type {OnWsClose} from "@/data/types/internal";
 import {
   SendToClientPubSubMessage,
-  WebSocketContextData,
 } from "@/data/types/internal";
 import {
   Logger,
@@ -42,6 +38,7 @@ import {CatchWsErrors} from "@/modules/app/decorators/catch.ws.errors";
 import {MessagesFromMyRoomGuard} from "@/modules/app/guards/own.message.guard";
 import type {NestGateway} from "@nestjs/websockets/interfaces/nest-gateway.interface";
 import {OwnRoomGuard} from "@/modules/app/guards/own.room.guard";
+import {WebSocketContextData} from "@/data/types/patch";
 
 @WebSocketGateway({
   path: "/ws",
@@ -49,7 +46,7 @@ import {OwnRoomGuard} from "@/modules/app/guards/own.room.guard";
 @UseFilters(new WsExceptionFilter())
 export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGateway {
   @WebSocketServer()
-  public readonly server!: Server;
+  public readonly server!: any; // TODO
 
   public constructor(
     public readonly logger: Logger,
@@ -65,7 +62,7 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
   }
 
   @CatchWsErrors
-  async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData) : Promise<void> {
+  async handleConnection(socket: WebSocket, message: IncomingMessage, context: WebSocketContextData): Promise<void> {
     await this.websocketService.handleConnection(message.url, context, (socket as any)._socket.remoteAddress);
   }
 
@@ -82,7 +79,7 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
   public async syncHistory(
     @MessageBody() data: SyncHistoryWsOutBody,
       @WsContext() context: WebSocketContextData
-  ): Promise<SyncHistoryWsInMessage> {
+  ): Promise<SyncHistoryWsInBody> {
     return this.messageService.syncHistory(data, context);
   }
 
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 44e57e673..2aeff8a05 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -8,12 +8,13 @@ import {RoomRepository} from "@/modules/shared/database/repository/room.reposito
 import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
 import {SessionService} from "@/modules/shared/session/session.service";
 import type {UserModel} from "@/data/model/user.model";
-import type {WebSocketContextData} from "@/data/types/internal";
 import {RedisService} from "@/modules/shared/redis/redis.service";
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import {transformSetWsId} from "@/data/transformers/out.message/set.ws.id.transformer";
 import {transformAddUserOnline} from "@/data/transformers/out.message/add.online.user.transformer";
 import {getLogoutMessage} from "@/data/transformers/out.message/remove.online.user.transformer";
+import type {AddOnlineUserMessage} from "@common/ws/message/add.online.user";
+import {WebSocketContextData} from "@/data/types/patch";
 
 
 @Injectable()
@@ -63,7 +64,7 @@ export class WebsocketService {
     this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`, "ws");
     context.sendToClient(response);
     this.pubsubService.subscribe(context, ...channelsToListen);
-    const data: AddOnlineUserMessage = transformAddUserOnline(response.online, user, id);
+    const data: AddOnlineUserMessage = transformAddUserOnline(online, user, id);
     this.pubsubService.emit(
       "sendToClient",
       {
diff --git a/newback/src/modules/api/websocket/ws.data.service.ts b/newback/src/modules/api/websocket/ws.data.service.ts
index 4c0e6fd01..15e974f20 100644
--- a/newback/src/modules/api/websocket/ws.data.service.ts
+++ b/newback/src/modules/api/websocket/ws.data.service.ts
@@ -5,11 +5,11 @@ import {
 } from "@nestjs/common";
 import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
 import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
-import type {WebSocketContextData} from "@/data/types/internal";
 import {ConfigService} from "@/modules/shared/config/config.service";
 import {ValidationException} from "@/data/exceptions/validation.exception";
 import type {UserJoinedInfoModel} from "@/data/model/user.joined.info.model";
 import {transformUserCountries} from "@/data/transformers/out.message/get.user.contries.transformer";
+import {WebSocketContextData} from "@/data/types/patch";
 
 
 @Injectable()
diff --git a/newback/src/modules/api/websocket/ws.exception.filter.ts b/newback/src/modules/api/websocket/ws.exception.filter.ts
index d2f120d7b..6bb8f07f3 100644
--- a/newback/src/modules/api/websocket/ws.exception.filter.ts
+++ b/newback/src/modules/api/websocket/ws.exception.filter.ts
@@ -5,6 +5,7 @@ import type {
 } from "@nestjs/common";
 import {Catch} from "@nestjs/common";
 import {WebSocket} from "ws";
+import {GrowlWsInMessage} from "@common/ws/message/growl.message";
 
 
 @Catch(Error) // If we provide it on module Websocket it will also affect http,so fuck it
@@ -12,7 +13,7 @@ import {WebSocket} from "ws";
 export class WsExceptionFilter implements ExceptionFilter {
   catch(exception: HttpException, host: ArgumentsHost) {
     const cbId = host.getArgByIndex(1)?.cbId;
-     const websocket: WebSocket = host.getArgByIndex(0);
+    let websocket: WebSocket = host.getArgByIndex(0);
     if (cbId) {
       const response: GrowlWsInMessage = {
         cbId,
@@ -22,7 +23,6 @@ export class WsExceptionFilter implements ExceptionFilter {
           error: exception.message,
         },
       };
-      const websocket: WebSocket = host.getArgByIndex(0);
       websocket.send(response);
     } else {
       throw exception;
diff --git a/newback/src/modules/app/decorators/ws.context.decorator.ts b/newback/src/modules/app/decorators/ws.context.decorator.ts
index 0a1c1e0c5..495db9a7a 100644
--- a/newback/src/modules/app/decorators/ws.context.decorator.ts
+++ b/newback/src/modules/app/decorators/ws.context.decorator.ts
@@ -1,12 +1,11 @@
 import type {ExecutionContext} from "@nestjs/common";
 import {createParamDecorator} from "@nestjs/common";
 import {WebSocket} from "ws";
-import type {WebSocketContextData} from "@/data/types/internal";
 
 export const WsContext = createParamDecorator(
   (data: unknown, ctx: ExecutionContext) => {
-    const handler = ctx.getArgs().find((a) => a instanceof WebSocket);
-    return handler.context as WebSocketContextData;
+    const handler: WebSocket = ctx.getArgs().find((a) => a instanceof WebSocket);
+    return handler.context;
   },
 );
 
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
index f33759a4f..2cf1799d3 100644
--- a/newback/src/modules/shared/pubsub/pubsub.service.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.service.ts
@@ -1,8 +1,3 @@
-import {
-  HandlerName,
-  HandlerType
-} from "@common/ws/common";
-
 import type {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
 import {
   Injectable,
@@ -10,8 +5,9 @@ import {
 } from "@nestjs/common";
 import type {
   PubSubMessage,
-  WebSocketContextData,
 } from "@/data/types/internal";
+import type {HandlerName} from "@common/ws/common";
+import {WebSocketContextData} from "@/data/types/patch";
 
 
 interface HandlerType {
diff --git a/newback/src/modules/shared/redis/redis.service.ts b/newback/src/modules/shared/redis/redis.service.ts
index 9b4eb0f03..195e22456 100644
--- a/newback/src/modules/shared/redis/redis.service.ts
+++ b/newback/src/modules/shared/redis/redis.service.ts
@@ -1,4 +1,4 @@
-import {REDIS_KEYS,} from "@/data/consts";
+import {REDIS_KEYS} from "@/data/consts";
 import {
   Injectable,
   Logger,
diff --git a/newback/src/modules/shared/ws.adapter/ws.adapter.ts b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
index 0a9fa2690..e7bbefaa5 100644
--- a/newback/src/modules/shared/ws.adapter/ws.adapter.ts
+++ b/newback/src/modules/shared/ws.adapter/ws.adapter.ts
@@ -3,11 +3,6 @@ import type {
   RequestWsOutMessage,
   ResponseWsInMessage,
 } from "@common/ws/common";
-import {
-  DefaultWsInMessage,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
 
 import type {
   Logger,
@@ -29,17 +24,16 @@ import {
   MESSAGE_METADATA,
 } from "@nestjs/websockets/constants";
 import {isFunction} from "@nestjs/common/utils/shared.utils";
-import type {
-  Server,
-  ServerOptions,
-} from "ws";
 import {
   WebSocket,
   WebSocketServer,
 } from "ws";
+import type {
+  Server,
+  ServerOptions,
+} from "ws";
 import {processErrors} from "@/modules/app/decorators/catch.ws.errors";
 
-
 export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOptions> {
   private wsServer: WebSocketServer;
 
@@ -76,7 +70,7 @@ export class WsAdapter implements WebSocketAdapter<Server, WebSocket, ServerOpti
     });
   }
 
-  public bindClientDisconnect(client: BaseWsInstance, callback: Function) {
+  public bindClientDisconnect(client: WebSocket, callback: Function) {
     client.on(DISCONNECT_EVENT, (...arg) => {
       this.logger.log(`Closing connection ${(client as any)?.context?.id}`, "ws");
       callback(...arg);
diff --git a/newback/src/modules/shared/ws.adapter/ws.d.ts b/newback/src/modules/shared/ws.adapter/ws.d.ts
index 875e17d97..e69de29bb 100644
--- a/newback/src/modules/shared/ws.adapter/ws.d.ts
+++ b/newback/src/modules/shared/ws.adapter/ws.d.ts
@@ -1,5 +0,0 @@
-declare module "@types/ws" {
-  declare class WebSocket {
-    context: any;
-  }
-}
diff --git a/newback/src/utils/jest.config.ts b/newback/src/utils/jest.config.ts
index 3a508068e..aa05266c7 100644
--- a/newback/src/utils/jest.config.ts
+++ b/newback/src/utils/jest.config.ts
@@ -20,7 +20,7 @@ export default async(): Promise<Config.InitialOptions> => ({
     "json",
     "ts",
   ],
-  globalSetup: "./utils/jest.setup.ts",
+  globalSetup: "./jest.setup.ts",
   modulePathIgnorePatterns: ["e2e.spec.ts"],
   testRegex: ".*\\.spec\\.ts$",
   transform: {
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index c8b32cc98..1f0738c8e 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -4,6 +4,13 @@
     "**/*.spec.ts",
     "dist"
   ],
+  "ts-node": {
+    "files": true
+  },
+  "files": [
+    "src/main.ts",
+    "src/data/types/patch.d.ts"
+  ],
   "compilerOptions": {
      "paths": {
       "@/*": ["src/*"],

From 4ba38a59b516a22219f0fc18b56e344e0358a2dc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 1 May 2022 14:05:55 +0300
Subject: [PATCH 096/221] Fixed tests

---
 newback/src/data/types/internal.ts                     | 1 +
 newback/src/modules/api/auth/auth.module.spec.ts       | 9 ++++-----
 newback/src/modules/shared/email/email.service.spec.ts | 2 +-
 newback/src/utils/jest.config.ts                       | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index 9f56e434d..d0d06d92b 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -7,6 +7,7 @@ import type {RoomModel} from "@/data/model/room.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {ChannelModel} from "@/data/model/channel.model";
 import type {UserModel} from "@/data/model/user.model";
+import {WebSocketContextData} from "@/data/types/patch";
 
 
 
diff --git a/newback/src/modules/api/auth/auth.module.spec.ts b/newback/src/modules/api/auth/auth.module.spec.ts
index 21aa7c74a..6482bd689 100644
--- a/newback/src/modules/api/auth/auth.module.spec.ts
+++ b/newback/src/modules/api/auth/auth.module.spec.ts
@@ -26,7 +26,6 @@ import * as googleResponseFixture from "@/fixtures/google.response.fixture.json"
 import * as facebookGetTokenResponseFixture from "@/fixtures/facebook.get.token.response.json";
 import * as facebookGetUserResponseFixture from "@/fixtures/facebook.get.user.response.json";
 import {ConfigService} from "@/modules/shared/config/config.service";
-import type {IConfig} from "node-ts-config";
 import {config} from "node-ts-config";
 import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
 import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
@@ -169,7 +168,7 @@ describe("AuthModule", () => {
           publicKey: "a",
           privateKey: "a",
         },
-      } as IConfig);
+      } as typeof config);
       const {body} = await request.post("/api/auth/sign-in").send({
         username: "a",
         password: "as$",
@@ -195,7 +194,7 @@ describe("AuthModule", () => {
           publicKey: "a",
           privateKey: "a",
         },
-      } as IConfig);
+      } as typeof config);
       nodeApply = jest.fn().mockReturnValue({json: jest.fn().mockResolvedValue({success: true})});
       const {body} = await request.post("/api/auth/sign-in").send({
         username: "a",
@@ -333,7 +332,7 @@ describe("AuthModule", () => {
             accessToken: "test",
           },
         },
-      } as IConfig);
+      } as typeof config);
       userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue({
         id: 1,
         user: {
@@ -361,7 +360,7 @@ describe("AuthModule", () => {
             accessToken: "test",
           },
         },
-      } as IConfig);
+      } as typeof config);
       userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue(null);
 
       userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
diff --git a/newback/src/modules/shared/email/email.service.spec.ts b/newback/src/modules/shared/email/email.service.spec.ts
index b3b0f0cb4..29b9bbf2d 100644
--- a/newback/src/modules/shared/email/email.service.spec.ts
+++ b/newback/src/modules/shared/email/email.service.spec.ts
@@ -1,6 +1,6 @@
 import {HtmlService} from "@/modules/shared/html/html.service";
 import {EmailService} from "@/modules/shared/email/email.service";
-import type {TestingModule} from "@nestjs/testing";
+import {TestingModule} from "@nestjs/testing";
 import {Test} from "@nestjs/testing";
 import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {MailerService} from "@nestjs-modules/mailer";
diff --git a/newback/src/utils/jest.config.ts b/newback/src/utils/jest.config.ts
index aa05266c7..ef6e1bcab 100644
--- a/newback/src/utils/jest.config.ts
+++ b/newback/src/utils/jest.config.ts
@@ -10,6 +10,7 @@ const config: Config.InitialOptions = {
 };
 
 export default async(): Promise<Config.InitialOptions> => ({
+  rootDir: '../',
   globals: {
     "ts-jest": {
       compiler: "ttypescript",
@@ -20,7 +21,7 @@ export default async(): Promise<Config.InitialOptions> => ({
     "json",
     "ts",
   ],
-  globalSetup: "./jest.setup.ts",
+  globalSetup: "./utils/jest.setup.ts",
   modulePathIgnorePatterns: ["e2e.spec.ts"],
   testRegex: ".*\\.spec\\.ts$",
   transform: {

From 9cdec2c06e7e540f527aad3185b59d1e3e75a44f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 1 May 2022 14:10:34 +0300
Subject: [PATCH 097/221] Fix coverage ignore since when root in src it's not
 required

---
 newback/src/utils/jest.config.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/newback/src/utils/jest.config.ts b/newback/src/utils/jest.config.ts
index ef6e1bcab..1f10f4b94 100644
--- a/newback/src/utils/jest.config.ts
+++ b/newback/src/utils/jest.config.ts
@@ -29,13 +29,8 @@ export default async(): Promise<Config.InitialOptions> => ({
   },
   collectCoverageFrom: ["**/*.(t|j)s"],
   coveragePathIgnorePatterns: [
-    "/node_modules/",
-    "/coverage/",
-    "/src/utils/jest.config.ts",
-    "/dist/",
-    ".module.ts$",
-    ".dto.ts$",
+    "./utils/jest.config.ts",
   ],
-  coverageDirectory: "./coverage",
+  coverageDirectory: "../coverage",
   testEnvironment: "node",
 });

From 38add53fa8e0360f846d144b121bb48debaefd2f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 1 May 2022 14:34:57 +0300
Subject: [PATCH 098/221] Fix build

---
 frontend/build/vite.config.ts                   | 2 ++
 frontend/src/vue/App.vue                        | 2 +-
 frontend/src/vue/auth/SignUp.vue                | 2 +-
 frontend/src/vue/auth/SocialAuthSignUp.vue      | 2 +-
 frontend/src/vue/chat/chatbox/ChatBackIcon.vue  | 2 +-
 frontend/src/vue/chat/chatbox/ChatBox.vue       | 7 ++-----
 frontend/src/vue/chat/chatbox/ChatBoxes.vue     | 4 +---
 frontend/src/vue/chat/right/RoomRightIcon.vue   | 2 +-
 frontend/src/vue/chat/textarea/ChatTextArea.vue | 2 +-
 frontend/src/vue/pages/ChannelSettings.vue      | 2 +-
 frontend/src/vue/pages/CreateChannel.vue        | 2 +-
 frontend/src/vue/pages/RoomSettings.vue         | 2 +-
 frontend/src/vue/pages/UserProfileInfo.vue      | 6 +++---
 frontend/src/vue/pages/UserProfileSettings.vue  | 4 ++--
 14 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/frontend/build/vite.config.ts b/frontend/build/vite.config.ts
index c94ff69f7..16276d6eb 100644
--- a/frontend/build/vite.config.ts
+++ b/frontend/build/vite.config.ts
@@ -32,6 +32,7 @@ export default defineConfig(async({command, mode}) => {
 
   const PYCHAT_CONSTS = getConsts(gitHash, command);
   const srcDir = resolve(__dirname, '..', 'src');
+  const commonDir = resolve(__dirname, '..', '..', 'common');
   const distDir = resolve(__dirname, '..', 'dist');
   const nodeModulesDir = resolve(__dirname, '..', 'node_modules');
   const swFilePath = resolve(srcDir, 'ts', 'sw.ts');
@@ -39,6 +40,7 @@ export default defineConfig(async({command, mode}) => {
     resolve: {
       alias: [
         {find: '@', replacement: srcDir},
+        {find: '@common', replacement: commonDir},
       ],
     },
     ...(PYCHAT_CONSTS.PUBLIC_PATH ? {base: PYCHAT_CONSTS.PUBLIC_PATH} : null),
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index ec2f191e9..fbe25a052 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -14,7 +14,7 @@ import {
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import Growls from "@/vue/parts/Growls.vue";
-import {Theme} from "@/ts/types/shared/enums";
+
 
 @Component({
   name: "App",
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index 186b7850f..a504615ef 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -133,7 +133,7 @@ import {IconColor} from "@/ts/types/types";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import SocialAuthSignUp from "@/vue/auth/SocialAuthSignUp.vue";
 import {USERNAME_REGEX} from "@/ts/utils/consts";
-import {Gender} from "@/ts/types/shared/enums";
+
 
 @Component({
   name: "SignUp",
diff --git a/frontend/src/vue/auth/SocialAuthSignUp.vue b/frontend/src/vue/auth/SocialAuthSignUp.vue
index 9f38f685d..aad9d3d02 100644
--- a/frontend/src/vue/auth/SocialAuthSignUp.vue
+++ b/frontend/src/vue/auth/SocialAuthSignUp.vue
@@ -17,7 +17,7 @@ import {
   FACEBOOK_APP_ID,
   GOOGLE_OAUTH_2_CLIENT_ID,
 } from "@/ts/utils/consts";
-import {OauthSessionResponse} from "@/ts/types/shared/http";
+
 
 @Component({
   name: "SocialAuthSignUp",
diff --git a/frontend/src/vue/chat/chatbox/ChatBackIcon.vue b/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
index e296d9156..1a552baf6 100644
--- a/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
@@ -7,7 +7,7 @@ import {
   Vue,
 } from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
-import {ALL_ROOM_ID} from "@/ts/utils/consts";
+import {ALL_ROOM_ID} from "@common/consts";
 
 @Component({name: "ChatBackIcon"})
 export default class ChatBackIcon extends Vue {
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 87f311507..09e1b88a9 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -121,11 +121,8 @@ import ChatTextArea from "@/vue/chat/textarea/ChatTextArea.vue";
 import ChatShowUserTyping from "@/vue/chat/chatbox/ChatShowUserTyping.vue";
 import {isMobile} from "@/ts/utils/runtimeConsts";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {MessageStatus} from "@/ts/types/shared/enums";
+
+
 
 
 @Component({
diff --git a/frontend/src/vue/chat/chatbox/ChatBoxes.vue b/frontend/src/vue/chat/chatbox/ChatBoxes.vue
index 238ba1b96..c57dd9098 100644
--- a/frontend/src/vue/chat/chatbox/ChatBoxes.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBoxes.vue
@@ -26,9 +26,7 @@ import {
 } from "vue-property-decorator";
 import ChatBox from "@/vue/chat/chatbox/ChatBox.vue";
 import {State} from "@/ts/instances/storeInstance";
-
-import {ALL_ROOM_ID} from "@/ts/utils/consts";
-
+import {ALL_ROOM_ID} from "@common/consts";
 import {RoomModel} from "@/ts/types/model";
 
 
diff --git a/frontend/src/vue/chat/right/RoomRightIcon.vue b/frontend/src/vue/chat/right/RoomRightIcon.vue
index 56d145d78..30a9f3a7c 100644
--- a/frontend/src/vue/chat/right/RoomRightIcon.vue
+++ b/frontend/src/vue/chat/right/RoomRightIcon.vue
@@ -33,7 +33,7 @@ import {
 } from "vue-property-decorator";
 import type {MessageModel} from "@/ts/types/model";
 import {RoomModel} from "@/ts/types/model";
-import {MessageStatus} from "@/ts/types/shared/enums";
+
 
 
 @Component({name: "RoomRightIcon"})
diff --git a/frontend/src/vue/chat/textarea/ChatTextArea.vue b/frontend/src/vue/chat/textarea/ChatTextArea.vue
index 14b94854f..77a02c97d 100644
--- a/frontend/src/vue/chat/textarea/ChatTextArea.vue
+++ b/frontend/src/vue/chat/textarea/ChatTextArea.vue
@@ -116,7 +116,7 @@ import ChatTagging from "@/vue/chat/textarea/ChatTagging.vue";
 import {Throttle} from "@/ts/classes/Throttle";
 import GiphySearch from "@/vue/chat/textarea/GiphySearch.vue";
 import type {GIFObject} from "giphy-api";
-import {ImageType} from "@/ts/types/shared/enums";
+
 
 const timePattern = /^\(\d\d:\d\d:\d\d\)\s\w+:.*&gt;&gt;&gt;\s/;
 
diff --git a/frontend/src/vue/pages/ChannelSettings.vue b/frontend/src/vue/pages/ChannelSettings.vue
index d73ee3c5f..52877f76b 100644
--- a/frontend/src/vue/pages/ChannelSettings.vue
+++ b/frontend/src/vue/pages/ChannelSettings.vue
@@ -120,9 +120,9 @@ import {
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import type {RouterNavigateMessage} from "@/ts/types/messages/innerMessages";
-import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
+import {ALL_ROOM_ID} from "@common/consts";
 
 @Component({
   name: "ChannelSettings",
diff --git a/frontend/src/vue/pages/CreateChannel.vue b/frontend/src/vue/pages/CreateChannel.vue
index 735ac9b7e..4be065f6f 100644
--- a/frontend/src/vue/pages/CreateChannel.vue
+++ b/frontend/src/vue/pages/CreateChannel.vue
@@ -37,9 +37,9 @@ import {
   Vue,
 } from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
-import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import PickUser from "@/vue/parts/PickUser.vue";
+import {ALL_ROOM_ID} from "@common/consts";
 
 @Component({
   name: "CreateChannel",
diff --git a/frontend/src/vue/pages/RoomSettings.vue b/frontend/src/vue/pages/RoomSettings.vue
index a1d3b0dcc..c5e890799 100644
--- a/frontend/src/vue/pages/RoomSettings.vue
+++ b/frontend/src/vue/pages/RoomSettings.vue
@@ -134,10 +134,10 @@ import {
   RoomDictModel,
   UserDictModel,
 } from "@/ts/types/model";
-import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import ParentChannel from "@/vue/parts/ParentChannel.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import {PrivateRoomsIds} from "@/ts/types/types";
+import {ALL_ROOM_ID} from "@common/consts";
 
 
 @Component({
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index cc0a880a6..859c9e598 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -126,9 +126,9 @@ import {CurrentUserInfoModel} from "@/ts/types/model";
 import {currentUserInfoModelToDto} from "@/ts/types/converters";
 import AppInputDate from "@/vue/ui/AppInputDate.vue";
 import type {LogoutMessage} from "@/ts/types/messages/innerMessages";
-import {Gender} from "@/ts/types/shared/enums";
-import {UserProfileDtoWoImage} from "@/ts/types/shared/dto";
-import {SetUserProfileMessage} from "@/ts/types/shared/ws.in.messages";
+
+
+
 
 @Component({
   name: "UserProfileInfo",
diff --git a/frontend/src/vue/pages/UserProfileSettings.vue b/frontend/src/vue/pages/UserProfileSettings.vue
index e3b020165..820ef2d5e 100644
--- a/frontend/src/vue/pages/UserProfileSettings.vue
+++ b/frontend/src/vue/pages/UserProfileSettings.vue
@@ -137,8 +137,8 @@ import {
   addToHomeScreen,
   canBeInstalled,
 } from "@/ts/utils/addToHomeScreen";
-import {UserSettingsDto} from "@/ts/types/shared/dto";
-import {SetSettingsMessage} from "@/ts/types/shared/ws.in.messages";
+
+
 
 @Component({
   name: "UserProfileSettings",

From 9c578d01f4f92b9852c571922934395cdbf42fad Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 1 May 2022 14:35:09 +0300
Subject: [PATCH 099/221] Remove old imports

---
 frontend/src/ts/classes/DatabaseWrapper.ts    |  2 +-
 frontend/src/ts/classes/DefaultStore.ts       |  5 +--
 .../src/ts/classes/NotificationHandler.ts     |  5 +--
 frontend/src/ts/classes/Subscription.ts       |  6 +--
 frontend/src/ts/instances/routerInstance.ts   |  5 +--
 .../AbstractMessageProcessor.ts               |  9 ++--
 frontend/src/ts/message_handlers/Api.ts       | 30 ++-----------
 .../src/ts/message_handlers/MesageHandler.ts  | 10 ++---
 .../src/ts/message_handlers/RomHandler.ts     | 28 ++----------
 frontend/src/ts/message_handlers/WsHandler.ts | 44 +++----------------
 .../ts/message_handlers/WsMessageHandler.ts   | 30 +++----------
 .../ts/message_handlers/WsMessageProcessor.ts |  7 +--
 frontend/src/ts/types/converters.ts           | 17 +------
 frontend/src/ts/types/db.ts                   |  2 +-
 frontend/src/ts/types/dto.ts                  |  2 +-
 .../src/ts/types/messages/innerMessages.ts    | 12 ++---
 frontend/src/ts/types/messages/p2pMessages.ts |  9 ++--
 frontend/src/ts/types/model.ts                |  6 +--
 frontend/src/ts/types/types.ts                |  2 +-
 frontend/src/ts/utils/htmlApi.ts              |  2 +-
 frontend/src/ts/utils/pureFunctions.ts        |  2 +-
 .../src/ts/webrtc/AbstractPeerConnection.ts   |  4 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           | 14 +-----
 frontend/src/ts/webrtc/call/CallHandler.ts    | 13 ++----
 .../src/ts/webrtc/call/CallPeerConnection.ts  |  7 +--
 frontend/src/ts/webrtc/file/FileHandler.ts    |  7 +--
 .../file/FileReceiveerPeerConnection.ts       | 10 +----
 .../webrtc/file/FileSenderPeerConnection.ts   | 10 +----
 .../webrtc/message/MessagePeerConnection.ts   |  7 +--
 .../webrtc/message/MessageTransferHandler.ts  |  4 +-
 30 files changed, 65 insertions(+), 246 deletions(-)

diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 73a4c0dd0..31b0d556a 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -37,7 +37,7 @@ import type {
 import type {SetStateFromStorage} from "@/ts/types/dto";
 import type {MainWindow} from "@/ts/classes/MainWindow";
 import {MessageStatusInner} from "@/ts/types/model";
-import {ImageType} from "@/ts/types/shared/enums";
+
 
 type TransactionCb = (t: SQLTransaction, ...rest: unknown[]) => void;
 type QueryObject = [string, any[]];
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index 98387cc8e..30fffd082 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -79,10 +79,7 @@ import {
   Mutation,
   VuexModule,
 } from "vuex-module-decorators";
-import {
-  Gender,
-  MessageStatus
-} from "@/ts/types/shared/enums";
+
 
 
 const logger = loggerFactory.getLogger("store");
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index f50fa6f12..45349bd49 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -14,10 +14,7 @@ import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {MainWindow} from "@/ts/classes/MainWindow";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
+
 
 
 export default class NotifierHandler extends MessageHandler {
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index a74f9496d..c94ec7226 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,9 +1,9 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/innerMessages";
-import {HandlerName} from "@/ts/types/shared/common";
-import {IMessageHandler} from "@/ts/types/shared/dto";
-import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
+
+
+
 
 export default class Subscription {
   // TODO sub should unsubscribe from some events on logout
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 489876e61..57ba7f1e9 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -40,10 +40,7 @@ import PainterPage from "@/vue/pages/PainterPage.vue";
 import RoomUsersListPage from "@/vue/pages/RoomUsersListPage.vue";
 import ChannelAddRoom from "@/vue/pages/ChannelAddRoom.vue";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
+
 
 
 export function routerFactory(sub: Subscription) {
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 73ae5bab6..0c2c8b876 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -2,12 +2,9 @@ import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import {DefaultWsOutMessage} from "@/ts/types/shared/ws.out.messages";
-import {DefaultWsInMessage} from "@/ts/types/shared/ws.in.messages";
-import {
-  DefaultMessage,
-  HandlerName
-} from "@/ts/types/shared/common";
+
+
+
 
 export default class AbstractMessageProcessor {
   protected readonly callBacks: Record<number, {resolve: Function; reject: Function}> = {};
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 6ca975f2e..4c577df2c 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -3,40 +3,16 @@ import {
   GIPHY_API_KEY,
   GIPHY_URL,
 } from "@/ts/utils/consts";
-import type {
-  OauthSessionResponse,
-  OkResponse,
-  SaveFileRequest,
-  SaveFileResponse,
-  SendRestorePasswordRequest,
-  SessionResponse,
-  SignInRequest,
-  SignUpRequest,
-  ValidateEmailResponse,
-} from "@/ts/types/shared/http";
+
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
-import type {
-  AcceptTokenRequest,
-  AcceptTokenResponse,
-  ConfirmEmailRequest,
-  ConfirmEmailResponse,
-  GoogleSignInResponse,
-  SignUpResponse,
-  ValidateUserEmailRequest,
-  ValidateUserResponse,
-  VerifyTokenRequest,
-  VerifyTokenResponse,
-} from "@/ts/types/shared/http";
+
 import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
 import type Fetch from "@/ts/classes/Fetch";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
+
 import {
   OauthStatus,
   ViewUserProfileDto
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index b86ad76ad..d15cdd0fa 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,11 +1,7 @@
 import type {Logger} from "lines-logger";
-import {IMessageHandler} from "@/ts/types/shared/dto";
-import {
-  HandlerName,
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
+
+
+
 
 
 export default abstract class MessageHandler implements IMessageHandler {
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index d03c7072b..aaf7eb53e 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -25,12 +25,7 @@ import {
   getRoom,
   getRoomsBaseDict,
 } from "@/ts/types/converters";
-import type {
-  AddRoomBase,
-  ChangeDeviceType,
-  ChannelDto,
-  RoomDto,
-} from "@/ts/types/shared/dto";
+
 import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import type {Logger} from "lines-logger";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
@@ -43,26 +38,9 @@ import {
   logout,
 } from "@/ts/utils/audio";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
+
 import {SetStateFromWS} from "@/ts/types/dto";
-import {
-  AddChannelMessage,
-  AddInviteMessage,
-  AddOnlineUserMessage,
-  AddRoomMessage,
-  CreateNewUsedMessage,
-  DeleteChannelMessage,
-  DeleteRoomMessage,
-  InviteUserMessage,
-  LeaveUserMessage,
-  RemoveOnlineUserMessage,
-  SaveChannelSettingsMessage,
-  SaveRoomSettingsMessage,
-  ShowITypeWsInMessage
-} from "@/ts/types/shared/ws.in.messages";
+
 
 export class RoomHandler extends MessageHandler {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 3523ddad9..0459e7084 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -25,52 +25,20 @@ import {
   currentUserInfoDtoToModel,
   userSettingsDtoToModel,
 } from "@/ts/types/converters";
-import type {
-  GiphyDto,
-  MessagesResponseMessage,
-  RoomNoUsersDto,
-  SyncHistoryWsInMessage,
-  UserProfileDto,
-  UserProfileDtoWoImage,
-  UserSettingsDto,
-} from "@/ts/types/shared/dto";
+
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
-import type {AddChannelMessage,
-  AddInviteMessage,
-  AddRoomMessage,
-  GetCountryCodeWsInMessage,
-  PingMessage,
-  PongMessage,
-  PrintMessageWsInMessage,
-  SaveChannelSettingsMessage,
-  SetProfileImageMessage,
-  SetSettingsMessage,
-  SetUserProfileMessage,
-  SetWsIdWsOutMessage,
-  UserProfileChangedMessage,
-  WebRtcSetConnectionIdMessage,
-} from "@/ts/types/shared/ws.in.messages";
+
 import type {
   InternetAppearMessage,
   LogoutMessage,
   PubSetRooms,
 } from "@/ts/types/messages/innerMessages";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {
-  DefaultWsOutMessage,
-  GetCountryCodeWsOutMessage,
-  PrintMessageWsOutMessage,
-  SetMessageStatusWsOutMessage,
-  ShowITypeWsOutMessage,
-  SyncHistoryWsOutMessage
-} from "@/ts/types/shared/ws.out.messages";
-import {MessageStatus} from "@/ts/types/shared/enums";
-import {WS_SESSION_EXPIRED_CODE} from "@/ts/types/shared/consts";
+
+
+
+
 
 enum WsState {
   NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 81ee253c0..047346c5f 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -17,12 +17,7 @@ import type {
 import {MessageStatusInner} from "@/ts/types/model";
 import type {Logger} from "lines-logger";
 
-import type {
-  GiphyDto,
-  MessageModelDto,
-  MessagesResponseMessage,
-  SyncHistoryWsInMessage,
-} from "@/ts/types/shared/dto";
+
 
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
@@ -40,25 +35,10 @@ import {
   getMissingIds,
 } from "@/ts/utils/pureFunctions";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  SaveFileRequest,
-  SaveFileResponse
-} from "@/ts/types/shared/http";
-import {
-  ImageType,
-  MessageStatus
-} from "@/ts/types/shared/enums";
-import {
-  DeleteMessage,
-  EditMessage,
-  PrintMessageWsInMessage,
-  SetMessageStatusWsInMessage
-} from "@/ts/types/shared/ws.in.messages";
-import {
-  HandlerName,
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
+
+
+
+
 
 export default class WsMessageHandler extends MessageHandler implements MessageSender {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index cbbf96867..eaa69a049 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -2,11 +2,8 @@ import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProce
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import {
-  DefaultWsInMessage,
-  GrowlMessage
-} from "@/ts/types/shared/ws.in.messages";
-import {HandlerName} from "@/ts/types/shared/common";
+
+
 
 export class WsMessageProcessor extends AbstractMessageProcessor {
   private readonly sub: Subscription;
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index aaf5eb7b0..07a6a8adc 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -10,26 +10,13 @@ import type {
   RoomSettingsModel,
   UserModel,
 } from "@/ts/types/model";
-import type {
-  ChannelDto,
-  FileModelDto,
-  LocationDto,
-  MessageModelDto,
-  RoomDto,
-  RoomNoUsersDto,
-  UserDto,
-  UserProfileDtoWoImage,
-  UserSettingsDto,
-} from "@/ts/types/shared/dto";
+
 import type {
   BooleanDB,
   SexDB,
 } from "@/ts/types/db";
 import type {MessageP2pDto} from "@/ts/types/messages/p2pDto";
-import {
-  Gender,
-  MessageStatus
-} from "@/ts/types/shared/enums";
+
 
 export function currentUserInfoDtoToModel(userInfo: UserProfileDtoWoImage): CurrentUserInfoWoImage {
   return {...userInfo};
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index fd3941593..117ee78a7 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,6 +1,6 @@
 import type {LogLevel} from "lines-logger";
 import {MessageStatusInner} from '@/ts/types/model';
-import {Gender} from "@/ts/types/shared/enums";
+
 
 export interface UserDB {
   id: number;
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 0c22d66aa..e16b27356 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -6,7 +6,7 @@ import type {
   RoomDictModel,
   UserModel,
 } from "@/ts/types/model";
-import {UserProfileDto} from "@/ts/types/shared/dto";
+
 
 export interface ViewUserProfileDto extends UserProfileDto {
   image: string;
diff --git a/frontend/src/ts/types/messages/innerMessages.ts b/frontend/src/ts/types/messages/innerMessages.ts
index 8a9fabb49..5f61efaee 100644
--- a/frontend/src/ts/types/messages/innerMessages.ts
+++ b/frontend/src/ts/types/messages/innerMessages.ts
@@ -3,16 +3,10 @@
  * So if you're creating structure that you pass to sub.notify() it should go here.
  * This excludes messages that comes deserialized from websocket or any other network
  */
-import type {
-  ChangeDeviceType,
-  ChangeOnlineType,
-  ChannelDto,
-  RoomDto,
-  UserDto,
-} from "@/ts/types/shared/dto";
+
 import type {MessageStatusModel} from "@/ts/types/model";
-import {HandlerName} from "@/ts/types/shared/common";
-import {DefaultInMessage} from "@/ts/types/shared/ws.in.messages";
+
+
 
 
 export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H> {
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index 1ddf5021a..c730e124c 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -8,12 +8,9 @@ import type {
   MessageP2pDto,
   MessagesInfo,
 } from "@/ts/types/messages/p2pDto";
-import {DefaultMessage} from "@/ts/types/shared/common";
-import {
-  CallBackMessage,
-  ResolveCallbackId
-} from "@/ts/types/shared/dto";
-import {MessageStatus} from "@/ts/types/shared/enums";
+
+
+
 
 
 
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 5a159650d..26dbf3d40 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,9 +1,5 @@
 import type {LogLevel} from "lines-logger";
-import {
-  Gender,
-  ImageType,
-  MessageStatus
-} from "@/ts/types/shared/enums";
+
 
 export enum GrowlType {
   SUCCESS = "col-success", INFO = "col-info", ERROR = "col-error",
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 642d93f00..cfa4be7c5 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -20,7 +20,7 @@ import {
   MessageStatusInner,
   MessageStatusModel
 } from '@/ts/types/model';
-import {SaveFileResponse} from "@/ts/types/shared/http";
+
 
 export type ValueFilterForKey<T extends object, U> = {
   [K in keyof T]: U extends T[K] ? K : never;
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index 993c453c1..2b2376812 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -25,7 +25,7 @@ import {
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GIFObject} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
-import {ImageType} from "@/ts/types/shared/enums";
+
 
 const tmpCanvasContext: CanvasRenderingContext2D = document.createElement("canvas").getContext("2d")!; // TODO why is it not safe?
 const yotubeTimeRegex = /(?:(\d*)h)?(?:(\d*)m)?(?:(\d*)s)?(\d)?/;
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index 08d3dcd51..e411ee67b 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -6,7 +6,7 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {MessageSender} from "@/ts/types/types";
 import {ALLOW_EDIT_MESSAGE_IF_UPDATE_HAPPENED_MS_AGO} from "@/ts/utils/consts";
 import {MessageStatusInner} from '@/ts/types/model';
-import {MessageStatus} from "@/ts/types/shared/enums";
+
 
 export function bytesToSize(bytes: number): string {
   const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 6f077ec1d..3b6c8f7a1 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -11,8 +11,8 @@ import type {
   ConnectToRemoteMessage,
 } from "@/ts/types/messages/innerMessages";
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
-import {HandlerName} from "@/ts/types/shared/common";
-import {SendRtcDataMessage} from "@/ts/types/shared/ws.in.messages";
+
+
 
 
 export default abstract class AbstractPeerConnection extends MessageHandler {
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 6176fc9eb..c6627cbdf 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -28,18 +28,8 @@ import type {
 } from "@/ts/types/messages/innerMessages";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import type {MessageSenderProxy} from "@/ts/message_handlers/MessageSenderProxy";
-import {
-  HandlerName,
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {
-  NotifyCallActiveMessage,
-  OfferCall,
-  OfferFile,
-  OfferMessage,
-  WebRtcSetConnectionIdMessage
-} from "@/ts/types/shared/ws.in.messages";
+
+
 
 export default class WebRtcApi extends MessageHandler {
   protected logger: Logger;
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index d9b5dc35b..c00326119 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -40,16 +40,9 @@ import type {
 } from "@/ts/types/messages/innerMessages";
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 import {stopVideo} from "@/ts/utils/htmlApi";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {CallStatus} from "@/ts/types/shared/dto";
-import {
-  AcceptCallMessage,
-  OfferCall,
-  ReplyCallMessage
-} from "@/ts/types/shared/ws.in.messages";
+
+
+
 
 
 export default class CallHandler extends FileAndCallTransfer {
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 2c7b40cab..8b628e06d 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -27,11 +27,8 @@ import type {
 } from "@/ts/types/model";
 import {stopVideo} from "@/ts/utils/htmlApi";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {DestroyCallConnection} from "@/ts/types/shared/ws.in.messages";
+
+
 
 export default abstract class CallPeerConnection extends AbstractPeerConnection {
   protected readonly handlers: HandlerTypes<keyof CallPeerConnection, "peerConnection:*"> = {
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 8cdf088f9..6e7c4a1a1 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -5,11 +5,8 @@ import FileSenderPeerConnection from "@/ts/webrtc/file/FileSenderPeerConnection"
 import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {ReplyFileMessage} from "@/ts/types/shared/ws.in.messages";
+
+
 
 
 export default class FileHandler extends FileAndCallTransfer {
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index 687c8d48d..dc7e47602 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -14,14 +14,8 @@ import {
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {
-  DestroyFileConnectionMessage,
-  RetryFileMessage
-} from "@/ts/types/shared/ws.in.messages";
+
+
 
 export default class FileReceiverPeerConnection extends FilePeerConnection {
   protected readonly handlers: HandlerTypes<keyof FileReceiverPeerConnection, "peerConnection:*"> = {
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 8820d31f2..28f716b25 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -17,14 +17,8 @@ import {
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {
-  AcceptFileMessage,
-  DestroyFileConnectionMessage
-} from "@/ts/types/shared/ws.in.messages";
+
+
 
 export default class FileSenderPeerConnection extends FilePeerConnection {
   protected readonly handlers: HandlerTypes<keyof FileSenderPeerConnection, "peerConnection:*"> = {
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 3a941e891..d7f336edc 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -37,11 +37,8 @@ import type {
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Subscription from "@/ts/classes/Subscription";
-import {
-  HandlerType,
-  HandlerTypes
-} from "@/ts/types/shared/common";
-import {MessageStatus} from "@/ts/types/shared/enums";
+
+
 
 export default abstract class MessagePeerConnection extends AbstractPeerConnection implements MessageSupplier {
   connectedToRemote: boolean = true;
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index e12a0cecf..c93387066 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -16,8 +16,8 @@ import type {
 } from "@/ts/types/messages/innerMessages";
 
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
-import {HandlerTypes} from "@/ts/types/shared/common";
-import {MessageStatus} from "@/ts/types/shared/enums";
+
+
 
 /**
  *

From 043b2c292c118b070e80a7d14d767686c28537bc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 2 May 2022 13:53:17 +0300
Subject: [PATCH 100/221] Fixed tests

---
 .github/workflows/newback.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/newback.yml b/.github/workflows/newback.yml
index fcd2b3768..df101ef39 100644
--- a/.github/workflows/newback.yml
+++ b/.github/workflows/newback.yml
@@ -28,7 +28,7 @@ jobs:
           yarn config set cache-folder `pwd`/yarn-cache
           yarn install --frozen-lockfile
       - name: Run tests
-        run: cd newback && yarn jest --runInBand --coverage --detectOpenHandles --coverageReporters json text
+        run: cd newback && yarn jest --config ./src/utils/jest.config.ts --runInBand --coverage --detectOpenHandles --coverageReporters json text
       - name: Coverage
         run: |
           cd newback

From 1647a558ef1f0c5bc3d7a60d073f37eb0e50a2a4 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 2 May 2022 16:53:17 +0300
Subject: [PATCH 101/221] Adding types

---
 frontend/build/vite.config.ts                 |  2 +-
 frontend/src/ts/classes/DatabaseWrapper.ts    |  3 +-
 frontend/src/ts/classes/DefaultStore.ts       |  3 +-
 frontend/src/ts/classes/Fetch.ts              |  5 +--
 frontend/src/ts/classes/LocalStorage.ts       |  2 +-
 .../src/ts/classes/NotificationHandler.ts     |  1 -
 frontend/src/ts/classes/Subscription.ts       |  3 +-
 frontend/src/ts/devices/electron.ts           |  2 +-
 frontend/src/ts/instances/routerInstance.ts   |  1 -
 frontend/src/ts/main.ts                       |  2 +-
 .../AbstractMessageProcessor.ts               | 25 +++++++++------
 frontend/src/ts/message_handlers/Api.ts       | 13 ++++++++
 .../src/ts/message_handlers/MesageHandler.ts  |  4 +--
 .../src/ts/message_handlers/RomHandler.ts     | 18 +++++++++++
 frontend/src/ts/message_handlers/WsHandler.ts | 32 +++++++++++++++++--
 .../ts/message_handlers/WsMessageHandler.ts   | 19 ++++++++---
 .../ts/message_handlers/WsMessageProcessor.ts |  1 -
 frontend/src/ts/types/converters.ts           | 18 ++++++++---
 frontend/src/ts/types/db.ts                   |  1 +
 frontend/src/ts/types/dto.ts                  |  1 +
 .../src/ts/types/messages/innerMessages.ts    | 19 ++++++++---
 frontend/src/ts/types/messages/p2pMessages.ts |  4 ---
 frontend/src/ts/types/model.ts                |  3 ++
 frontend/src/ts/types/types.ts                | 10 ++----
 frontend/src/ts/utils/htmlApi.ts              |  1 +
 frontend/src/ts/utils/pureFunctions.ts        |  3 +-
 .../src/ts/webrtc/AbstractPeerConnection.ts   |  3 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           |  8 ++++-
 frontend/src/ts/webrtc/call/CallHandler.ts    |  8 +++--
 .../src/ts/webrtc/call/CallPeerConnection.ts  |  2 +-
 frontend/src/ts/webrtc/file/FileHandler.ts    |  2 --
 .../file/FileReceiveerPeerConnection.ts       |  1 -
 .../webrtc/file/FileSenderPeerConnection.ts   |  1 -
 .../webrtc/message/MessagePeerConnection.ts   |  2 +-
 .../webrtc/message/MessageTransferHandler.ts  |  2 +-
 frontend/src/vue/App.vue                      |  1 +
 frontend/src/vue/auth/SignUp.vue              |  1 -
 frontend/src/vue/chat/chatbox/ChatBox.vue     |  2 --
 frontend/src/vue/chat/right/RoomRightIcon.vue |  1 -
 frontend/src/vue/pages/UserProfileInfo.vue    |  2 --
 .../src/vue/pages/UserProfileSettings.vue     |  1 -
 41 files changed, 157 insertions(+), 76 deletions(-)

diff --git a/frontend/build/vite.config.ts b/frontend/build/vite.config.ts
index 16276d6eb..2e2e833b3 100644
--- a/frontend/build/vite.config.ts
+++ b/frontend/build/vite.config.ts
@@ -32,7 +32,7 @@ export default defineConfig(async({command, mode}) => {
 
   const PYCHAT_CONSTS = getConsts(gitHash, command);
   const srcDir = resolve(__dirname, '..', 'src');
-  const commonDir = resolve(__dirname, '..', '..', 'common');
+  const commonDir = resolve(__dirname, '..', '..', 'common', 'src');
   const distDir = resolve(__dirname, '..', 'dist');
   const nodeModulesDir = resolve(__dirname, '..', 'node_modules');
   const swFilePath = resolve(srcDir, 'ts', 'sw.ts');
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 31b0d556a..8add51f33 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -1,3 +1,4 @@
+import {ImageType} from '@common/model/enum/image.type';
 import type {
   IStorage,
   SetFileIdsForMessage,
@@ -18,6 +19,7 @@ import type {
   RoomSettingsModel,
   UserModel,
 } from "@/ts/types/model";
+import {MessageStatusInner} from "@/ts/types/model";
 import {
   convertToBoolean,
   getChannelDict,
@@ -36,7 +38,6 @@ import type {
 } from "@/ts/types/db";
 import type {SetStateFromStorage} from "@/ts/types/dto";
 import type {MainWindow} from "@/ts/classes/MainWindow";
-import {MessageStatusInner} from "@/ts/types/model";
 
 
 type TransactionCb = (t: SQLTransaction, ...rest: unknown[]) => void;
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index 30fffd082..be565c1a9 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -1,3 +1,5 @@
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
 import Vuex from "vuex";
 
 import loggerFactory from "@/ts/instances/loggerFactory";
@@ -81,7 +83,6 @@ import {
 } from "vuex-module-decorators";
 
 
-
 const logger = loggerFactory.getLogger("store");
 
 
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index c551f9cbe..a0adb16a5 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -2,13 +2,10 @@ import type {
   PostData,
   SessionHolder,
 } from "@/ts/types/types";
+import {UploadData} from "@/ts/types/types";
 import {XHR_API_URL} from "@/ts/utils/runtimeConsts";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import {
-  SetMessageProgress,
-  UploadData
-} from "@/ts/types/types";
 
 export default class Fetch {
   protected httpLogger: Logger;
diff --git a/frontend/src/ts/classes/LocalStorage.ts b/frontend/src/ts/classes/LocalStorage.ts
index 8ab30a1c5..533235f7f 100644
--- a/frontend/src/ts/classes/LocalStorage.ts
+++ b/frontend/src/ts/classes/LocalStorage.ts
@@ -12,8 +12,8 @@ import type {
   RoomSettingsModel,
   UserModel,
 } from "@/ts/types/model";
-import type {Logger} from "lines-logger";
 import {MessageStatusModel} from '@/ts/types/model';
+import type {Logger} from "lines-logger";
 
 interface LocalStorageMessage {
   f: number;
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index 45349bd49..2b281cd26 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -16,7 +16,6 @@ import type {MainWindow} from "@/ts/classes/MainWindow";
 import type Subscription from "@/ts/classes/Subscription";
 
 
-
 export default class NotifierHandler extends MessageHandler {
   protected readonly logger: Logger;
 
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index c94ec7226..26e59db33 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,10 +1,9 @@
+import {IMessageHandler} from "@common/legacy";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/innerMessages";
 
 
-
-
 export default class Subscription {
   // TODO sub should unsubscribe from some events on logout
 
diff --git a/frontend/src/ts/devices/electron.ts b/frontend/src/ts/devices/electron.ts
index 701bd0b3d..6d6918e3c 100644
--- a/frontend/src/ts/devices/electron.ts
+++ b/frontend/src/ts/devices/electron.ts
@@ -6,7 +6,7 @@ import * as constants from "@/ts/utils/consts";
 import {
   ELECTRON_IGNORE_SSL,
   ELECTRON_MAIN_FILE,
-  IS_DEBUG,
+  IS_DEBUG
 } from "@/ts/utils/consts";
 
 let mainWindow: BrowserWindow | null;
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 57ba7f1e9..d83504dc9 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -42,7 +42,6 @@ import ChannelAddRoom from "@/vue/pages/ChannelAddRoom.vue";
 import type Subscription from "@/ts/classes/Subscription";
 
 
-
 export function routerFactory(sub: Subscription) {
   const logger: Logger = loggerFactory.getLogger("router");
   const router = createRouter({
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index 165665852..44488f77d 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -6,7 +6,7 @@ import {
   browserVersion,
   isChrome,
   isMobile,
-  WS_API_URL,
+  WS_API_URL
 } from "@/ts/utils/runtimeConsts";
 // Should be after initStore
 import App from "@/vue/App.vue";
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 0c2c8b876..7a72e8eb1 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -2,8 +2,13 @@ import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-
-
+import type {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage,
+} from "@common/ws/common";
 
 
 export default class AbstractMessageProcessor {
@@ -34,7 +39,7 @@ export default class AbstractMessageProcessor {
     this.logger = loggerFactory.getLoggerColor("mes-proc", "#4c002b");
   }
 
-  public setMessageCbId<T extends DefaultWsOutMessage<K>, K extends string>(message: T) {
+  public setMessageCbId<D>(message: RequestWsOutMessage<string, D>) {
     if (message.cbId) {
       throw Error("Cb id should ge generated by this");
     }
@@ -42,8 +47,8 @@ export default class AbstractMessageProcessor {
     message.cbId = ++this.uniquePositiveMessageId;
   }
 
-  public parseMessage(jsonData: string): DefaultWsInMessage<string, HandlerName> | null {
-    let data: DefaultWsInMessage<string, HandlerName> | null = null;
+  public parseMessage(jsonData: string): DefaultWsInMessage<string, HandlerName, any> | null {
+    let data: DefaultWsInMessage<string, HandlerName, any> | null = null;
     try {
       data = JSON.parse(jsonData);
       this.logData(this.loggerIn, jsonData, data!)();
@@ -55,9 +60,9 @@ export default class AbstractMessageProcessor {
     return data;
   }
 
-  public async sendToServerAndAwait<T extends DefaultWsOutMessage<K>, K extends string>(message: T): Promise<any> {
+  public async sendToServerAndAwait<D, RES>(message: RequestWsOutMessage<string, D>): Promise<ResponseWsInMessage<RES>> {
     return new Promise((resolve, reject) => {
-      this.setMessageCbId(message);
+      this.setMessageCbId<D>(message);
       const jsonMessage = this.getJsonMessage(message);
       this.callBacks[message.cbId!] = {
         resolve,
@@ -70,7 +75,7 @@ export default class AbstractMessageProcessor {
     });
   }
 
-  sendToServer(message: DefaultWsOutMessage<string>): boolean {
+  sendToServer<D>(message: DefaultWsOutMessage<string, D>): boolean {
     const jsonMessage = this.getJsonMessage(message);
     const isSent = this.target.sendRawTextToServer(jsonMessage);
     if (isSent) {
@@ -79,7 +84,7 @@ export default class AbstractMessageProcessor {
     return isSent;
   }
 
-  public getJsonMessage(message: DefaultWsOutMessage<string>) {
+  public getJsonMessage<D>(message: DefaultWsOutMessage<string, D>) {
     return JSON.stringify(message);
   }
 
@@ -97,7 +102,7 @@ export default class AbstractMessageProcessor {
     }
   }
 
-  private logData(logger: Logger, jsonData: string, message: DefaultMessage<string>): () => void {
+  private logData<D>(logger: Logger, jsonData: string, message: DefaultWsInMessage<string, HandlerName, D> | DefaultWsOutMessage<string, D>): () => void {
     let raw = jsonData;
     if (raw.length > 1000) {
       raw = "";
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 4c577df2c..b14316e44 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -1,3 +1,16 @@
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {SignInRequest,} from "@common/http/auth/sign.in";
+import {VerifyTokenResponse} from '@common/http/verify/verify.token';
+import {ConfirmEmailResponse} from '@common/http/verify/confirm.email';
+import {AcceptTokenResponse} from '@common/http/verify/accept.token';
+import {
+  SaveFileRequest,
+  SaveFileResponse
+} from '@common/http/file/save.file';
 import {
   CONNECTION_ERROR,
   GIPHY_API_KEY,
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index d15cdd0fa..67947632f 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,9 +1,7 @@
+import {IMessageHandler} from "@common/legacy";
 import type {Logger} from "lines-logger";
 
 
-
-
-
 export default abstract class MessageHandler implements IMessageHandler {
   protected abstract readonly logger: Logger;
 
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index aaf7eb53e..d3904bfad 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,3 +1,21 @@
+import {
+  AddChannelMessage,
+  AddInviteMessage,
+  AddRoomBase,
+  AddRoomMessage,
+  ChangeDeviceType,
+  CreateNewUsedMessage,
+  DeleteChannelMessage,
+  DeleteRoomMessage,
+  InviteUserMessage,
+  LeaveUserMessage,
+  RemoveOnlineUserMessage,
+  SaveChannelSettingsMessage,
+  SaveRoomSettingsMessage
+} from "@common/legacy";
+import {ChannelDto} from '@common/model/dto/channel.dto';
+import {RoomDto} from '@common/model/dto/room.dto';
+import {ShowITypeWsInMessage} from '@common/ws/message/show.i.type';
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {
   RoomLogEntry,
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 0459e7084..6e1800b51 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,3 +1,32 @@
+import {
+  AddChannelMessage,
+  AddInviteMessage,
+  AddRoomMessage,
+  MessagesResponseMessage,
+  SaveChannelSettingsMessage,
+  SetSettingsMessage,
+  SetUserProfileMessage,
+  UserProfileChangedMessage,
+  WebRtcSetConnectionIdMessage
+} from "@common/legacy";
+import {MessageStatus} from '@common/model/enum/message.status';
+import {GiphyDto} from '@common/model/dto/giphy.dto';
+import {UserProfileDto} from '@common/model/dto/user.profile.dto';
+import {UserSettingsDto} from '@common/model/dto/user.settings.dto';
+import {
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutMessage
+} from '@common/ws/message/sync.history';
+import {ShowITypeWsOutMessage} from '@common/ws/message/show.i.type';
+import {SetMessageStatusWsOutMessage} from '@common/ws/message/set.message.status';
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutMessage
+} from '@common/ws/message/print.message';
+import {
+  GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutMessage
+} from '@common/ws/message/get.country.code';
 import {
   CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT,
   CONNECTION_RETRY_TIME,
@@ -37,9 +66,6 @@ import type {
 import type Subscription from "@/ts/classes/Subscription";
 
 
-
-
-
 enum WsState {
   NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
 }
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 047346c5f..9e84f09c2 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -1,3 +1,18 @@
+import {
+  DeleteMessage,
+  MessagesResponseMessage
+} from "@common/legacy";
+import {ImageType} from '@common/model/enum/image.type';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {GiphyDto} from '@common/model/dto/giphy.dto';
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
+import {SyncHistoryWsInMessage} from '@common/ws/message/sync.history';
+import {SetMessageStatusWsInMessage} from '@common/ws/message/set.message.status';
+import {PrintMessageWsInMessage} from '@common/ws/message/print.message';
+import {
+  SaveFileRequest,
+  SaveFileResponse
+} from '@common/http/file/save.file';
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Api from "@/ts/message_handlers/Api";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
@@ -18,7 +33,6 @@ import {MessageStatusInner} from "@/ts/types/model";
 import type {Logger} from "lines-logger";
 
 
-
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
@@ -37,9 +51,6 @@ import {
 import type Subscription from "@/ts/classes/Subscription";
 
 
-
-
-
 export default class WsMessageHandler extends MessageHandler implements MessageSender {
   protected readonly logger: Logger;
 
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index eaa69a049..50be9c822 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -4,7 +4,6 @@ import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 
-
 export class WsMessageProcessor extends AbstractMessageProcessor {
   private readonly sub: Subscription;
 
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index 07a6a8adc..4831586ce 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -1,3 +1,15 @@
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
+import {ChannelDto} from '@common/model/dto/channel.dto';
+import {FileModelDto} from '@common/model/dto/file.model.dto';
+import {LocationDto} from '@common/model/dto/location.dto';
+import {MessageModelDto} from '@common/model/dto/message.model.dto';
+import {
+  RoomDto,
+  RoomNoUsersDto
+} from '@common/model/dto/room.dto';
+import {UserDto} from '@common/model/dto/user.dto';
+import {UserSettingsDto} from '@common/model/dto/user.settings.dto';
 import type {
   ChannelModel,
   CurrentUserInfoModel,
@@ -11,11 +23,9 @@ import type {
   UserModel,
 } from "@/ts/types/model";
 
-import type {
-  BooleanDB,
-  SexDB,
-} from "@/ts/types/db";
+import type {BooleanDB,} from "@/ts/types/db";
 import type {MessageP2pDto} from "@/ts/types/messages/p2pDto";
+import {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
 
 
 export function currentUserInfoDtoToModel(userInfo: UserProfileDtoWoImage): CurrentUserInfoWoImage {
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index 117ee78a7..639196495 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,3 +1,4 @@
+import {Gender} from '@common/model/enum/gender';
 import type {LogLevel} from "lines-logger";
 import {MessageStatusInner} from '@/ts/types/model';
 
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index e16b27356..2d0b31865 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -1,3 +1,4 @@
+import {UserProfileDto} from '@common/model/dto/user.profile.dto';
 import type {
   ChannelsDictModel,
   CurrentUserInfoModel,
diff --git a/frontend/src/ts/types/messages/innerMessages.ts b/frontend/src/ts/types/messages/innerMessages.ts
index 5f61efaee..1bdfbaad4 100644
--- a/frontend/src/ts/types/messages/innerMessages.ts
+++ b/frontend/src/ts/types/messages/innerMessages.ts
@@ -5,11 +5,20 @@
  */
 
 import type {MessageStatusModel} from "@/ts/types/model";
-
-
-
-
-export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName> extends DefaultInMessage<A, H> {
+import {
+  DefaultWsInMessage,
+  HandlerName
+} from "@common/ws/common";
+import {ChannelDto} from '@common/model/dto/channel.dto';
+import {RoomDto} from '@common/model/dto/room.dto';
+import {UserDto} from '@common/model/dto/user.dto';
+import {
+  ChangeDeviceType,
+  ChangeOnlineType
+} from "@common/legacy";
+
+
+export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName> extends  DefaultWsInMessage<A, H> {
   allowZeroSubscribers?: boolean; // If true, no errors should be present on handeling this message by sucrcription if nothing was notified
 }
 
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index c730e124c..ed143aa83 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -10,10 +10,6 @@ import type {
 } from "@/ts/types/messages/p2pDto";
 
 
-
-
-
-
 export type P2PHandlerType<A extends string> = (a: DefaultP2pMessage<A>) => Promise<void> | void;
 
 export type P2PHandlerTypes<K extends string> = {
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 26dbf3d40..98e95808f 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,3 +1,6 @@
+import {ImageType} from '@common/model/enum/image.type';
+import {Gender} from '@common/model/enum/gender';
+import {MessageStatus} from '@common/model/enum/message.status';
 import type {LogLevel} from "lines-logger";
 
 
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index cfa4be7c5..e56df18f9 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -1,3 +1,4 @@
+import {SaveFileResponse} from '@common/http/file/save.file';
 import type {
   CallInfoModel,
   ChannelModel,
@@ -13,13 +14,8 @@ import type {
   UploadProgressModel,
   UserModel,
 } from "@/ts/types/model";
-import type {
-  SetStateFromStorage,
-} from "@/ts/types/dto";
-import {
-  MessageStatusInner,
-  MessageStatusModel
-} from '@/ts/types/model';
+import {MessageStatusModel} from '@/ts/types/model';
+import type {SetStateFromStorage,} from "@/ts/types/dto";
 
 
 export type ValueFilterForKey<T extends object, U> = {
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index 2b2376812..0826c830d 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -1,3 +1,4 @@
+import {ImageType} from '@common/model/enum/image.type';
 import {
   IS_DEBUG,
   PASTED_GIPHY_CLASS,
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index e411ee67b..e0f55d080 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -1,11 +1,12 @@
+import {MessageStatus} from '@common/model/enum/message.status';
 import type {
   FileModel,
   MessageModel,
 } from "@/ts/types/model";
+import {MessageStatusInner} from '@/ts/types/model';
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {MessageSender} from "@/ts/types/types";
 import {ALLOW_EDIT_MESSAGE_IF_UPDATE_HAPPENED_MS_AGO} from "@/ts/utils/consts";
-import {MessageStatusInner} from '@/ts/types/model';
 
 
 export function bytesToSize(bytes: number): string {
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 3b6c8f7a1..8722dee24 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,3 +1,4 @@
+import {SendRtcDataMessage} from "@common/legacy";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
@@ -13,8 +14,6 @@ import type {
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
 
 
-
-
 export default abstract class AbstractPeerConnection extends MessageHandler {
   protected offerCreator: boolean = false;
 
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index c6627cbdf..08d04a566 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,3 +1,10 @@
+import {
+  NotifyCallActiveMessage,
+  OfferCall,
+  OfferFile,
+  OfferMessage,
+  WebRtcSetConnectionIdMessage
+} from "@common/legacy";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
@@ -30,7 +37,6 @@ import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import type {MessageSenderProxy} from "@/ts/message_handlers/MessageSenderProxy";
 
 
-
 export default class WebRtcApi extends MessageHandler {
   protected logger: Logger;
 
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index c00326119..76a779c37 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,3 +1,8 @@
+import {
+  CallStatus,
+  OfferCall,
+  ReplyCallMessage
+} from "@common/legacy";
 import {
   browserVersion,
   isChrome,
@@ -42,9 +47,6 @@ import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 import {stopVideo} from "@/ts/utils/htmlApi";
 
 
-
-
-
 export default class CallHandler extends FileAndCallTransfer {
   protected readonly handlers: HandlerTypes<keyof CallHandler, "webrtcTransfer:*"> = {
     answerCall: this.answerCall,
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 8b628e06d..55986ef92 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,3 +1,4 @@
+import {DestroyCallConnection} from "@common/legacy";
 import {
   createMicrophoneLevelVoice,
   getAverageAudioLevel,
@@ -29,7 +30,6 @@ import {stopVideo} from "@/ts/utils/htmlApi";
 import type Subscription from "@/ts/classes/Subscription";
 
 
-
 export default abstract class CallPeerConnection extends AbstractPeerConnection {
   protected readonly handlers: HandlerTypes<keyof CallPeerConnection, "peerConnection:*"> = {
     destroy: <HandlerType<"destroy", "peerConnection:*">> this.destroy,
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 6e7c4a1a1..220f34d42 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -7,8 +7,6 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 
 
-
-
 export default class FileHandler extends FileAndCallTransfer {
   protected readonly handlers: HandlerTypes<keyof FileHandler, "webrtcTransfer:*"> = {
     replyFile: <HandlerType<"replyFile", "webrtcTransfer:*">> this.replyFile,
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index dc7e47602..067837db3 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -16,7 +16,6 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
 
 
-
 export default class FileReceiverPeerConnection extends FilePeerConnection {
   protected readonly handlers: HandlerTypes<keyof FileReceiverPeerConnection, "peerConnection:*"> = {
     sendRtcData: <HandlerType<"sendRtcData", "peerConnection:*">> this.sendRtcData,
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 28f716b25..f01dab85d 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -19,7 +19,6 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
 
 
-
 export default class FileSenderPeerConnection extends FilePeerConnection {
   protected readonly handlers: HandlerTypes<keyof FileSenderPeerConnection, "peerConnection:*"> = {
     destroyFileConnection: <HandlerType<"destroyFileConnection", "peerConnection:*">> this.destroyFileConnection,
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index d7f336edc..7af22bb4d 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,3 +1,4 @@
+import {MessageStatus} from '@common/model/enum/message.status';
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
@@ -39,7 +40,6 @@ import loggerFactory from "@/ts/instances/loggerFactory";
 import type Subscription from "@/ts/classes/Subscription";
 
 
-
 export default abstract class MessagePeerConnection extends AbstractPeerConnection implements MessageSupplier {
   connectedToRemote: boolean = true;
 
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index c93387066..fa0c31539 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,3 +1,4 @@
+import {MessageStatus} from '@common/model/enum/message.status';
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
 import type {
   MessageSender,
@@ -18,7 +19,6 @@ import type {
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 
 
-
 /**
  *
  * https://drive.google.com/file/d/1BCtFNNWprfobqQlG4n2lPyWEqroi7nJh/view
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index fbe25a052..a7c753e4d 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -14,6 +14,7 @@ import {
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import Growls from "@/vue/parts/Growls.vue";
+import {Theme} from "@common/model/enum/theme";
 
 
 @Component({
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index a504615ef..c98a96809 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -121,7 +121,6 @@
 import {
   Component,
   Prop,
-  Ref,
   Vue,
   Watch,
 } from "vue-property-decorator";
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 09e1b88a9..63d46d768 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -123,8 +123,6 @@ import {isMobile} from "@/ts/utils/runtimeConsts";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 
 
-
-
 @Component({
   name: "ChatBox",
   components: {
diff --git a/frontend/src/vue/chat/right/RoomRightIcon.vue b/frontend/src/vue/chat/right/RoomRightIcon.vue
index 30a9f3a7c..7b93cba03 100644
--- a/frontend/src/vue/chat/right/RoomRightIcon.vue
+++ b/frontend/src/vue/chat/right/RoomRightIcon.vue
@@ -35,7 +35,6 @@ import type {MessageModel} from "@/ts/types/model";
 import {RoomModel} from "@/ts/types/model";
 
 
-
 @Component({name: "RoomRightIcon"})
 export default class RoomRightIcon extends Vue {
   @Prop() public room!: RoomModel;
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index 859c9e598..531a91cef 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -128,8 +128,6 @@ import AppInputDate from "@/vue/ui/AppInputDate.vue";
 import type {LogoutMessage} from "@/ts/types/messages/innerMessages";
 
 
-
-
 @Component({
   name: "UserProfileInfo",
   components: {
diff --git a/frontend/src/vue/pages/UserProfileSettings.vue b/frontend/src/vue/pages/UserProfileSettings.vue
index 820ef2d5e..a1959ef7d 100644
--- a/frontend/src/vue/pages/UserProfileSettings.vue
+++ b/frontend/src/vue/pages/UserProfileSettings.vue
@@ -139,7 +139,6 @@ import {
 } from "@/ts/utils/addToHomeScreen";
 
 
-
 @Component({
   name: "UserProfileSettings",
   components: {

From 610b19c214bf73801ee36ce4d838b4a8f0329bdf Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 2 May 2022 21:41:48 +0300
Subject: [PATCH 102/221] types

---
 frontend/src/ts/classes/AudioPlayer.ts        | 14 ++++
 frontend/src/ts/classes/DatabaseWrapper.ts    | 14 ++++
 frontend/src/ts/classes/DefaultStore.ts       | 14 ++++
 frontend/src/ts/classes/Fetch.ts              | 14 ++++
 frontend/src/ts/classes/LocalStorage.ts       | 14 ++++
 frontend/src/ts/classes/MainWindow.ts         | 14 ++++
 frontend/src/ts/classes/MediaCapture.ts       | 14 ++++
 .../src/ts/classes/NotificationHandler.ts     | 16 +++-
 frontend/src/ts/classes/SessionHolderImpl.ts  | 14 ++++
 frontend/src/ts/classes/Subscription.ts       | 15 +++-
 .../src/ts/devices/AndroidPlatformUtils.ts    | 14 ++++
 frontend/src/ts/devices/WebPlatformUtils.ts   | 14 ++++
 frontend/src/ts/devices/electron.ts           | 14 ++++
 frontend/src/ts/instances/loggerFactory.ts    | 14 ++++
 frontend/src/ts/instances/mainWindow.ts       | 14 ++++
 frontend/src/ts/instances/routerInstance.ts   | 20 +++--
 frontend/src/ts/instances/sessionInstance.ts  | 14 ++++
 frontend/src/ts/instances/storeInstance.ts    | 14 ++++
 frontend/src/ts/main.ts                       | 14 ++++
 .../AbstractMessageProcessor.ts               | 16 +++-
 frontend/src/ts/message_handlers/Api.ts       | 16 +++-
 .../src/ts/message_handlers/MesageHandler.ts  | 14 ++++
 .../src/ts/message_handlers/MessageHelper.ts  | 14 ++++
 .../ts/message_handlers/MessageSenderProxy.ts | 14 ++++
 .../message_handlers/P2PMessageProcessor.ts   | 14 ++++
 .../src/ts/message_handlers/RomHandler.ts     | 26 ++++---
 frontend/src/ts/message_handlers/WsHandler.ts | 22 ++++--
 .../ts/message_handlers/WsMessageHandler.ts   | 16 +++-
 .../ts/message_handlers/WsMessageProcessor.ts | 62 ++++++++++-----
 frontend/src/ts/sw.ts                         | 14 ++++
 frontend/src/ts/types/converters.ts           | 14 ++++
 frontend/src/ts/types/db.ts                   | 14 ++++
 frontend/src/ts/types/dto.ts                  | 14 ++++
 frontend/src/ts/types/env.d.ts                | 14 ++++
 frontend/src/ts/types/messages/helper.ts      | 23 ++++++
 .../messages/inner/change.p2p.room.info.ts    | 25 ++++++
 .../ts/types/messages/inner/change.stream.ts  | 20 +++++
 .../messages/inner/change.user.online.info.ts | 24 ++++++
 .../messages/inner/check.transfer.destroy.ts  | 21 +++++
 .../types/messages/inner/connect.to.remote.ts | 21 +++++
 .../messages/inner/destroy.peer.connection.ts | 17 ++++
 .../types/messages/inner/internet.appear.ts   | 17 ++++
 frontend/src/ts/types/messages/inner/login.ts | 21 +++++
 .../src/ts/types/messages/inner/logout.ts     | 17 ++++
 .../ts/types/messages/inner/pub.set.rooms.ts  | 28 +++++++
 .../types/messages/inner/router.navigate.ts   | 21 +++++
 .../inner/send.set.messages.status.ts         | 22 ++++++
 .../src/ts/types/messages/inner/sync.p2p.ts   | 20 +++++
 .../src/ts/types/messages/innerMessages.ts    | 78 -------------------
 frontend/src/ts/types/messages/p2pDto.ts      | 14 ++++
 frontend/src/ts/types/model.ts                | 14 ++++
 frontend/src/ts/types/types.ts                | 14 ++++
 frontend/src/ts/utils/addToHomeScreen.ts      | 14 ++++
 frontend/src/ts/utils/audio.ts                | 14 ++++
 frontend/src/ts/utils/audioprocc.ts           | 14 ++++
 frontend/src/ts/utils/directives.ts           | 14 ++++
 frontend/src/ts/utils/flags.ts                | 14 ++++
 frontend/src/ts/utils/htmlApi.ts              | 14 ++++
 frontend/src/ts/utils/mixins.ts               | 14 ++++
 frontend/src/ts/utils/pureFunctions.ts        | 14 ++++
 frontend/src/ts/utils/runtimeConsts.ts        | 14 ++++
 .../src/ts/webrtc/AbstractPeerConnection.ts   | 22 ++++--
 frontend/src/ts/webrtc/BaseTransferHandler.ts | 14 ++++
 frontend/src/ts/webrtc/FileAndCallTransfer.ts |  4 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           | 21 +++--
 frontend/src/ts/webrtc/call/CallHandler.ts    | 26 +++++--
 .../src/ts/webrtc/call/CallPeerConnection.ts  | 20 +++--
 .../webrtc/call/CallReceiverPeerConnection.ts | 14 ++++
 .../webrtc/call/CallSenderPeerConnection.ts   | 16 +++-
 frontend/src/ts/webrtc/file/FileHandler.ts    | 14 ++++
 .../src/ts/webrtc/file/FilePeerConnection.ts  | 14 ++++
 .../file/FileReceiveerPeerConnection.ts       | 14 ++++
 .../webrtc/file/FileSenderPeerConnection.ts   | 14 ++++
 .../webrtc/message/MessagePeerConnection.ts   | 19 ++++-
 .../message/MessageReceiverPeerConnection.ts  | 14 ++++
 .../message/MessageSenderPeerConnection.ts    | 14 ++++
 .../webrtc/message/MessageTransferHandler.ts  | 19 ++++-
 77 files changed, 1202 insertions(+), 159 deletions(-)
 create mode 100644 frontend/src/ts/types/messages/helper.ts
 create mode 100644 frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
 create mode 100644 frontend/src/ts/types/messages/inner/change.stream.ts
 create mode 100644 frontend/src/ts/types/messages/inner/change.user.online.info.ts
 create mode 100644 frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
 create mode 100644 frontend/src/ts/types/messages/inner/connect.to.remote.ts
 create mode 100644 frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
 create mode 100644 frontend/src/ts/types/messages/inner/internet.appear.ts
 create mode 100644 frontend/src/ts/types/messages/inner/login.ts
 create mode 100644 frontend/src/ts/types/messages/inner/logout.ts
 create mode 100644 frontend/src/ts/types/messages/inner/pub.set.rooms.ts
 create mode 100644 frontend/src/ts/types/messages/inner/router.navigate.ts
 create mode 100644 frontend/src/ts/types/messages/inner/send.set.messages.status.ts
 create mode 100644 frontend/src/ts/types/messages/inner/sync.p2p.ts
 delete mode 100644 frontend/src/ts/types/messages/innerMessages.ts

diff --git a/frontend/src/ts/classes/AudioPlayer.ts b/frontend/src/ts/classes/AudioPlayer.ts
index a4a248bf8..bfb78dd5d 100644
--- a/frontend/src/ts/classes/AudioPlayer.ts
+++ b/frontend/src/ts/classes/AudioPlayer.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {MainWindow} from "@/ts/classes/MainWindow";
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 8add51f33..de1579c32 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {ImageType} from '@common/model/enum/image.type';
 import type {
   IStorage,
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index be565c1a9..26b7522f9 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
 import Vuex from "vuex";
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index a0adb16a5..6f6679830 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   PostData,
   SessionHolder,
diff --git a/frontend/src/ts/classes/LocalStorage.ts b/frontend/src/ts/classes/LocalStorage.ts
index 533235f7f..9fd7ecf21 100644
--- a/frontend/src/ts/classes/LocalStorage.ts
+++ b/frontend/src/ts/classes/LocalStorage.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {
   IStorage,
diff --git a/frontend/src/ts/classes/MainWindow.ts b/frontend/src/ts/classes/MainWindow.ts
index 7de26872d..ac6907886 100644
--- a/frontend/src/ts/classes/MainWindow.ts
+++ b/frontend/src/ts/classes/MainWindow.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/classes/MediaCapture.ts b/frontend/src/ts/classes/MediaCapture.ts
index 94dd1a6ea..66e8be32c 100644
--- a/frontend/src/ts/classes/MediaCapture.ts
+++ b/frontend/src/ts/classes/MediaCapture.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {stopVideo} from "@/ts/utils/htmlApi";
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index 2b281cd26..35fbc3254 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {extractError} from "@/ts/utils/pureFunctions";
@@ -10,7 +24,7 @@ import {
   SERVICE_WORKER_URL,
   SERVICE_WORKER_VERSION_LS_NAME,
 } from "@/ts/utils/consts";
-import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
+
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {MainWindow} from "@/ts/classes/MainWindow";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/classes/SessionHolderImpl.ts b/frontend/src/ts/classes/SessionHolderImpl.ts
index 3c7e27618..ef6ff4b3e 100644
--- a/frontend/src/ts/classes/SessionHolderImpl.ts
+++ b/frontend/src/ts/classes/SessionHolderImpl.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {SessionHolder} from "@/ts/types/types";
 
 export class SessionHolderImpl implements SessionHolder {
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index 26e59db33..8c6852bf8 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,7 +1,20 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {IMessageHandler} from "@common/legacy";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
-import type {DefaultInnerSystemMessage} from "@/ts/types/messages/innerMessages";
 
 
 export default class Subscription {
diff --git a/frontend/src/ts/devices/AndroidPlatformUtils.ts b/frontend/src/ts/devices/AndroidPlatformUtils.ts
index 9d1e208a3..59fbcea81 100644
--- a/frontend/src/ts/devices/AndroidPlatformUtils.ts
+++ b/frontend/src/ts/devices/AndroidPlatformUtils.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {IS_ANDROID} from "@/ts/utils/consts";
 import type {
   permissions_type,
diff --git a/frontend/src/ts/devices/WebPlatformUtils.ts b/frontend/src/ts/devices/WebPlatformUtils.ts
index 62de3b69a..da9f412b1 100644
--- a/frontend/src/ts/devices/WebPlatformUtils.ts
+++ b/frontend/src/ts/devices/WebPlatformUtils.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   permissions_type,
   PlatformUtil,
diff --git a/frontend/src/ts/devices/electron.ts b/frontend/src/ts/devices/electron.ts
index 6d6918e3c..71158eb7a 100644
--- a/frontend/src/ts/devices/electron.ts
+++ b/frontend/src/ts/devices/electron.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   app,
   BrowserWindow,
diff --git a/frontend/src/ts/instances/loggerFactory.ts b/frontend/src/ts/instances/loggerFactory.ts
index 354c7d693..a90386b4b 100644
--- a/frontend/src/ts/instances/loggerFactory.ts
+++ b/frontend/src/ts/instances/loggerFactory.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {LogLevel} from "lines-logger";
 import {LoggerFactory} from "lines-logger";
 import {
diff --git a/frontend/src/ts/instances/mainWindow.ts b/frontend/src/ts/instances/mainWindow.ts
index 092f53461..665d6dbf5 100644
--- a/frontend/src/ts/instances/mainWindow.ts
+++ b/frontend/src/ts/instances/mainWindow.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MainWindow} from "@/ts/classes/MainWindow";
 import {store} from "@/ts/instances/storeInstance";
 
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index d83504dc9..9989102ec 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   createRouter,
   createWebHashHistory,
@@ -30,11 +44,7 @@ import ChannelSettings from "@/vue/pages/ChannelSettings.vue";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import type {
-  LoginMessage,
-  LogoutMessage,
-  RouterNavigateMessage,
-} from "@/ts/types/messages/innerMessages";
+
 import UserProfileOauthSettings from "@/vue/pages/UserProfileOauthSettings.vue";
 import PainterPage from "@/vue/pages/PainterPage.vue";
 import RoomUsersListPage from "@/vue/pages/RoomUsersListPage.vue";
diff --git a/frontend/src/ts/instances/sessionInstance.ts b/frontend/src/ts/instances/sessionInstance.ts
index 88d77d81b..c4106ff27 100644
--- a/frontend/src/ts/instances/sessionInstance.ts
+++ b/frontend/src/ts/instances/sessionInstance.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {SessionHolder} from "@/ts/types/types";
 import {SessionHolderImpl} from "@/ts/classes/SessionHolderImpl";
 
diff --git a/frontend/src/ts/instances/storeInstance.ts b/frontend/src/ts/instances/storeInstance.ts
index d172916f2..8fe0797a3 100644
--- a/frontend/src/ts/instances/storeInstance.ts
+++ b/frontend/src/ts/instances/storeInstance.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {VueBase} from "vue-class-component";
 import type {VuexModule} from "vuex-module-decorators";
 import {getModule} from "vuex-module-decorators";
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index 44488f77d..6453cb430 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import "@/assets/sass/common.sass";
 import * as constants from "@/ts/utils/consts";
 
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 7a72e8eb1..ce04a967c 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
@@ -47,7 +61,7 @@ export default class AbstractMessageProcessor {
     message.cbId = ++this.uniquePositiveMessageId;
   }
 
-  public parseMessage(jsonData: string): DefaultWsInMessage<string, HandlerName, any> | null {
+  public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | null | ResponseWsInMessage<D> {
     let data: DefaultWsInMessage<string, HandlerName, any> | null = null;
     try {
       data = JSON.parse(jsonData);
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index b14316e44..f9e605d9d 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
 import type {
   SignUpRequest,
@@ -21,7 +35,7 @@ import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 
-import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
+
 import type {MultiResponse} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
 import type Fetch from "@/ts/classes/Fetch";
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index 67947632f..54bdd0a0f 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {IMessageHandler} from "@common/legacy";
 import type {Logger} from "lines-logger";
 
diff --git a/frontend/src/ts/message_handlers/MessageHelper.ts b/frontend/src/ts/message_handlers/MessageHelper.ts
index 4ad3f245f..cb07ed7fc 100644
--- a/frontend/src/ts/message_handlers/MessageHelper.ts
+++ b/frontend/src/ts/message_handlers/MessageHelper.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import faviconUrl from "@/assets/img/favicon.ico";
 import {incoming} from "@/ts/utils/audio";
 import type {
diff --git a/frontend/src/ts/message_handlers/MessageSenderProxy.ts b/frontend/src/ts/message_handlers/MessageSenderProxy.ts
index dbf54818a..5168fe3db 100644
--- a/frontend/src/ts/message_handlers/MessageSenderProxy.ts
+++ b/frontend/src/ts/message_handlers/MessageSenderProxy.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import type {MessageSender} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
index 5e887c989..f795ac359 100644
--- a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type {DefaultP2pMessage} from "@/ts/types/messages/p2pMessages";
 
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index d3904bfad..3c4d086d3 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   AddChannelMessage,
   AddInviteMessage,
@@ -21,13 +35,7 @@ import type {
   RoomLogEntry,
   SetRoomsUsers,
 } from "@/ts/types/types";
-import type {
-  ChangeP2pRoomInfoMessage,
-  ChangeUserOnlineInfoMessage,
-  LogoutMessage,
-  PubSetRooms,
-  RouterNavigateMessage,
-} from "@/ts/types/messages/innerMessages";
+
 import type {
   ChannelModel,
   ChannelsDictModel,
@@ -256,14 +264,14 @@ export class RoomHandler extends MessageHandler {
     this.store.logout();
   }
 
-  public init(m: PubSetRooms) {
+  public init(m: PubSetRoomsMessage) {
     const {rooms, channels, users, online} = m;
 
     /*
      * Otherwise, we will modify value from ws, which will make observable in logs
      * other values from 'm' are converted with convertable
      */
-    const ids: PubSetRooms["online"] = JSON.parse(JSON.stringify(online));
+    const ids: PubSetRoomsMessage["online"] = JSON.parse(JSON.stringify(online));
     this.store.setOnline(ids);
 
     this.logger.debug("set users {}", users)();
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 6e1800b51..674d9d868 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   AddChannelMessage,
   AddInviteMessage,
@@ -58,11 +72,7 @@ import {
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
 
-import type {
-  InternetAppearMessage,
-  LogoutMessage,
-  PubSetRooms,
-} from "@/ts/types/messages/innerMessages";
+
 import type Subscription from "@/ts/classes/Subscription";
 
 
@@ -558,7 +568,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     this.setUserSettings(message.settings);
     this.setUserImage(message.profile.thumbnail);
     this.timeDiffWithServer = Date.now() - message.time;
-    const pubSetRooms: PubSetRooms = {
+    const pubSetRooms: PubSetRoomsMessage = {
       action: "init",
       channels: message.channels,
       handler: "room",
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 9e84f09c2..9bd150ffc 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   DeleteMessage,
   MessagesResponseMessage
@@ -36,7 +50,7 @@ import type {Logger} from "lines-logger";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
-import type {InternetAppearMessage} from "@/ts/types/messages/innerMessages";
+
 import {savedFiles} from "@/ts/utils/htmlApi";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import {
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index 50be9c822..6d40e6ce7 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -1,8 +1,23 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-
+import type {ResponseWsInMessage,} from "@common/ws/common";
+import type {GrowlWsInMessage,} from "@common/ws/message/growl.message";
 
 export class WsMessageProcessor extends AbstractMessageProcessor {
   private readonly sub: Subscription;
@@ -12,31 +27,36 @@ export class WsMessageProcessor extends AbstractMessageProcessor {
     this.sub = sub;
   }
 
-  public handleMessage(data: DefaultWsInMessage<string, HandlerName>) {
-    if (data.handler !== "void" && data.action !== "growlError") {
-      this.sub.notify(data);
-    }
-    if (data.cbId && this.callBacks[data.cbId] && (!data.cbBySender || data.cbBySender === this.target.getWsConnectionId())) {
+  public handleMessage<D>(data: unknown) {
+    const responseWsInMessage: ResponseWsInMessage<D> = data as ResponseWsInMessage<D>;
+    const growlErrorMessage: GrowlWsInMessage = data as GrowlWsInMessage;
+    if (responseWsInMessage.cbId &&
+      this.callBacks[responseWsInMessage.cbId] &&
+      (!responseWsInMessage.cbBySender || responseWsInMessage.cbBySender === this.target.getWsConnectionId())
+    ) {
       this.logger.debug("resolving cb")();
-      if (data.action === "growlError") {
-        this.callBacks[data.cbId].reject(Error((data as unknown as GrowlMessage).content));
+      if (growlErrorMessage.action === "growlError") {
+        this.callBacks[growlErrorMessage.cbId].reject(Error(growlErrorMessage.data.error));
       } else {
-        this.callBacks[data.cbId].resolve(data);
+        this.callBacks[responseWsInMessage.cbId].resolve(responseWsInMessage.data);
       }
-      delete this.callBacks[data.cbId];
-    } else if (data.action === "growlError") {
+      delete this.callBacks[responseWsInMessage.cbId];
+    } else if (growlErrorMessage.action === "growlError") {
       // GrowlError is used only in case above, so this is just a fallback that will never happen
-      this.store.growlError((data as unknown as GrowlMessage).content);
+      this.store.growlError((data as unknown as GrowlWsInMessage).data.error);
+    } else {
+      this.sub.notify(data);
     }
   }
 
-  public parseMessage(jsonData: string): DefaultWsInMessage<string, HandlerName> | null {
-    const data: DefaultWsInMessage<string, HandlerName> | null = super.parseMessage(jsonData);
-    if (data?.handler !== "void" && (!data?.handler || !data.action)) {
-      this.logger.error("Invalid message structure")();
-
-      return null;
-    }
-    return data;
-  }
+  // TODO
+  // public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | null | ResponseWsInMessage<D> {
+  //   const data: DefaultWsInMessage<string, HandlerName, D> | null| ResponseWsInMessage<D> = super.parseMessage(jsonData);
+  //   if ((data as DefaultWsInMessage<string, HandlerName, D>)?.handler !== "void" && (!data?.handler || !data.action)) {
+  //     this.logger.error("Invalid message structure")();
+  //
+  //     return null;
+  //   }
+  //   return data;
+  // }
 }
diff --git a/frontend/src/ts/sw.ts b/frontend/src/ts/sw.ts
index 06784ba83..00fd682de 100644
--- a/frontend/src/ts/sw.ts
+++ b/frontend/src/ts/sw.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {Logger} from "@/ts/utils/removeme";
 import {LoggerFactory} from "@/ts/utils/removeme";
 
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index 4831586ce..c540ece0f 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
 import {ChannelDto} from '@common/model/dto/channel.dto';
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index 639196495..d5ece24c7 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {Gender} from '@common/model/enum/gender';
 import type {LogLevel} from "lines-logger";
 import {MessageStatusInner} from '@/ts/types/model';
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 2d0b31865..7b7ea7b3b 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {UserProfileDto} from '@common/model/dto/user.profile.dto';
 import type {
   ChannelsDictModel,
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index d764bff75..9284564e0 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type Api from "@/ts/message_handlers/Api";
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/types/messages/helper.ts b/frontend/src/ts/types/messages/helper.ts
new file mode 100644
index 000000000..fe0d6fa5b
--- /dev/null
+++ b/frontend/src/ts/types/messages/helper.ts
@@ -0,0 +1,23 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {
+  DefaultWsInMessage,
+  HandlerName
+} from "@common/ws/common";
+
+export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName, D> extends DefaultWsInMessage<A, H, D> {
+  // If true, no errors should be present on handeling this message by sucrcription if nothing was notified
+  allowZeroSubscribers?: boolean;
+}
diff --git a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
new file mode 100644
index 000000000..e9c51190e
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
@@ -0,0 +1,25 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {ChangeDeviceType} from "@common/legacy";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+
+export interface ChangeP2pRoomInfoMessageBody  {
+  allowZeroSubscribers: true;
+  changeType: ChangeDeviceType;
+  roomId: number;
+  userId: number | null;
+}
+export type ChangeP2pRoomInfoMessage = DefaultInnerSystemMessage<"changeDevices", "webrtc", ChangeP2pRoomInfoMessageBody>;
diff --git a/frontend/src/ts/types/messages/inner/change.stream.ts b/frontend/src/ts/types/messages/inner/change.stream.ts
new file mode 100644
index 000000000..8a54f372e
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/change.stream.ts
@@ -0,0 +1,20 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export interface ChangeStreamMessageBody {
+  newStream: MediaStream;
+}
+export type ChangeStreamMessage = DefaultInnerSystemMessage<"streamChanged", "peerConnection:*", ChangeStreamMessageBody>
diff --git a/frontend/src/ts/types/messages/inner/change.user.online.info.ts b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
new file mode 100644
index 000000000..f97639bf5
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
@@ -0,0 +1,24 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {ChangeOnlineType} from "@common/legacy";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export interface ChangeUserOnlineInfoMessageBody {
+  opponentWsId: string;
+  userId: number;
+  changeType: ChangeOnlineType;
+}
+
+export type ChangeUserOnlineInfoMessage = DefaultInnerSystemMessage<"changeOnline", "webrtc", ChangeUserOnlineInfoMessageBody>;
diff --git a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
new file mode 100644
index 000000000..160f28749
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
@@ -0,0 +1,21 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export interface CheckTransferDestroyMessageBody {
+  wsOpponentId: string;
+}
+export type CheckTransferDestroyMessage = DefaultInnerSystemMessage<"checkTransferDestroy", "webrtcTransfer:*", CheckTransferDestroyMessageBody>;
+
diff --git a/frontend/src/ts/types/messages/inner/connect.to.remote.ts b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
new file mode 100644
index 000000000..d6f2bbc7f
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
@@ -0,0 +1,21 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {HandlerName} from "@common/ws/common";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export interface ConnectToRemoteMessageBody {
+  stream: MediaStream | null;
+}
+export type ConnectToRemoteMessage = DefaultInnerSystemMessage<"connectToRemote", HandlerName, ConnectToRemoteMessageBody>;
diff --git a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
new file mode 100644
index 000000000..21eb4b9fc
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
@@ -0,0 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export type DestroyPeerConnectionMessage = DefaultInnerSystemMessage<"destroy", "peerConnection:*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/internet.appear.ts b/frontend/src/ts/types/messages/inner/internet.appear.ts
new file mode 100644
index 000000000..9da55d005
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/internet.appear.ts
@@ -0,0 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export type InternetAppearMessage = DefaultInnerSystemMessage<"internetAppear", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/login.ts b/frontend/src/ts/types/messages/inner/login.ts
new file mode 100644
index 000000000..5ba5612c2
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/login.ts
@@ -0,0 +1,21 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export interface LoginMessageBody {
+  session: string;
+}
+
+export type LoginMessage = DefaultInnerSystemMessage<"login", "router", LoginMessageBody>;
diff --git a/frontend/src/ts/types/messages/inner/logout.ts b/frontend/src/ts/types/messages/inner/logout.ts
new file mode 100644
index 000000000..655d881a5
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/logout.ts
@@ -0,0 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export type LogoutMessage = DefaultInnerSystemMessage<"logout", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
new file mode 100644
index 000000000..0b311dec3
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
@@ -0,0 +1,28 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import type {RoomDto} from "@common/model/dto/room.dto";
+import type {ChannelDto} from "@common/model/dto/channel.dto";
+import type {UserDto} from "@common/model/dto/user.dto";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+
+export interface PubSetRoomsMessageBody {
+  rooms: RoomDto[];
+  channels: ChannelDto[];
+  users: UserDto[];
+  online: Record<string, string[]>;
+}
+
+export type PubSetRoomsMessage = DefaultInnerSystemMessage<"init", "room", PubSetRoomsMessageBody>;
diff --git a/frontend/src/ts/types/messages/inner/router.navigate.ts b/frontend/src/ts/types/messages/inner/router.navigate.ts
new file mode 100644
index 000000000..536b2659e
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/router.navigate.ts
@@ -0,0 +1,21 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export interface RouterNavigateMessageBody {
+  to: string;
+}
+
+export type RouterNavigateMessage = DefaultInnerSystemMessage<"navigate", "router", RouterNavigateMessageBody>;
diff --git a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
new file mode 100644
index 000000000..5ce9f2306
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
@@ -0,0 +1,22 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {MessageStatusModel} from "@/ts/types/model";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export interface SendSetMessagesStatusMessageBody {
+  messageIds: number[];
+  status: MessageStatusModel;
+}
+export type SendSetMessagesStatusMessage = DefaultInnerSystemMessage<"sendSetMessagesStatus", "peerConnection:*", SendSetMessagesStatusMessageBody>;
diff --git a/frontend/src/ts/types/messages/inner/sync.p2p.ts b/frontend/src/ts/types/messages/inner/sync.p2p.ts
new file mode 100644
index 000000000..125e21db2
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/sync.p2p.ts
@@ -0,0 +1,20 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export interface SyncP2PMessageBody {
+  id: number;
+}
+export type SyncP2PMessage = DefaultInnerSystemMessage<"syncP2pMessage", "peerConnection:*", SyncP2PMessageBody>
diff --git a/frontend/src/ts/types/messages/innerMessages.ts b/frontend/src/ts/types/messages/innerMessages.ts
deleted file mode 100644
index 1bdfbaad4..000000000
--- a/frontend/src/ts/types/messages/innerMessages.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * This file should only contain interfaces is used to create Messages to notify.
- * So if you're creating structure that you pass to sub.notify() it should go here.
- * This excludes messages that comes deserialized from websocket or any other network
- */
-
-import type {MessageStatusModel} from "@/ts/types/model";
-import {
-  DefaultWsInMessage,
-  HandlerName
-} from "@common/ws/common";
-import {ChannelDto} from '@common/model/dto/channel.dto';
-import {RoomDto} from '@common/model/dto/room.dto';
-import {UserDto} from '@common/model/dto/user.dto';
-import {
-  ChangeDeviceType,
-  ChangeOnlineType
-} from "@common/legacy";
-
-
-export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName> extends  DefaultWsInMessage<A, H> {
-  allowZeroSubscribers?: boolean; // If true, no errors should be present on handeling this message by sucrcription if nothing was notified
-}
-
-export interface PubSetRooms extends DefaultInnerSystemMessage<"init", "room"> {
-  rooms: RoomDto[];
-  channels: ChannelDto[];
-  users: UserDto[];
-  online: Record<string, string[]>;
-}
-
-export type InternetAppearMessage = DefaultInnerSystemMessage<"internetAppear", "*">;
-
-export interface LoginMessage extends DefaultInnerSystemMessage<"login", "router"> {
-  session: string;
-}
-
-export type LogoutMessage = DefaultInnerSystemMessage<"logout", "*">;
-
-export interface RouterNavigateMessage extends DefaultInnerSystemMessage<"navigate", "router"> {
-  to: string;
-}
-
-export interface ChangeUserOnlineInfoMessage extends DefaultInnerSystemMessage<"changeOnline", "webrtc"> {
-  opponentWsId: string;
-  userId: number;
-  changeType: ChangeOnlineType;
-}
-
-export interface ChangeP2pRoomInfoMessage extends DefaultInnerSystemMessage<"changeDevices", "webrtc"> {
-  allowZeroSubscribers: true;
-  changeType: ChangeDeviceType;
-  roomId: number;
-  userId: number | null;
-}
-
-export interface ConnectToRemoteMessage extends DefaultInnerSystemMessage<"connectToRemote", HandlerName> {
-  stream: MediaStream | null;
-}
-
-export interface CheckTransferDestroy extends DefaultInnerSystemMessage<"checkTransferDestroy", "webrtcTransfer:*"> {
-  wsOpponentId: string;
-}
-
-export interface ChangeStreamMessage extends DefaultInnerSystemMessage<"streamChanged", "peerConnection:*"> {
-  newStream: MediaStream;
-}
-
-export type DestroyPeerConnectionMessage = DefaultInnerSystemMessage<"destroy", "peerConnection:*">;
-
-export interface SyncP2PMessage extends DefaultInnerSystemMessage<"syncP2pMessage", "peerConnection:*"> {
-  id: number;
-}
-
-export interface SendSetMessagesStatusMessage extends DefaultInnerSystemMessage<"sendSetMessagesStatus", "peerConnection:*"> {
-  messageIds: number[];
-  status: MessageStatusModel;
-}
diff --git a/frontend/src/ts/types/messages/p2pDto.ts b/frontend/src/ts/types/messages/p2pDto.ts
index 861933c41..91f849bca 100644
--- a/frontend/src/ts/types/messages/p2pDto.ts
+++ b/frontend/src/ts/types/messages/p2pDto.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {MessageStatusModel} from "@/ts/types/model";
 
 export interface MessageP2pDto {
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 98e95808f..7dbfdfd20 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {ImageType} from '@common/model/enum/image.type';
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index e56df18f9..b0d30733c 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {SaveFileResponse} from '@common/http/file/save.file';
 import type {
   CallInfoModel,
diff --git a/frontend/src/ts/utils/addToHomeScreen.ts b/frontend/src/ts/utils/addToHomeScreen.ts
index 32cf3072c..d07628083 100644
--- a/frontend/src/ts/utils/addToHomeScreen.ts
+++ b/frontend/src/ts/utils/addToHomeScreen.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import {isChrome} from "@/ts/utils/runtimeConsts";
 
diff --git a/frontend/src/ts/utils/audio.ts b/frontend/src/ts/utils/audio.ts
index de44b989d..674f98c56 100644
--- a/frontend/src/ts/utils/audio.ts
+++ b/frontend/src/ts/utils/audio.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import ChatCall from "@/assets/sounds/Call.mp3";
 import ChatIncoming from "@/assets/sounds/ChatIncoming.wav";
 import ChatLogin from "@/assets/sounds/ChatLogin.wav";
diff --git a/frontend/src/ts/utils/audioprocc.ts b/frontend/src/ts/utils/audioprocc.ts
index 1ddf088f5..bee357a17 100644
--- a/frontend/src/ts/utils/audioprocc.ts
+++ b/frontend/src/ts/utils/audioprocc.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {JsAudioAnalyzer} from "@/ts/types/types";
 import {extractError} from "@/ts/utils/pureFunctions";
 import {IS_DEBUG} from "@/ts/utils/consts";
diff --git a/frontend/src/ts/utils/directives.ts b/frontend/src/ts/utils/directives.ts
index 56c796139..44d2a1142 100644
--- a/frontend/src/ts/utils/directives.ts
+++ b/frontend/src/ts/utils/directives.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {IS_ANDROID} from "@/ts/utils/consts";
 import {isMobile} from "@/ts/utils/runtimeConsts";
 
diff --git a/frontend/src/ts/utils/flags.ts b/frontend/src/ts/utils/flags.ts
index 631056e96..3633732de 100644
--- a/frontend/src/ts/utils/flags.ts
+++ b/frontend/src/ts/utils/flags.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import _ad from "@/assets/flags/ad.png";
 import _ae from "@/assets/flags/ae.png";
 import _af from "@/assets/flags/af.png";
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index 0826c830d..0adc565d0 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {ImageType} from '@common/model/enum/image.type';
 import {
   IS_DEBUG,
diff --git a/frontend/src/ts/utils/mixins.ts b/frontend/src/ts/utils/mixins.ts
index 41fff0e97..1cf14fd77 100644
--- a/frontend/src/ts/utils/mixins.ts
+++ b/frontend/src/ts/utils/mixins.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {VueBase} from "vue-class-component";
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index e0f55d080..3fd4ca1f8 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
 import type {
   FileModel,
diff --git a/frontend/src/ts/utils/runtimeConsts.ts b/frontend/src/ts/utils/runtimeConsts.ts
index 053918f45..caeaac274 100644
--- a/frontend/src/ts/utils/runtimeConsts.ts
+++ b/frontend/src/ts/utils/runtimeConsts.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import mobile from "is-mobile";
 import {
   BACKEND_ADDRESS,
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 8722dee24..edbf3289c 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {SendRtcDataMessage} from "@common/legacy";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
@@ -7,11 +21,9 @@ import {bytesToSize} from "@/ts/utils/pureFunctions";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {
-  CheckTransferDestroy,
-  ConnectToRemoteMessage,
-} from "@/ts/types/messages/innerMessages";
+
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
+import {HandlerName} from "@common/ws/common";
 
 
 export default abstract class AbstractPeerConnection extends MessageHandler {
@@ -84,7 +96,7 @@ export default abstract class AbstractPeerConnection extends MessageHandler {
     }
     this.sub.unsubscribe(Subscription.allPeerConnectionsForTransfer(this.connectionId), this);
     this.sub.unsubscribe(Subscription.getPeerConnectionId(this.connectionId, this.opponentWsId), this);
-    const message: CheckTransferDestroy = { // Destroy parent TransferHandler
+    const message: CheckTransferDestroyMessage = { // Destroy parent TransferHandler
       handler: Subscription.getTransferId(this.connectionId),
       action: "checkTransferDestroy",
       allowZeroSubscribers: true,
diff --git a/frontend/src/ts/webrtc/BaseTransferHandler.ts b/frontend/src/ts/webrtc/BaseTransferHandler.ts
index 77d16fe8a..d1eea69a7 100644
--- a/frontend/src/ts/webrtc/BaseTransferHandler.ts
+++ b/frontend/src/ts/webrtc/BaseTransferHandler.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/FileAndCallTransfer.ts b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
index 7c99e1b77..0ca0b32c0 100644
--- a/frontend/src/ts/webrtc/FileAndCallTransfer.ts
+++ b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
@@ -1,9 +1,9 @@
-import type {CheckTransferDestroy} from "@/ts/types/messages/innerMessages";
+
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
 import Subscription from "@/ts/classes/Subscription";
 
 export abstract class FileAndCallTransfer extends BaseTransferHandler {
-  public checkTransferDestroy(payload: CheckTransferDestroy) {
+  public checkTransferDestroy(payload: CheckTransferDestroyMessage) {
     this.logger.log("Checkign destroy")();
     if (this.connectionId && this.sub.getNumberOfSubscribers(Subscription.allPeerConnectionsForTransfer(this.connectionId)) === 0) {
       this.onDestroy();
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 08d04a566..194733902 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   NotifyCallActiveMessage,
   OfferCall,
@@ -27,12 +41,7 @@ import {browserVersion} from "@/ts/utils/runtimeConsts";
 import MessageTransferHandler from "@/ts/webrtc/message/MessageTransferHandler";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 import type {VideoType} from "@/ts/types/types";
-import type {
-  ChangeP2pRoomInfoMessage,
-  ChangeUserOnlineInfoMessage,
-  InternetAppearMessage,
-  LogoutMessage,
-} from "@/ts/types/messages/innerMessages";
+
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import type {MessageSenderProxy} from "@/ts/message_handlers/MessageSenderProxy";
 
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 76a779c37..151833cf1 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,4 +1,19 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
+  AcceptCallMessage,
   CallStatus,
   OfferCall,
   ReplyCallMessage
@@ -36,15 +51,10 @@ import {
 } from "@/ts/utils/audioprocc";
 import CallSenderPeerConnection from "@/ts/webrtc/call/CallSenderPeerConnection";
 import CallReceiverPeerConnection from "@/ts/webrtc/call/CallReceiverPeerConnection";
-import type {
-  ChangeStreamMessage,
-  CheckTransferDestroy,
-  ConnectToRemoteMessage,
-  DestroyPeerConnectionMessage,
-  RouterNavigateMessage,
-} from "@/ts/types/messages/innerMessages";
+
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 import {stopVideo} from "@/ts/utils/htmlApi";
+import {HandlerTypes} from "@common/ws/common";
 
 
 export default class CallHandler extends FileAndCallTransfer {
@@ -71,7 +81,7 @@ export default class CallHandler extends FileAndCallTransfer {
     return this.store.roomsDict[this.roomId].callInfo;
   }
 
-  public checkTransferDestroy(payload: CheckTransferDestroy) {
+  public checkTransferDestroy(payload: CheckTransferDestroyMessage) {
     this.removeOpponent(payload.wsOpponentId);
     super.checkTransferDestroy(payload);
   }
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 55986ef92..0d9aa97b2 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {DestroyCallConnection} from "@common/legacy";
 import {
   createMicrophoneLevelVoice,
@@ -13,11 +27,7 @@ import type {
 } from "@/ts/types/types";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {
-  ChangeStreamMessage,
-  ConnectToRemoteMessage,
-  DestroyPeerConnectionMessage,
-} from "@/ts/types/messages/innerMessages";
+
 import {
   getStreamLog,
   getTrackLog,
diff --git a/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts b/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
index e91241277..bfb143163 100644
--- a/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
 export default class CallReceiverPeerConnection extends CallPeerConnection {
diff --git a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
index ba30ee8a3..41cdfc4b9 100644
--- a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
@@ -1,5 +1,19 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
-import type {ConnectToRemoteMessage} from "@/ts/types/messages/innerMessages";
+
 
 export default class CallSenderPeerConnection extends CallPeerConnection {
   public async connectToRemote(stream: ConnectToRemoteMessage) {
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 220f34d42..0f25d3a3c 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/file/FilePeerConnection.ts b/frontend/src/ts/webrtc/file/FilePeerConnection.ts
index e90cac153..fe0c558bd 100644
--- a/frontend/src/ts/webrtc/file/FilePeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FilePeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 
 export default abstract class FilePeerConnection extends AbstractPeerConnection {
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index 067837db3..1e42a5d1f 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   SetReceivingFileStatus,
   SetReceivingFileUploaded,
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index f01dab85d..7a5272567 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   AddSendingFileTransfer,
   SetSendingFileStatus,
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 7af22bb4d..7df328d27 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
@@ -31,10 +45,7 @@ import {
   messageModelToP2p,
   p2pMessageToModel,
 } from "@/ts/types/converters";
-import type {
-  SendSetMessagesStatusMessage,
-  SyncP2PMessage,
-} from "@/ts/types/messages/innerMessages";
+
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts b/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
index 0e6ac1725..af8de01d9 100644
--- a/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import MessagePeerConnection from "@/ts/webrtc/message/MessagePeerConnection";
 
 
diff --git a/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts b/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
index 9399e6ca5..01c7df421 100644
--- a/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import MessagePeerConnection from "@/ts/webrtc/message/MessagePeerConnection";
 
 export default class MessageSenderPeerConnection extends MessagePeerConnection {
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index fa0c31539..2d2fd805e 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,3 +1,17 @@
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
 import type {
@@ -11,10 +25,7 @@ import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import Subscription from "@/ts/classes/Subscription";
-import type {
-  SendSetMessagesStatusMessage,
-  SyncP2PMessage,
-} from "@/ts/types/messages/innerMessages";
+
 
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 

From eef152bcbc1c3e31c92c9341046069f7fecc7562 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 2 May 2022 21:42:16 +0300
Subject: [PATCH 103/221] Redundant imports

---
 frontend/src/ts/classes/AudioPlayer.ts             | 14 --------------
 frontend/src/ts/classes/DatabaseWrapper.ts         | 14 --------------
 frontend/src/ts/classes/DefaultStore.ts            | 14 --------------
 frontend/src/ts/classes/Fetch.ts                   | 14 --------------
 frontend/src/ts/classes/LocalStorage.ts            | 14 --------------
 frontend/src/ts/classes/MainWindow.ts              | 14 --------------
 frontend/src/ts/classes/MediaCapture.ts            | 14 --------------
 frontend/src/ts/classes/NotificationHandler.ts     | 13 -------------
 frontend/src/ts/classes/SessionHolderImpl.ts       | 14 --------------
 frontend/src/ts/classes/Subscription.ts            | 13 -------------
 frontend/src/ts/devices/AndroidPlatformUtils.ts    | 14 --------------
 frontend/src/ts/devices/WebPlatformUtils.ts        | 14 --------------
 frontend/src/ts/devices/electron.ts                | 14 --------------
 frontend/src/ts/instances/loggerFactory.ts         | 14 --------------
 frontend/src/ts/instances/mainWindow.ts            | 14 --------------
 frontend/src/ts/instances/routerInstance.ts        | 11 -----------
 frontend/src/ts/instances/sessionInstance.ts       | 14 --------------
 frontend/src/ts/instances/storeInstance.ts         | 14 --------------
 frontend/src/ts/main.ts                            | 14 --------------
 .../message_handlers/AbstractMessageProcessor.ts   | 14 --------------
 frontend/src/ts/message_handlers/Api.ts            | 13 -------------
 frontend/src/ts/message_handlers/MesageHandler.ts  | 14 --------------
 frontend/src/ts/message_handlers/MessageHelper.ts  | 14 --------------
 .../src/ts/message_handlers/MessageSenderProxy.ts  | 14 --------------
 .../src/ts/message_handlers/P2PMessageProcessor.ts | 14 --------------
 frontend/src/ts/message_handlers/RomHandler.ts     |  9 ---------
 frontend/src/ts/message_handlers/WsHandler.ts      | 11 -----------
 .../src/ts/message_handlers/WsMessageHandler.ts    | 13 -------------
 .../src/ts/message_handlers/WsMessageProcessor.ts  | 14 --------------
 frontend/src/ts/sw.ts                              | 14 --------------
 frontend/src/ts/types/converters.ts                | 14 --------------
 frontend/src/ts/types/db.ts                        | 14 --------------
 frontend/src/ts/types/dto.ts                       | 14 --------------
 frontend/src/ts/types/env.d.ts                     | 14 --------------
 frontend/src/ts/types/messages/helper.ts           | 14 --------------
 .../types/messages/inner/change.p2p.room.info.ts   | 14 --------------
 .../src/ts/types/messages/inner/change.stream.ts   | 14 --------------
 .../messages/inner/change.user.online.info.ts      | 14 --------------
 .../types/messages/inner/check.transfer.destroy.ts | 14 --------------
 .../ts/types/messages/inner/connect.to.remote.ts   | 14 --------------
 .../messages/inner/destroy.peer.connection.ts      | 14 --------------
 .../src/ts/types/messages/inner/internet.appear.ts | 14 --------------
 frontend/src/ts/types/messages/inner/login.ts      | 14 --------------
 frontend/src/ts/types/messages/inner/logout.ts     | 14 --------------
 .../src/ts/types/messages/inner/pub.set.rooms.ts   | 14 --------------
 .../src/ts/types/messages/inner/router.navigate.ts | 14 --------------
 .../messages/inner/send.set.messages.status.ts     | 14 --------------
 frontend/src/ts/types/messages/inner/sync.p2p.ts   | 14 --------------
 frontend/src/ts/types/messages/p2pDto.ts           | 14 --------------
 frontend/src/ts/types/model.ts                     | 14 --------------
 frontend/src/ts/types/types.ts                     | 14 --------------
 frontend/src/ts/utils/addToHomeScreen.ts           | 14 --------------
 frontend/src/ts/utils/audio.ts                     | 14 --------------
 frontend/src/ts/utils/audioprocc.ts                | 14 --------------
 frontend/src/ts/utils/directives.ts                | 14 --------------
 frontend/src/ts/utils/flags.ts                     | 14 --------------
 frontend/src/ts/utils/htmlApi.ts                   | 14 --------------
 frontend/src/ts/utils/mixins.ts                    | 14 --------------
 frontend/src/ts/utils/pureFunctions.ts             | 14 --------------
 frontend/src/ts/utils/runtimeConsts.ts             | 14 --------------
 frontend/src/ts/webrtc/AbstractPeerConnection.ts   | 12 ------------
 frontend/src/ts/webrtc/BaseTransferHandler.ts      | 14 --------------
 frontend/src/ts/webrtc/FileAndCallTransfer.ts      |  1 -
 frontend/src/ts/webrtc/WebRtcApi.ts                | 10 ----------
 frontend/src/ts/webrtc/call/CallHandler.ts         |  9 ---------
 frontend/src/ts/webrtc/call/CallPeerConnection.ts  | 11 -----------
 .../ts/webrtc/call/CallReceiverPeerConnection.ts   | 14 --------------
 .../src/ts/webrtc/call/CallSenderPeerConnection.ts | 13 -------------
 frontend/src/ts/webrtc/file/FileHandler.ts         | 14 --------------
 frontend/src/ts/webrtc/file/FilePeerConnection.ts  | 14 --------------
 .../ts/webrtc/file/FileReceiveerPeerConnection.ts  | 14 --------------
 .../src/ts/webrtc/file/FileSenderPeerConnection.ts | 14 --------------
 .../src/ts/webrtc/message/MessagePeerConnection.ts | 12 ------------
 .../message/MessageReceiverPeerConnection.ts       | 14 --------------
 .../webrtc/message/MessageSenderPeerConnection.ts  | 14 --------------
 .../ts/webrtc/message/MessageTransferHandler.ts    | 12 ------------
 76 files changed, 1017 deletions(-)

diff --git a/frontend/src/ts/classes/AudioPlayer.ts b/frontend/src/ts/classes/AudioPlayer.ts
index bfb78dd5d..a4a248bf8 100644
--- a/frontend/src/ts/classes/AudioPlayer.ts
+++ b/frontend/src/ts/classes/AudioPlayer.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {MainWindow} from "@/ts/classes/MainWindow";
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index de1579c32..8add51f33 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {ImageType} from '@common/model/enum/image.type';
 import type {
   IStorage,
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index 26b7522f9..be565c1a9 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
 import Vuex from "vuex";
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index 6f6679830..a0adb16a5 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   PostData,
   SessionHolder,
diff --git a/frontend/src/ts/classes/LocalStorage.ts b/frontend/src/ts/classes/LocalStorage.ts
index 9fd7ecf21..533235f7f 100644
--- a/frontend/src/ts/classes/LocalStorage.ts
+++ b/frontend/src/ts/classes/LocalStorage.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {
   IStorage,
diff --git a/frontend/src/ts/classes/MainWindow.ts b/frontend/src/ts/classes/MainWindow.ts
index ac6907886..7de26872d 100644
--- a/frontend/src/ts/classes/MainWindow.ts
+++ b/frontend/src/ts/classes/MainWindow.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/classes/MediaCapture.ts b/frontend/src/ts/classes/MediaCapture.ts
index 66e8be32c..94dd1a6ea 100644
--- a/frontend/src/ts/classes/MediaCapture.ts
+++ b/frontend/src/ts/classes/MediaCapture.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {stopVideo} from "@/ts/utils/htmlApi";
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index 35fbc3254..f89f5f50d 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -1,17 +1,4 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {extractError} from "@/ts/utils/pureFunctions";
diff --git a/frontend/src/ts/classes/SessionHolderImpl.ts b/frontend/src/ts/classes/SessionHolderImpl.ts
index ef6ff4b3e..3c7e27618 100644
--- a/frontend/src/ts/classes/SessionHolderImpl.ts
+++ b/frontend/src/ts/classes/SessionHolderImpl.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {SessionHolder} from "@/ts/types/types";
 
 export class SessionHolderImpl implements SessionHolder {
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index 8c6852bf8..7e56db427 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,17 +1,4 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {IMessageHandler} from "@common/legacy";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/devices/AndroidPlatformUtils.ts b/frontend/src/ts/devices/AndroidPlatformUtils.ts
index 59fbcea81..9d1e208a3 100644
--- a/frontend/src/ts/devices/AndroidPlatformUtils.ts
+++ b/frontend/src/ts/devices/AndroidPlatformUtils.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {IS_ANDROID} from "@/ts/utils/consts";
 import type {
   permissions_type,
diff --git a/frontend/src/ts/devices/WebPlatformUtils.ts b/frontend/src/ts/devices/WebPlatformUtils.ts
index da9f412b1..62de3b69a 100644
--- a/frontend/src/ts/devices/WebPlatformUtils.ts
+++ b/frontend/src/ts/devices/WebPlatformUtils.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   permissions_type,
   PlatformUtil,
diff --git a/frontend/src/ts/devices/electron.ts b/frontend/src/ts/devices/electron.ts
index 71158eb7a..6d6918e3c 100644
--- a/frontend/src/ts/devices/electron.ts
+++ b/frontend/src/ts/devices/electron.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   app,
   BrowserWindow,
diff --git a/frontend/src/ts/instances/loggerFactory.ts b/frontend/src/ts/instances/loggerFactory.ts
index a90386b4b..354c7d693 100644
--- a/frontend/src/ts/instances/loggerFactory.ts
+++ b/frontend/src/ts/instances/loggerFactory.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {LogLevel} from "lines-logger";
 import {LoggerFactory} from "lines-logger";
 import {
diff --git a/frontend/src/ts/instances/mainWindow.ts b/frontend/src/ts/instances/mainWindow.ts
index 665d6dbf5..092f53461 100644
--- a/frontend/src/ts/instances/mainWindow.ts
+++ b/frontend/src/ts/instances/mainWindow.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MainWindow} from "@/ts/classes/MainWindow";
 import {store} from "@/ts/instances/storeInstance";
 
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 9989102ec..ce42bfab2 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -1,17 +1,6 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import {LoginMessage} from "@/ts/types/messages/inner/login";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
 import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   createRouter,
   createWebHashHistory,
diff --git a/frontend/src/ts/instances/sessionInstance.ts b/frontend/src/ts/instances/sessionInstance.ts
index c4106ff27..88d77d81b 100644
--- a/frontend/src/ts/instances/sessionInstance.ts
+++ b/frontend/src/ts/instances/sessionInstance.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {SessionHolder} from "@/ts/types/types";
 import {SessionHolderImpl} from "@/ts/classes/SessionHolderImpl";
 
diff --git a/frontend/src/ts/instances/storeInstance.ts b/frontend/src/ts/instances/storeInstance.ts
index 8fe0797a3..d172916f2 100644
--- a/frontend/src/ts/instances/storeInstance.ts
+++ b/frontend/src/ts/instances/storeInstance.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {VueBase} from "vue-class-component";
 import type {VuexModule} from "vuex-module-decorators";
 import {getModule} from "vuex-module-decorators";
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index 6453cb430..44488f77d 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import "@/assets/sass/common.sass";
 import * as constants from "@/ts/utils/consts";
 
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index ce04a967c..94feb4985 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index f9e605d9d..382ac82c9 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -1,17 +1,4 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
 import type {
   SignUpRequest,
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index 54bdd0a0f..67947632f 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {IMessageHandler} from "@common/legacy";
 import type {Logger} from "lines-logger";
 
diff --git a/frontend/src/ts/message_handlers/MessageHelper.ts b/frontend/src/ts/message_handlers/MessageHelper.ts
index cb07ed7fc..4ad3f245f 100644
--- a/frontend/src/ts/message_handlers/MessageHelper.ts
+++ b/frontend/src/ts/message_handlers/MessageHelper.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import faviconUrl from "@/assets/img/favicon.ico";
 import {incoming} from "@/ts/utils/audio";
 import type {
diff --git a/frontend/src/ts/message_handlers/MessageSenderProxy.ts b/frontend/src/ts/message_handlers/MessageSenderProxy.ts
index 5168fe3db..dbf54818a 100644
--- a/frontend/src/ts/message_handlers/MessageSenderProxy.ts
+++ b/frontend/src/ts/message_handlers/MessageSenderProxy.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import type {MessageSender} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
index f795ac359..5e887c989 100644
--- a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type {DefaultP2pMessage} from "@/ts/types/messages/p2pMessages";
 
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 3c4d086d3..fdf8a67ba 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,17 +1,8 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
 import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   AddChannelMessage,
   AddInviteMessage,
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 674d9d868..a46b0aae9 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,17 +1,6 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   AddChannelMessage,
   AddInviteMessage,
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 9bd150ffc..3a7e5fd72 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -1,17 +1,4 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   DeleteMessage,
   MessagesResponseMessage
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index 6d40e6ce7..5e1f10bbd 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
diff --git a/frontend/src/ts/sw.ts b/frontend/src/ts/sw.ts
index 00fd682de..06784ba83 100644
--- a/frontend/src/ts/sw.ts
+++ b/frontend/src/ts/sw.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {Logger} from "@/ts/utils/removeme";
 import {LoggerFactory} from "@/ts/utils/removeme";
 
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index c540ece0f..4831586ce 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
 import {ChannelDto} from '@common/model/dto/channel.dto';
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index d5ece24c7..639196495 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {Gender} from '@common/model/enum/gender';
 import type {LogLevel} from "lines-logger";
 import {MessageStatusInner} from '@/ts/types/model';
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 7b7ea7b3b..2d0b31865 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {UserProfileDto} from '@common/model/dto/user.profile.dto';
 import type {
   ChannelsDictModel,
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index 9284564e0..d764bff75 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type Api from "@/ts/message_handlers/Api";
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/types/messages/helper.ts b/frontend/src/ts/types/messages/helper.ts
index fe0d6fa5b..cdd6c756e 100644
--- a/frontend/src/ts/types/messages/helper.ts
+++ b/frontend/src/ts/types/messages/helper.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   DefaultWsInMessage,
   HandlerName
diff --git a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
index e9c51190e..bc50d7dcf 100644
--- a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
@@ -1,19 +1,5 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {ChangeDeviceType} from "@common/legacy";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 
 export interface ChangeP2pRoomInfoMessageBody  {
diff --git a/frontend/src/ts/types/messages/inner/change.stream.ts b/frontend/src/ts/types/messages/inner/change.stream.ts
index 8a54f372e..a3d56e529 100644
--- a/frontend/src/ts/types/messages/inner/change.stream.ts
+++ b/frontend/src/ts/types/messages/inner/change.stream.ts
@@ -1,18 +1,4 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface ChangeStreamMessageBody {
   newStream: MediaStream;
diff --git a/frontend/src/ts/types/messages/inner/change.user.online.info.ts b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
index f97639bf5..7a441008f 100644
--- a/frontend/src/ts/types/messages/inner/change.user.online.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
@@ -1,19 +1,5 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {ChangeOnlineType} from "@common/legacy";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface ChangeUserOnlineInfoMessageBody {
   opponentWsId: string;
diff --git a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
index 160f28749..9edb0ab8d 100644
--- a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
+++ b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
@@ -1,18 +1,4 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface CheckTransferDestroyMessageBody {
   wsOpponentId: string;
diff --git a/frontend/src/ts/types/messages/inner/connect.to.remote.ts b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
index d6f2bbc7f..7743c1e65 100644
--- a/frontend/src/ts/types/messages/inner/connect.to.remote.ts
+++ b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
@@ -1,19 +1,5 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {HandlerName} from "@common/ws/common";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface ConnectToRemoteMessageBody {
   stream: MediaStream | null;
diff --git a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
index 21eb4b9fc..af7da4ef9 100644
--- a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
+++ b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
@@ -1,17 +1,3 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type DestroyPeerConnectionMessage = DefaultInnerSystemMessage<"destroy", "peerConnection:*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/internet.appear.ts b/frontend/src/ts/types/messages/inner/internet.appear.ts
index 9da55d005..e7b57dd79 100644
--- a/frontend/src/ts/types/messages/inner/internet.appear.ts
+++ b/frontend/src/ts/types/messages/inner/internet.appear.ts
@@ -1,17 +1,3 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type InternetAppearMessage = DefaultInnerSystemMessage<"internetAppear", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/login.ts b/frontend/src/ts/types/messages/inner/login.ts
index 5ba5612c2..0231d4554 100644
--- a/frontend/src/ts/types/messages/inner/login.ts
+++ b/frontend/src/ts/types/messages/inner/login.ts
@@ -1,18 +1,4 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface LoginMessageBody {
   session: string;
diff --git a/frontend/src/ts/types/messages/inner/logout.ts b/frontend/src/ts/types/messages/inner/logout.ts
index 655d881a5..ad6faf651 100644
--- a/frontend/src/ts/types/messages/inner/logout.ts
+++ b/frontend/src/ts/types/messages/inner/logout.ts
@@ -1,17 +1,3 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type LogoutMessage = DefaultInnerSystemMessage<"logout", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
index 0b311dec3..e21a69838 100644
--- a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
+++ b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
@@ -1,21 +1,7 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {RoomDto} from "@common/model/dto/room.dto";
 import type {ChannelDto} from "@common/model/dto/channel.dto";
 import type {UserDto} from "@common/model/dto/user.dto";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 
 export interface PubSetRoomsMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/router.navigate.ts b/frontend/src/ts/types/messages/inner/router.navigate.ts
index 536b2659e..ab807e7e5 100644
--- a/frontend/src/ts/types/messages/inner/router.navigate.ts
+++ b/frontend/src/ts/types/messages/inner/router.navigate.ts
@@ -1,18 +1,4 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface RouterNavigateMessageBody {
   to: string;
diff --git a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
index 5ce9f2306..8b4598354 100644
--- a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
+++ b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
@@ -1,19 +1,5 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatusModel} from "@/ts/types/model";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface SendSetMessagesStatusMessageBody {
   messageIds: number[];
diff --git a/frontend/src/ts/types/messages/inner/sync.p2p.ts b/frontend/src/ts/types/messages/inner/sync.p2p.ts
index 125e21db2..fb83fc330 100644
--- a/frontend/src/ts/types/messages/inner/sync.p2p.ts
+++ b/frontend/src/ts/types/messages/inner/sync.p2p.ts
@@ -1,18 +1,4 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface SyncP2PMessageBody {
   id: number;
diff --git a/frontend/src/ts/types/messages/p2pDto.ts b/frontend/src/ts/types/messages/p2pDto.ts
index 91f849bca..861933c41 100644
--- a/frontend/src/ts/types/messages/p2pDto.ts
+++ b/frontend/src/ts/types/messages/p2pDto.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {MessageStatusModel} from "@/ts/types/model";
 
 export interface MessageP2pDto {
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 7dbfdfd20..98e95808f 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {ImageType} from '@common/model/enum/image.type';
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index b0d30733c..e56df18f9 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {SaveFileResponse} from '@common/http/file/save.file';
 import type {
   CallInfoModel,
diff --git a/frontend/src/ts/utils/addToHomeScreen.ts b/frontend/src/ts/utils/addToHomeScreen.ts
index d07628083..32cf3072c 100644
--- a/frontend/src/ts/utils/addToHomeScreen.ts
+++ b/frontend/src/ts/utils/addToHomeScreen.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import {isChrome} from "@/ts/utils/runtimeConsts";
 
diff --git a/frontend/src/ts/utils/audio.ts b/frontend/src/ts/utils/audio.ts
index 674f98c56..de44b989d 100644
--- a/frontend/src/ts/utils/audio.ts
+++ b/frontend/src/ts/utils/audio.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import ChatCall from "@/assets/sounds/Call.mp3";
 import ChatIncoming from "@/assets/sounds/ChatIncoming.wav";
 import ChatLogin from "@/assets/sounds/ChatLogin.wav";
diff --git a/frontend/src/ts/utils/audioprocc.ts b/frontend/src/ts/utils/audioprocc.ts
index bee357a17..1ddf088f5 100644
--- a/frontend/src/ts/utils/audioprocc.ts
+++ b/frontend/src/ts/utils/audioprocc.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {JsAudioAnalyzer} from "@/ts/types/types";
 import {extractError} from "@/ts/utils/pureFunctions";
 import {IS_DEBUG} from "@/ts/utils/consts";
diff --git a/frontend/src/ts/utils/directives.ts b/frontend/src/ts/utils/directives.ts
index 44d2a1142..56c796139 100644
--- a/frontend/src/ts/utils/directives.ts
+++ b/frontend/src/ts/utils/directives.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {IS_ANDROID} from "@/ts/utils/consts";
 import {isMobile} from "@/ts/utils/runtimeConsts";
 
diff --git a/frontend/src/ts/utils/flags.ts b/frontend/src/ts/utils/flags.ts
index 3633732de..631056e96 100644
--- a/frontend/src/ts/utils/flags.ts
+++ b/frontend/src/ts/utils/flags.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import _ad from "@/assets/flags/ad.png";
 import _ae from "@/assets/flags/ae.png";
 import _af from "@/assets/flags/af.png";
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index 0adc565d0..0826c830d 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {ImageType} from '@common/model/enum/image.type';
 import {
   IS_DEBUG,
diff --git a/frontend/src/ts/utils/mixins.ts b/frontend/src/ts/utils/mixins.ts
index 1cf14fd77..41fff0e97 100644
--- a/frontend/src/ts/utils/mixins.ts
+++ b/frontend/src/ts/utils/mixins.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {VueBase} from "vue-class-component";
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index 3fd4ca1f8..e0f55d080 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
 import type {
   FileModel,
diff --git a/frontend/src/ts/utils/runtimeConsts.ts b/frontend/src/ts/utils/runtimeConsts.ts
index caeaac274..053918f45 100644
--- a/frontend/src/ts/utils/runtimeConsts.ts
+++ b/frontend/src/ts/utils/runtimeConsts.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import mobile from "is-mobile";
 import {
   BACKEND_ADDRESS,
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index edbf3289c..bb3e49ecf 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,17 +1,5 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {SendRtcDataMessage} from "@common/legacy";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/webrtc/BaseTransferHandler.ts b/frontend/src/ts/webrtc/BaseTransferHandler.ts
index d1eea69a7..77d16fe8a 100644
--- a/frontend/src/ts/webrtc/BaseTransferHandler.ts
+++ b/frontend/src/ts/webrtc/BaseTransferHandler.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/FileAndCallTransfer.ts b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
index 0ca0b32c0..b368952a9 100644
--- a/frontend/src/ts/webrtc/FileAndCallTransfer.ts
+++ b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
@@ -1,4 +1,3 @@
-
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
 import Subscription from "@/ts/classes/Subscription";
 
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 194733902..20c9f5aec 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,17 +1,7 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   NotifyCallActiveMessage,
   OfferCall,
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 151833cf1..211674eb3 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,17 +1,8 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
 import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {
   AcceptCallMessage,
   CallStatus,
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 0d9aa97b2..59ef3158c 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,17 +1,6 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {DestroyCallConnection} from "@common/legacy";
 import {
   createMicrophoneLevelVoice,
diff --git a/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts b/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
index bfb143163..e91241277 100644
--- a/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
 export default class CallReceiverPeerConnection extends CallPeerConnection {
diff --git a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
index 41cdfc4b9..f032c73c6 100644
--- a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
@@ -1,17 +1,4 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
 
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 0f25d3a3c..220f34d42 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/file/FilePeerConnection.ts b/frontend/src/ts/webrtc/file/FilePeerConnection.ts
index fe0c558bd..e90cac153 100644
--- a/frontend/src/ts/webrtc/file/FilePeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FilePeerConnection.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 
 export default abstract class FilePeerConnection extends AbstractPeerConnection {
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index 1e42a5d1f..067837db3 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   SetReceivingFileStatus,
   SetReceivingFileUploaded,
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 7a5272567..f01dab85d 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   AddSendingFileTransfer,
   SetSendingFileStatus,
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 7df328d27..4e461d388 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,15 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
diff --git a/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts b/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
index af8de01d9..0e6ac1725 100644
--- a/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import MessagePeerConnection from "@/ts/webrtc/message/MessagePeerConnection";
 
 
diff --git a/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts b/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
index 01c7df421..9399e6ca5 100644
--- a/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
@@ -1,17 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import MessagePeerConnection from "@/ts/webrtc/message/MessagePeerConnection";
 
 export default class MessageSenderPeerConnection extends MessagePeerConnection {
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 2d2fd805e..85d1157ad 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,15 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';

From 4d9eed7e1bf6279afe68c26f93ba9dc8081f233d Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 15 May 2022 02:17:46 +0300
Subject: [PATCH 104/221] Added kubernetes for backend.yaml

---
 .dockerignore                                 | 11 ++--
 common/package.json                           |  2 +-
 frontend/src/ts/classes/Subscription.ts       |  8 ++-
 .../src/ts/webrtc/AbstractPeerConnection.ts   | 14 +++---
 frontend/src/ts/webrtc/call/CallHandler.ts    | 33 ++++++------
 kubernetes/DockerfileBackend                  | 27 ++++++++++
 kubernetes/backend.yaml                       | 42 ++++++++++++++++
 kubernetes/config-map.yaml                    | 12 +++++
 kubernetes/mariadb.yaml                       | 44 ++++++++++++++++
 kubernetes/redis.yaml                         | 34 +++++++++++++
 kubernetes/secret.yaml                        |  9 ++++
 newback/.eslintrc.json                        |  7 ++-
 newback/.gitignore                            |  3 +-
 newback/package.json                          | 10 ++--
 .../{default.json => env/development.json}    |  0
 newback/src/config/env/production.json        | 50 +++++++++++++++++++
 newback/src/config/user/.gitkeep              |  0
 newback/src/main.ts                           |  2 +-
 newback/yarn.lock                             | 16 ++----
 19 files changed, 276 insertions(+), 48 deletions(-)
 create mode 100644 kubernetes/DockerfileBackend
 create mode 100644 kubernetes/backend.yaml
 create mode 100644 kubernetes/config-map.yaml
 create mode 100644 kubernetes/mariadb.yaml
 create mode 100644 kubernetes/redis.yaml
 create mode 100644 kubernetes/secret.yaml
 rename newback/src/config/{default.json => env/development.json} (100%)
 create mode 100644 newback/src/config/env/production.json
 create mode 100644 newback/src/config/user/.gitkeep

diff --git a/.dockerignore b/.dockerignore
index 019cf8f21..2d3ba8625 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +1,13 @@
 # https://github.com/docker/hub-feedback/issues/1843
 **
 !download_content.sh
-!backend/requirements.txt
-!backend/manage.py
-!backend/chat
-!backend/templates
+!newback/package.json
+!newback/nest-cli.json
+!newback/yarn.lock
+!newback/tsconfig.build.json
+!newback/tsconfig.json
+!newback/src
+!common/src
 !frontend/src
 !frontend/patches
 !frontend/build
diff --git a/common/package.json b/common/package.json
index 14a7080bd..948dba0e9 100644
--- a/common/package.json
+++ b/common/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "lines-logger": "^2.1.2",
     "typescript": "^4.6.3",
-        "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
     "@typescript-eslint/parser": "^5.17.0",
     "eslint": "^8.12.0",
     "eslint-find-rules": "^4.1.0",
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index 7e56db427..6b981a2d3 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -2,6 +2,10 @@ import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {IMessageHandler} from "@common/legacy";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
+import {
+  DefaultWsInMessage,
+  HandlerName
+} from "@common/ws/common";
 
 
 export default class Subscription {
@@ -58,7 +62,7 @@ export default class Subscription {
     this.logger.error("Unable to find channel to delete {}", channel)();
   }
 
-  public notify<T extends DefaultInMessage<string, HandlerName>>(message: T): boolean {
+  public notify<T extends DefaultWsInMessage<string, HandlerName, any>>(message: T): boolean {
     this.logger.debug("notifing {}", message)();
     if (message.handler === "*") {
       Object.values(this.suscribers).forEach((channel) => {
@@ -78,7 +82,7 @@ export default class Subscription {
 
       return true;
     }
-    if (!(message as DefaultInnerSystemMessage<string, HandlerName>).allowZeroSubscribers) {
+    if (!(message as DefaultInnerSystemMessage<string, HandlerName, any>).allowZeroSubscribers) {
       this.logger.error("Can't handle message {} because no suscribers found, available suscribers {}", message, this.suscribers)();
     }
 
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index bb3e49ecf..bcdafaf3a 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,6 +1,6 @@
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {SendRtcDataMessage} from "@common/legacy";
+import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import type {SendRtcDataMessage} from "@common/legacy";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
@@ -11,7 +11,7 @@ import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
-import {HandlerName} from "@common/ws/common";
+import type {HandlerName} from "@common/ws/common";
 
 
 export default abstract class AbstractPeerConnection extends MessageHandler {
@@ -88,7 +88,9 @@ export default abstract class AbstractPeerConnection extends MessageHandler {
       handler: Subscription.getTransferId(this.connectionId),
       action: "checkTransferDestroy",
       allowZeroSubscribers: true,
-      wsOpponentId: this.opponentWsId,
+      data: {
+        wsOpponentId: this.opponentWsId,
+      },
     };
     this.sub.notify(message);
   }
@@ -189,7 +191,7 @@ export default abstract class AbstractPeerConnection extends MessageHandler {
       this.logger.warn("Putting sendrtc data event to the queue")();
       this.sendRtcDataQueue.push(message);
     } else {
-      const data: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown} = message.content;
+      const data: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown} = message.data;
       if (this.pc!.iceConnectionState && this.pc!.iceConnectionState !== "closed") {
         if ((<RTCSessionDescriptionInit>data).sdp) {
           this.logger.log("Creating answer")();
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 211674eb3..c8f56c3c1 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,13 +1,13 @@
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {
+import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import type {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import type {
   AcceptCallMessage,
   CallStatus,
   OfferCall,
-  ReplyCallMessage
+  ReplyCallMessage,
 } from "@common/legacy";
 import {
   browserVersion,
@@ -45,17 +45,20 @@ import CallReceiverPeerConnection from "@/ts/webrtc/call/CallReceiverPeerConnect
 
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 import {stopVideo} from "@/ts/utils/htmlApi";
-import {HandlerTypes} from "@common/ws/common";
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 
 
 export default class CallHandler extends FileAndCallTransfer {
-  protected readonly handlers: HandlerTypes<keyof CallHandler, "webrtcTransfer:*"> = {
+  protected readonly handlers: HandlerTypes<keyof CallHandler, "webrtcTransfer:*", any> = {
     answerCall: this.answerCall,
     videoAnswerCall: this.videoAnswerCall,
     declineCall: this.declineCall,
-    replyCall: <HandlerType<"replyCall", "webrtcTransfer:*">> this.replyCall,
-    acceptCall: <HandlerType<"acceptCall", "webrtcTransfer:*">> this.acceptCall,
-    checkTransferDestroy: <HandlerType<"checkTransferDestroy", "webrtcTransfer:*">> this.checkTransferDestroy,
+    replyCall: <HandlerType<"replyCall", "webrtcTransfer:*", any>> this.replyCall,
+    acceptCall: <HandlerType<"acceptCall", "webrtcTransfer:*", any>> this.acceptCall,
+    checkTransferDestroy: <HandlerType<"checkTransferDestroy", "webrtcTransfer:*", any>> this.checkTransferDestroy,
   };
 
   private canvas: HTMLCanvasElement | null = null;
@@ -110,7 +113,7 @@ export default class CallHandler extends FileAndCallTransfer {
     return this.connectionId;
   }
 
-  public acceptCall(message: AcceptCallMessage) {
+  public acceptCall(message: AcceptCallMessage["data"]) {
     if (this.callStatus !== "received_offer") { // If we're call initiator
       if (!this.connectionId) {
         throw Error("Conn is is null");
@@ -118,7 +121,9 @@ export default class CallHandler extends FileAndCallTransfer {
       const payload: ConnectToRemoteMessage = {
         action: "connectToRemote",
         handler: Subscription.getPeerConnectionId(this.connectionId, message.opponentWsId),
-        stream: this.localStream,
+        data: {
+          stream: this.localStream,
+        },
       };
       this.sub.notify(payload);
     } else {
diff --git a/kubernetes/DockerfileBackend b/kubernetes/DockerfileBackend
new file mode 100644
index 000000000..e05b119ac
--- /dev/null
+++ b/kubernetes/DockerfileBackend
@@ -0,0 +1,27 @@
+# cd <root>
+# docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend
+# https://stackoverflow.com/a/49478889/3872976
+# minikube tunnel service/backend-service
+# chrome http://192.168.49.2:30002/
+FROM node:16.15.0-alpine3.15
+
+ENV NODE_CONFIG_TS_ENV=production
+WORKDIR /usr/src/newback
+COPY ./newback/package.json ./newback/yarn.lock ./
+RUN yarn install --frozen-lockfile
+
+COPY ./newback/nest-cli.json ./newback/tsconfig.build.json ./newback/tsconfig.json ./
+COPY ./newback/src ./src/
+COPY ./common/src ./src/common
+
+# REPLACE_FROM='      "@common/*": ["../common/src/*"]';
+# REPLACE_TO='      "@common/*": ["./src/common/*"]';
+# ESCAPED_FROM=$(printf '%s\n' "$REPLACE_FROM" | sed -e 's/[]\/$*.^[]/\\&/g');
+# ESCAPED_TO=$(printf '%s\n' "$REPLACE_TO" | sed -e 's/[]\/$*.^[]/\\&/g');
+# echo sed -i \"s/$ESCAPED_FROM/$ESCAPED_TO/g\" tsconfig.json
+
+RUN sed -i 's/      "@common\/\*": \["\.\.\/common\/src\/\*"\]/      "@common\/\*": \["\.\/src\/common\/\*"\]/g' tsconfig.json
+
+RUN yarn build
+
+CMD ["/usr/local/bin/node", "./dist/main.js"]
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
new file mode 100644
index 000000000..ca65b7777
--- /dev/null
+++ b/kubernetes/backend.yaml
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: backend-deployment
+  labels:
+    app: backend
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: backend
+  template:
+    metadata:
+      labels:
+        app: backend
+    spec:
+      containers:
+      - name: backend
+        imagePullPolicy: IfNotPresent
+        image: deathangel908/pychat-backend
+        ports:
+        - containerPort: 8888
+        envFrom:
+        - secretRef:
+            name: pychat-secret
+        - configMapRef:
+            name: pychat-config-map
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: backend-service
+spec:
+  selector:
+    app: backend
+  type: LoadBalancer
+  ports:
+    - protocol: TCP
+      port: 8888
+      targetPort: 8888
+      nodePort: 30002
+
diff --git a/kubernetes/config-map.yaml b/kubernetes/config-map.yaml
new file mode 100644
index 000000000..f82e5b701
--- /dev/null
+++ b/kubernetes/config-map.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: pychat-config-map
+data:
+  MYSQL_PORT: '3306'
+  MYSQL_DATABASE: pychat
+  MYSQL_HOST: mariadb-service
+  REDIS_HOST: redis-service
+  REDIS_PORT: '6379'
+  APPLICATION_PORT: '8888'
+
diff --git a/kubernetes/mariadb.yaml b/kubernetes/mariadb.yaml
new file mode 100644
index 000000000..aa9bfe95a
--- /dev/null
+++ b/kubernetes/mariadb.yaml
@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mariadb-deployment
+  labels:
+    app: mariadb
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: mariadb
+  template:
+    metadata:
+      labels:
+        app: mariadb
+    spec:
+      containers:
+      - name: mariadb
+        image: yobasystems/alpine-mariadb:10.6.7
+        ports:
+        - containerPort: 3306
+        env:
+        - name: MYSQL_CHARSET
+          value: utf8mb4
+        - name: MYSQL_COLLATION
+          value: utf8mb4_general_ci
+        envFrom:
+        - secretRef:
+            name: pychat-secret
+        - configMapRef:
+            name: pychat-config-map
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mariadb-service
+spec:
+  selector:
+    app: mariadb
+  ports:
+    - protocol: TCP
+      port: 3306
+      targetPort: 3306
+
diff --git a/kubernetes/redis.yaml b/kubernetes/redis.yaml
new file mode 100644
index 000000000..811651725
--- /dev/null
+++ b/kubernetes/redis.yaml
@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis-deployment
+  labels:
+    app: redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+      - name: redis
+        image: redis:7.0.0-alpine3.15
+        ports:
+        - containerPort: 6379
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-service
+spec:
+  selector:
+    app: redis
+  ports:
+    - protocol: TCP
+      port: 6379
+      targetPort: 6379
+
diff --git a/kubernetes/secret.yaml b/kubernetes/secret.yaml
new file mode 100644
index 000000000..9acf2f737
--- /dev/null
+++ b/kubernetes/secret.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: pychat-secret
+data:
+  MYSQL_ROOT_PASSWORD: cHlwYXNz
+  MYSQL_PASSWORD: cHlwYXNz
+  MYSQL_USER: cHljaGF0
diff --git a/newback/.eslintrc.json b/newback/.eslintrc.json
index 9de8f01a5..fa3cdbea8 100644
--- a/newback/.eslintrc.json
+++ b/newback/.eslintrc.json
@@ -68,6 +68,11 @@
         "enforceConst": true
       }
     ],
+    "@typescript-eslint/no-unsafe-return": "warn",
+    "@typescript-eslint/no-unsafe-call": "warn",
+    "@typescript-eslint/no-unsafe-member-access": "warn",
+    "@typescript-eslint/no-unsafe-assignment": "warn",
+    "@typescript-eslint/no-unsafe-argument": "warn",
     "@typescript-eslint/comma-dangle": [1, "always-multiline"],
     "@typescript-eslint/method-signature-style": [1, "method"],
     "@typescript-eslint/init-declarations": 0, // let a ; try {a = funct()} catch (e) throw e; if a.sdfsd . In this example we can't have instant init
@@ -83,7 +88,7 @@
     "babel/semi": 1,
     "babel/no-unused-expressions": 1,
     "babel/valid-typeof": 1,
-    "babel/new-cap": 0, // Decorators 
+    "babel/new-cap": 0, // Decorators
     "@typescript-eslint/no-parameter-properties": 0,
     "babel/camelcase": 0, // use typescript-eslint/naming-convention
     "babel/no-invalid-this": 1,
diff --git a/newback/.gitignore b/newback/.gitignore
index 8ebb16cf6..5228d9224 100644
--- a/newback/.gitignore
+++ b/newback/.gitignore
@@ -8,4 +8,5 @@ coverage
 !src/data/migration/.gitkeep
 codecov
 src/fixtures/prod
-src/config/env/backup.json
+src/config/user/*
+!src/config/user/.gitkeep
diff --git a/newback/package.json b/newback/package.json
index 4d2fafb45..6df185605 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -5,17 +5,18 @@
   "repository": "https://github.com/akoidan/pychat",
   "license": "MIT",
   "scripts": {
+    "prebuild": "rm -rf ./dist",
     "generate-configs": "node-ts-config",
-    "migrate": "ts-node --compiler ttypescript ./src/utils/migration.runner.ts ",
-    "build": "rm -rf ./dist && ttsc",
-    "start": "ts-node --compiler ttypescript src/main.ts",
+    "migrate": "NODE_ENV=development ts-node --compiler ttypescript ./src/utils/migration.runner.ts ",
+    "build": "ttsc",
+    "start": "NODE_ENV=development ts-node --compiler ttypescript src/main.ts",
     "test:html:coverage": "jest --config ./src/utils/jest.config.ts --runInBand --coverage --detectOpenHandles --testTimeout=100000 --coverageReporters html",
     "test": "jest --config ./src/utils/jest.config.ts --runInBand --coverage --coverageReporters text",
     "lint": "eslint --ext .ts --max-warnings=0 src",
     "lint:new": "eslint-find-rules -u ./.eslintrc.json",
     "lint:fix": "eslint --fix --ext .ts src",
     "create:database": "echo \"drop database pychat2; create database pychat2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; GRANT ALL ON pychat2.* TO 'pychat'@'localhost';\" |sudo mysql -u root\n",
-    "create:migrate:prod": "ts-node --compiler ttypescript ./src/utils/migration.old.ts",
+    "create:migrate:prod": "NODE_ENV=development ts-node --compiler ttypescript ./src/utils/migration.old.ts",
     "db:flush:all": "yarn create:database && yarn migrate && yarn create:migrate:prod"
   },
   "engines": {
@@ -78,7 +79,6 @@
     "jest-runner-eslint": "^1.0.0",
     "supertest": "^6.2.2",
     "ts-jest": "^27.1.4",
-    "ts-loader": "^9.2.8",
     "ts-node": "^10.7.0",
     "tsruntime": "^3.0.0-beta.1",
     "ttypescript": "^1.5.13",
diff --git a/newback/src/config/default.json b/newback/src/config/env/development.json
similarity index 100%
rename from newback/src/config/default.json
rename to newback/src/config/env/development.json
diff --git a/newback/src/config/env/production.json b/newback/src/config/env/production.json
new file mode 100644
index 000000000..de95028c3
--- /dev/null
+++ b/newback/src/config/env/production.json
@@ -0,0 +1,50 @@
+{
+  "auth": {
+    "google": {
+      "clientId": "@@GOOGLE_CLIENT_ID"
+    },
+    "facebook": {
+      "accessToken": "@@FACEBOOK_ACCESS_TOKEN"
+    }
+  },
+   "application": {
+    "port": "@@APPLICATION_PORT",
+    "ssl" : {
+      "crtPath": "@@APPLICATION_SSL_CRT_PATH",
+      "keyPath": "@@APPLICATION_SSL_CRT_KEY_PATH"
+    }
+  },
+  "settings": {
+    "flags": true
+  },
+  "redis": {
+    "host": "@@REDIS_HOST",
+    "port":  "@@REDIS_PORT",
+    "database": 0
+  },
+  "frontend": {
+    "address": "@@FRONTEND_ADDRESS",
+    "issueReportLink": "@@FRONTEND_ISSUE_REPORT_LINK"
+  },
+  "recaptcha": {
+    "publicKey": "@@RECAPTCHA_PUBLIC_KEY",
+    "privateKey": "@@RECAPTCHA_PRIVATE_KEY"
+  },
+  "email": {
+    "host": "@@EMAIL_HOST",
+    "port": "@@EMAIL_HOST",
+    "secure": "@@EMAIL_HOST",
+    "auth": {
+      "user": "@@EMAIL_AUTH_USER",
+      "pass": "@@EMAIL_AUTH_PASS"
+    }
+  },
+  "mysql": {
+    "logging": true,
+    "host": "@@MYSQL_HOST",
+    "port": "@@MYSQL_PORT",
+    "username": "@@MYSQL_USER",
+    "password": "@@MYSQL_PASSWORD",
+    "database": "@@MYSQL_DATABASE"
+  }
+}
diff --git a/newback/src/config/user/.gitkeep b/newback/src/config/user/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/newback/src/main.ts b/newback/src/main.ts
index 350d54828..251bc60b9 100644
--- a/newback/src/main.ts
+++ b/newback/src/main.ts
@@ -12,7 +12,7 @@ import {NestFactory} from "@nestjs/core";
 
 async function bootstrap() {
   let httpsOptions: HttpsOptions = null;
-  if (config.application.ssl) {
+  if (config.application.ssl?.keyPath) {
     httpsOptions = {};
     httpsOptions.key = await readFile(config.application.ssl.keyPath, "utf-8");
     httpsOptions.cert = await readFile(config.application.ssl.crtPath, "utf-8");
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 4938feb24..52e7d32c7 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -2678,7 +2678,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.2:
+enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.2:
   version "5.9.2"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
   integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==
@@ -5131,7 +5131,7 @@ methods@^1.1.2, methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^4.0.0, micromatch@^4.0.4:
+micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -6320,7 +6320,7 @@ selderee@^0.6.0:
   dependencies:
     parseley "^0.7.0"
 
-semver@7.x, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@7.x, semver@^7.3.2, semver@^7.3.5:
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b"
   integrity sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==
@@ -7016,16 +7016,6 @@ ts-jest@^27.1.4:
     semver "7.x"
     yargs-parser "20.x"
 
-ts-loader@^9.2.8:
-  version "9.2.8"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.8.tgz#e89aa32fa829c5cad0a1d023d6b3adecd51d5a48"
-  integrity sha512-gxSak7IHUuRtwKf3FIPSW1VpZcqF9+MBrHOvBp9cjHh+525SjtCIJKVGjRKIAfxBwDGDGCFF00rTfzB1quxdSw==
-  dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^5.0.0"
-    micromatch "^4.0.0"
-    semver "^7.3.4"
-
 ts-node@^10.7.0:
   version "10.7.0"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"

From 14e501e7064a05019b9f159e59fd87565c9c0415 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 15 May 2022 13:37:26 +0300
Subject: [PATCH 105/221] adde prob and namespace to kube adde health route

---
 download_content.sh                           |   6 +
 kubernetes/DockerfileBackend                  |   2 +-
 kubernetes/backend.yaml                       |   8 +-
 kubernetes/config-map.yaml                    |   3 +-
 kubernetes/mariadb.yaml                       |   4 +-
 kubernetes/redis.yaml                         |   2 +
 kubernetes/secret.yaml                        |   1 +
 newback/src/config/env/development.json       |   2 +-
 .../migration.start/202204110326-init.sql     |   8 -
 .../migration.start/202205151120-room.sql     |   7 +
 newback/src/data/types/api.ts                 |   4 +
 .../modules/api/health/health.controller.ts   |  21 +
 .../modules/api/health/health.module.spec.ts  | 550 ++++++++++++++++++
 .../src/modules/api/health/health.module.ts   |  12 +
 .../src/modules/api/health/health.service.ts  |  32 +
 newback/src/modules/app/app.module.ts         |   2 +
 .../shared/database/database.module.ts        |   2 +
 .../repository/health.repository.e2e.spec.ts  |  35 ++
 .../database/repository/health.repository.ts  |  16 +
 .../repository/message.repository.e2e.spec.ts |   2 -
 20 files changed, 704 insertions(+), 15 deletions(-)
 create mode 100644 newback/src/data/migration.start/202205151120-room.sql
 create mode 100644 newback/src/modules/api/health/health.controller.ts
 create mode 100644 newback/src/modules/api/health/health.module.spec.ts
 create mode 100644 newback/src/modules/api/health/health.module.ts
 create mode 100644 newback/src/modules/api/health/health.service.ts
 create mode 100644 newback/src/modules/shared/database/repository/health.repository.e2e.spec.ts
 create mode 100644 newback/src/modules/shared/database/repository/health.repository.ts

diff --git a/download_content.sh b/download_content.sh
index b030d9588..970b8957a 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -73,6 +73,12 @@ update_docker() {
     safeRunCommand docker push deathangel908/pychat-test
 }
 
+apply_minikube() {
+  kubectl delete -f ./kubernetes/backend.yaml
+  sleep 20
+  minikube image rm deathangel908/pychat-backend
+  minikube image load deathangel908/pychat-backend
+}
 rename_domain() {
     exist_domain="pychat\.org"
     your_domain="$1"
diff --git a/kubernetes/DockerfileBackend b/kubernetes/DockerfileBackend
index e05b119ac..42d73b3b4 100644
--- a/kubernetes/DockerfileBackend
+++ b/kubernetes/DockerfileBackend
@@ -1,5 +1,5 @@
 # cd <root>
-# docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend
+# docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend .
 # https://stackoverflow.com/a/49478889/3872976
 # minikube tunnel service/backend-service
 # chrome http://192.168.49.2:30002/
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index ca65b7777..9b860a176 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: backend-deployment
+  namespace: pychat
   labels:
     app: backend
 spec:
@@ -20,16 +21,21 @@ spec:
         image: deathangel908/pychat-backend
         ports:
         - containerPort: 8888
+        readinessProbe:
+          httpGet:
+            path: /api/health
+            port: 8888
         envFrom:
         - secretRef:
             name: pychat-secret
         - configMapRef:
-            name: pychat-config-map
+            name: config-map
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: backend-service
+  namespace: pychat
 spec:
   selector:
     app: backend
diff --git a/kubernetes/config-map.yaml b/kubernetes/config-map.yaml
index f82e5b701..4ddbcce75 100644
--- a/kubernetes/config-map.yaml
+++ b/kubernetes/config-map.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: pychat-config-map
+  name: config-map
+  namespace: pychat
 data:
   MYSQL_PORT: '3306'
   MYSQL_DATABASE: pychat
diff --git a/kubernetes/mariadb.yaml b/kubernetes/mariadb.yaml
index aa9bfe95a..ecc3bc4e8 100644
--- a/kubernetes/mariadb.yaml
+++ b/kubernetes/mariadb.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mariadb-deployment
+  namespace: pychat
   labels:
     app: mariadb
 spec:
@@ -28,12 +29,13 @@ spec:
         - secretRef:
             name: pychat-secret
         - configMapRef:
-            name: pychat-config-map
+            name: config-map
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: mariadb-service
+  namespace: pychat
 spec:
   selector:
     app: mariadb
diff --git a/kubernetes/redis.yaml b/kubernetes/redis.yaml
index 811651725..e150f298c 100644
--- a/kubernetes/redis.yaml
+++ b/kubernetes/redis.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redis-deployment
+  namespace: pychat
   labels:
     app: redis
 spec:
@@ -24,6 +25,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: redis-service
+  namespace: pychat
 spec:
   selector:
     app: redis
diff --git a/kubernetes/secret.yaml b/kubernetes/secret.yaml
index 9acf2f737..e116005a0 100644
--- a/kubernetes/secret.yaml
+++ b/kubernetes/secret.yaml
@@ -3,6 +3,7 @@ kind: Secret
 type: Opaque
 metadata:
   name: pychat-secret
+  namespace: pychat
 data:
   MYSQL_ROOT_PASSWORD: cHlwYXNz
   MYSQL_PASSWORD: cHlwYXNz
diff --git a/newback/src/config/env/development.json b/newback/src/config/env/development.json
index 9e91b50f1..40353104d 100644
--- a/newback/src/config/env/development.json
+++ b/newback/src/config/env/development.json
@@ -24,6 +24,6 @@
     "port": 3306,
     "username": "pychat",
     "password": "pypass",
-    "database": "pychat"
+    "database": "pychat2"
   }
 }
diff --git a/newback/src/data/migration.start/202204110326-init.sql b/newback/src/data/migration.start/202204110326-init.sql
index 8a10a05eb..40721b2ff 100644
--- a/newback/src/data/migration.start/202204110326-init.sql
+++ b/newback/src/data/migration.start/202204110326-init.sql
@@ -285,11 +285,3 @@ CREATE TABLE `user_settings`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE utf8mb4_general_ci;
-
--- INSERT INTO user (id, last_time_online, username, sex, thumbnail, created_at, updated_at, deleted_at) VALUES (1, 1649949638861, '1', 'OTHER', null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
--- INSERT INTO channel (id, name, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, '2022-04-13 16:32:11', '2022-04-13 16:32:09', null);
--- INSERT INTO room (id, name, is_main_in_channel, p2p, channel_id, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, DEFAULT, 1, 1, '2022-04-13 16:35:16', '2022-04-13 16:35:20', null);
--- INSERT INTO user_profile (id, name, city, surname, birthday, contacts, created_at, updated_at, deleted_at) VALUES (1, null, null, null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
--- INSERT INTO user_auth (id, password, email, facebook_id, google_id, email_verification_id, created_at, updated_at, deleted_at) VALUES (1, '$2b$10$8RTcHp1.oCEYGiPgLbTHH.Fk8MC6YUySzJ8AxGFxnjFqb.zsdlH7m', 'deathangel908@gmail.com', null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
--- INSERT INTO user_settings (id, suggestions, show_when_i_typing, embedded_youtube, highlight_code, message_sound, incoming_file_call_sound, online_change_sound, logs, theme, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 'error', 'COLOR_REG', '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
--- INSERT INTO room_user (id, room_id, user_id, volume, notifications, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 2, 0, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
diff --git a/newback/src/data/migration.start/202205151120-room.sql b/newback/src/data/migration.start/202205151120-room.sql
new file mode 100644
index 000000000..d7343a1f0
--- /dev/null
+++ b/newback/src/data/migration.start/202205151120-room.sql
@@ -0,0 +1,7 @@
+INSERT INTO user (id, last_time_online, username, sex, thumbnail, created_at, updated_at, deleted_at) VALUES (1, 1649949638861, '1', 'OTHER', null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO channel (id, name, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, '2022-04-13 16:32:11', '2022-04-13 16:32:09', null);
+INSERT INTO room (id, name, is_main_in_channel, p2p, channel_id, creator_id, created_at, updated_at, deleted_at) VALUES (1, 'all', 1, DEFAULT, 1, 1, '2022-04-13 16:35:16', '2022-04-13 16:35:20', null);
+INSERT INTO user_profile (id, name, city, surname, birthday, contacts, created_at, updated_at, deleted_at) VALUES (1, null, null, null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO user_auth (id, password, email, facebook_id, google_id, email_verification_id, created_at, updated_at, deleted_at) VALUES (1, '$2b$10$8RTcHp1.oCEYGiPgLbTHH.Fk8MC6YUySzJ8AxGFxnjFqb.zsdlH7m', 'deathangel908@gmail.com', null, null, null, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO user_settings (id, suggestions, show_when_i_typing, embedded_youtube, highlight_code, message_sound, incoming_file_call_sound, online_change_sound, logs, theme, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 'error', 'COLOR_REG', '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
+INSERT INTO room_user (id, room_id, user_id, volume, notifications, created_at, updated_at, deleted_at) VALUES (1, 1, 1, 2, 0, '2022-04-13 13:37:37', '2022-04-13 13:37:37', null);
diff --git a/newback/src/data/types/api.ts b/newback/src/data/types/api.ts
index 31ac9d185..fe8c0a2cf 100644
--- a/newback/src/data/types/api.ts
+++ b/newback/src/data/types/api.ts
@@ -9,6 +9,10 @@ export interface IpFailedInfoResponse {
   status: "fail";
 }
 
+export interface HealthResponse {
+  tables: number;
+}
+
 export interface IpSuccessInfoResponse {
   status: "success";
   country: string;
diff --git a/newback/src/modules/api/health/health.controller.ts b/newback/src/modules/api/health/health.controller.ts
new file mode 100644
index 000000000..c2ff99f3c
--- /dev/null
+++ b/newback/src/modules/api/health/health.controller.ts
@@ -0,0 +1,21 @@
+import {
+  Controller,
+  Get,
+} from "@nestjs/common";
+import {HealthService} from "@/modules/api/health/health.service";
+import type {HealthResponse} from "@/data/types/api";
+
+
+@Controller({
+  path: "/api/health",
+})
+export class HealthController {
+  public constructor(private readonly healthService: HealthService) {
+  }
+
+  @Get()
+  public async auth(): Promise<HealthResponse> {
+    return this.healthService.checkHealth();
+  }
+}
+
diff --git a/newback/src/modules/api/health/health.module.spec.ts b/newback/src/modules/api/health/health.module.spec.ts
new file mode 100644
index 000000000..6482bd689
--- /dev/null
+++ b/newback/src/modules/api/health/health.module.spec.ts
@@ -0,0 +1,550 @@
+import type {INestApplication} from "@nestjs/common";
+import {
+  ConsoleLogger,
+  Logger,
+  ValidationPipe,
+} from "@nestjs/common";
+import * as supertest from "supertest";
+import {Test} from "@nestjs/testing";
+import {AuthService} from "@/modules/api/auth/auth.service";
+import {AuthController} from "@/modules/api/auth/auth.controller";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
+import {PasswordService} from "@/modules/shared/password/password.service";
+import {UserRepository} from "@/modules/shared/database/repository/user.repository";
+import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {EmailService} from "@/modules/shared/email/email.service";
+import {MailerService} from "@nestjs-modules/mailer";
+import {Sequelize} from "sequelize-typescript";
+import {HtmlService} from "@/modules/shared/html/html.service";
+import waitForExpect from "wait-for-expect";
+import {GoogleAuthService} from "@/modules/api/auth/google.auth.service";
+import type {OAuth2Client} from "google-auth-library";
+import {HttpService} from "@/modules/shared/http/http.service";
+import type fetch from "node-fetch";
+import * as googleResponseFixture from "@/fixtures/google.response.fixture.json";
+import * as facebookGetTokenResponseFixture from "@/fixtures/facebook.get.token.response.json";
+import * as facebookGetUserResponseFixture from "@/fixtures/facebook.get.user.response.json";
+import {ConfigService} from "@/modules/shared/config/config.service";
+import {config} from "node-ts-config";
+import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
+import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
+import {IpService} from "@/modules/shared/ip/ip.service";
+import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
+import type {IpAddressModel} from "@/data/model/ip.address.model";
+import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
+import {SessionService} from "@/modules/shared/session/session.service";
+
+describe("AuthModule", () => {
+  let app: INestApplication;
+  let request: supertest.SuperTest<supertest.Test>;
+  const userRepository: UserRepository = {} as UserRepository;
+  const verificationRepository: VerificationRepository = {} as VerificationRepository;
+  const ipRepository: IpRepository = {} as IpRepository;
+  ipRepository.connectCreateHook = jest.fn().mockReturnValue(undefined);
+  const roomRepository: RoomRepository = {} as RoomRepository;
+  const redisService: RedisService = {} as RedisService;
+  const sequelize: Sequelize = {} as Sequelize;
+  const mailerService: MailerService = {} as MailerService;
+  const oauth2Client: OAuth2Client = {} as OAuth2Client;
+  let nodeApply: (...args) => void = () => {
+  };
+  const configService: ConfigService = {} as ConfigService;
+  beforeAll(async() => {
+    // Required to compile Guards like CaptchaGuard
+    configService.getConfig = jest.fn().mockReturnValue(config);
+    const moduleFixture = await Test.createTestingModule({
+      imports: [LoggerModule],
+      providers: [
+        PasswordService,
+        AuthService,
+        HtmlService,
+        EmailService,
+        SessionService,
+        IpCacheService,
+        IpService,
+        FacebookAuthService,
+        {
+          provide: ConfigService,
+          useValue: configService,
+        },
+        {
+          provide: MailerService,
+          useValue: mailerService,
+        },
+        {
+          provide: Sequelize,
+          useValue: sequelize,
+        },
+        {
+          provide: MailerService,
+          useValue: mailerService,
+        },
+        {
+          provide: RedisService,
+          useValue: redisService,
+        },
+        {
+          provide: UserRepository,
+          useValue: userRepository,
+        },
+        {
+          provide: VerificationRepository,
+          useValue: verificationRepository,
+        },
+        {
+          provide: IpRepository,
+          useValue: ipRepository,
+        },
+        {
+          provide: RoomRepository,
+          useValue: roomRepository,
+        },
+        {
+          provide: GoogleAuthService,
+          inject: [Logger],
+          useFactory: (logger) => new GoogleAuthService(logger, oauth2Client),
+        },
+        {
+          provide: HttpService,
+          inject: [Logger],
+          useFactory: (logger) => new HttpService(logger, new Proxy(() => {
+          }, {
+            apply(target: {}, thisArg: any, argArray: any[]): any {
+              return nodeApply.apply(this, argArray);
+            },
+          }) as typeof fetch),
+        },
+      ],
+      controllers: [AuthController],
+    }).setLogger(new ConsoleLogger()).
+      compile();
+    app = moduleFixture.createNestApplication();
+    app.useGlobalPipes(new ValidationPipe());
+    await app.init();
+    request = supertest(app.getHttpServer());
+  });
+
+  beforeEach(() => {
+    configService.getConfig = jest.fn().mockReturnValue(config);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    Object.keys(userRepository).forEach((key) => delete userRepository[key]);
+    Object.keys(roomRepository).forEach((key) => delete roomRepository[key]);
+    Object.keys(redisService).forEach((key) => delete redisService[key]);
+    Object.keys(sequelize).forEach((key) => delete sequelize[key]);
+    Object.keys(mailerService).forEach((key) => delete mailerService[key]);
+    Object.keys(oauth2Client).forEach((key) => delete oauth2Client[key]);
+    Object.keys(ipRepository).forEach((key) => delete ipRepository[key]);
+    nodeApply = () => {
+    };
+    ipRepository.connectCreateHook = jest.fn().mockReturnValue(undefined);
+    Object.keys(configService).forEach((key) => delete configService[key]);
+    Object.keys(verificationRepository).forEach((key) => delete configService[key]);
+  });
+
+  afterAll(async() => {
+    await app.close();
+  });
+
+  describe("sign-in", () => {
+    it("should throw if user not exists", async() => {
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
+      await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "as$",
+      }).
+        expect(409, {
+          error: "Conflict",
+          message: "User with login doesn't exists",
+          statusCode: 409,
+        });
+    });
+    it("should throw exception that captcha missing", async() => {
+      configService.getConfig = jest.fn().mockReturnValue({
+        recaptcha: {
+          publicKey: "a",
+          privateKey: "a",
+        },
+      } as typeof config);
+      const {body} = await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "as$",
+      }).
+        expect(400, {
+          statusCode: 400,
+          message: "Captcha is missing",
+          error: "Bad Request",
+        });
+    });
+    it("should go throw captcha when its presnt", async() => {
+      const passwordService = app.get(PasswordService);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      const password = await passwordService.createPassword("koko");
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
+        userAuth: {
+          password,
+        },
+        id: 3,
+      });
+      configService.getConfig = jest.fn().mockReturnValue({
+        recaptcha: {
+          publicKey: "a",
+          privateKey: "a",
+        },
+      } as typeof config);
+      nodeApply = jest.fn().mockReturnValue({json: jest.fn().mockResolvedValue({success: true})});
+      const {body} = await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "koko",
+        captcha: "asd",
+      });
+      expect(body).toMatchObject({session: expect.any(String)});
+    });
+
+    it("should throw if password invalid", async() => {
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
+        userAuth: {
+          password: "s",
+        },
+        id: 3,
+      });
+      const {body} = await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "as$",
+      }).
+        expect(401, {
+          error: "Unauthorized",
+          message: "Invalid password",
+          statusCode: 401,
+        });
+    });
+    it("should return session", async() => {
+      const passwordService = app.get(PasswordService);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      const password = await passwordService.createPassword("koko");
+      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
+        userAuth: {
+          password,
+        },
+        id: 3,
+      });
+      const {body} = await request.post("/api/auth/sign-in").send({
+        username: "a",
+        password: "koko",
+      });
+      expect(body).toMatchObject({session: expect.any(String)});
+    });
+  });
+
+  describe("google-sign-in", () => {
+    it("should login if user exists", async() => {
+      sequelize.transaction = (resolve) => resolve();
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue({
+        id: 1,
+        user: {
+          username: "as",
+        },
+      });
+      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
+      });
+      const {body} = await request.post("/api/auth/google-sign-in").send({
+        token: "aasdasd",
+      }).
+        expect(201);
+      expect(body).toMatchObject({
+        session: expect.any(String),
+        isNewAccount: false,
+      });
+    });
+    it("should create a new user when email is new and user with email not exist", async() => {
+      sequelize.transaction = (resolve) => resolve("transaction");
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.createUser = jest.fn().mockResolvedValue(3);
+      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      const createUserSpy = jest.spyOn(userRepository, "createUser");
+      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
+      });
+      const {body} = await request.post("/api/auth/google-sign-in").send({
+        token: "aasdasd",
+      }).
+        expect(201);
+      expect(body).toMatchObject({
+        session: expect.any(String),
+        isNewAccount: true,
+        username: "death", // From fixture
+      });
+      expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
+        email: "death@gmail.com",
+        googleId: "death@gmail.com",
+        name: "Andrew",
+        password: expect.any(String),
+        sex: "OTHER",
+        surname: "Superman",
+        thumbnail: "https://lh3.googleusercontent.com/a-/xxxxxxxxxxxx-xxxxxxxxxxxx",
+        username: "death",
+      }), "transaction");
+    });
+    it("should throw an error if email exists", async() => {
+      sequelize.transaction = (resolve) => resolve();
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
+
+      /*
+       * UserRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+       * userRepository.createUser = jest.fn().mockResolvedValue(3);
+       * roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+       */
+      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
+      });
+      const {body} = await request.post("/api/auth/google-sign-in").send({
+        token: "aasdasd",
+      }).
+        expect(409);
+      expect(body).toMatchObject({
+        error: "Conflict",
+        statusCode: 409,
+        message: "User with this email already exist, but has no connected google account." +
+          " If this is you, please login as this user and connect this google profile in profile settings",
+      });
+    });
+  });
+
+  describe("facebook-sign-in", () => {
+    it("should login if user exists", async() => {
+      sequelize.transaction = (resolve) => resolve();
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      nodeApply = jest.fn().mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
+        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
+      configService.getConfig = jest.fn().mockReturnValue({
+        auth: {
+          facebook: {
+            accessToken: "test",
+          },
+        },
+      } as typeof config);
+      userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue({
+        id: 1,
+        user: {
+          username: "as",
+        },
+      });
+      const {body} = await request.post("/api/auth/facebook-sign-in").send({
+        token: "aasdasd",
+      }).
+        expect(201);
+      expect(body).toMatchObject({
+        session: expect.any(String),
+        isNewAccount: false,
+      });
+    });
+    it("should create a new user when email is new and user with email not exist", async() => {
+      sequelize.transaction = (resolve) => resolve("transaction");
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+
+      nodeApply = jest.fn().mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
+        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
+      configService.getConfig = jest.fn().mockReturnValue({
+        auth: {
+          facebook: {
+            accessToken: "test",
+          },
+        },
+      } as typeof config);
+      userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue(null);
+
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.createUser = jest.fn().mockResolvedValue(3);
+      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      const createUserSpy = jest.spyOn(userRepository, "createUser");
+      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
+        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
+      });
+      const {body} = await request.post("/api/auth/facebook-sign-in").send({
+        token: "aasdasd",
+      }).
+        expect(201);
+      expect(body).toMatchObject({
+        session: expect.any(String),
+        isNewAccount: true,
+        username: "Andrew_Koidan", // From fixture
+      });
+      expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
+        facebookId: "1096917160382471",
+        name: "Andrew",
+        password: expect.any(String),
+        sex: "OTHER",
+        surname: "Koidan",
+        username: "Andrew_Koidan",
+      }), "transaction");
+    });
+  });
+
+  describe("sign-up", () => {
+    it("returns session", async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.createUser = jest.fn().mockResolvedValue(3);
+      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      const {body} = await request.post("/api/auth/sign-up").send({
+        username: "a",
+        password: "as$",
+      }).
+        expect(201);
+
+      expect(body).toMatchObject({session: expect.any(String)});
+    });
+    it("sends an email", async() => {
+      configService.getConfig = jest.fn().mockReturnValue({
+        ...config,
+        email: {},
+      });
+      sequelize.transaction = (resolve) => resolve();
+      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
+      userRepository.createUser = jest.fn().mockResolvedValue(3);
+      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
+      mailerService.sendMail = jest.fn();
+      ipRepository.getIp = jest.fn().mockResolvedValue({
+        country: "Ukraine",
+        city: "Mariupol",
+        isp: "AZOV",
+      } as IpAddressModel);
+      const spy = jest.spyOn(mailerService, "sendMail").mockResolvedValue(true);
+      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
+      const {body} = await request.post("/api/auth/sign-up").send({
+        username: "a",
+        password: "as$",
+        email: "death@gmail.com",
+      }).
+        expect(201);
+
+      expect(body).toMatchObject({session: expect.any(String)});
+      await waitForExpect(() => {
+        expect(spy).toHaveBeenCalledTimes(1);
+      }, 30); // 30ms is more than enough
+      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.any(String)}));
+    });
+    it("throws an error if user exists", async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
+      const {body} = await request.post("/api/auth/sign-up").send({
+        username: "a",
+        password: "as$",
+      }).
+        expect(409, {
+          error: "Conflict",
+          message: "User with this username already exist",
+          statusCode: 409,
+        });
+    });
+    it("throws an error if email exists", async() => {
+      sequelize.transaction = (resolve) => resolve();
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
+      const {body} = await request.post("/api/auth/sign-up").send({
+        username: "a",
+        password: "as$",
+        email: "death@gmail.com",
+      }).
+        expect(409, {
+          error: "Conflict",
+          message: "User with this email already exist",
+          statusCode: 409,
+        });
+    });
+  });
+
+  describe("validate-email", () => {
+    it("should return ok", async() => {
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
+      await request.post("/api/auth/validate-email").send({
+        email: "blah@gmail.com",
+      }).
+        expect(201, {ok: true});
+    });
+    it("should error if email exists", async() => {
+      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
+      await request.post("/api/auth/validate-email").send({
+        email: "exist@gmail.com",
+      }).
+        expect(409, {
+          error: "Conflict",
+          message: "User with this email already exist",
+          statusCode: 409,
+        });
+    });
+    it("should give error on invalid email", async() => {
+      await request.post("/api/auth/validate-email").send({
+        email: "invalidemail",
+      }).
+        expect(400, {
+          error: "Bad Request",
+          message: ["email must be an email"],
+          statusCode: 400,
+        });
+    });
+  });
+  describe("validate-user", () => {
+    it("should return ok", async() => {
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
+      await request.post("/api/auth/validate-user").send({
+        username: "a",
+      }).
+        expect(201, {ok: true});
+    });
+    it("should error if user exists", async() => {
+      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
+      await request.post("/api/auth/validate-user").send({
+        username: "a",
+      }).
+        expect(409, {
+          error: "Conflict",
+          message: "User with this username already exist",
+          statusCode: 409,
+        });
+    });
+    it("should give error on invalid character for username", async() => {
+      await request.post("/api/auth/validate-user").send({
+        username: "%",
+      }).
+        expect(400, {
+          error: "Bad Request",
+          message: ["Username can only contain latin characters, numbers and symbols '-' '_'"],
+          statusCode: 400,
+        });
+    });
+    it("should give error on invalid and also correct ones", async() => {
+      await request.post("/api/auth/validate-user").send({
+        username: "%asfasdf",
+      }).
+        expect(400, {
+          error: "Bad Request",
+          message: ["Username can only contain latin characters, numbers and symbols '-' '_'"],
+          statusCode: 400,
+        });
+    });
+    it("should give error if username has great length", async() => {
+      await request.post("/api/auth/validate-user").send({
+        username: "1234567890123456789",
+      }).
+        expect(400, {
+          error: "Bad Request",
+          message: ["Username should be 1-16 characters"],
+          statusCode: 400,
+        });
+    });
+  });
+});
diff --git a/newback/src/modules/api/health/health.module.ts b/newback/src/modules/api/health/health.module.ts
new file mode 100644
index 000000000..ea2f969e2
--- /dev/null
+++ b/newback/src/modules/api/health/health.module.ts
@@ -0,0 +1,12 @@
+import {Module} from "@nestjs/common";
+import {DatabaseModule} from "@/modules/shared/database/database.module";
+import {HealthController} from "@/modules/api/health/health.controller";
+import {HealthService} from "@/modules/api/health/health.service";
+
+@Module({
+  imports: [DatabaseModule],
+  controllers: [HealthController],
+  providers: [HealthService],
+})
+export class HealthModule {
+}
diff --git a/newback/src/modules/api/health/health.service.ts b/newback/src/modules/api/health/health.service.ts
new file mode 100644
index 000000000..23bc17a89
--- /dev/null
+++ b/newback/src/modules/api/health/health.service.ts
@@ -0,0 +1,32 @@
+import {
+  Injectable,
+  InternalServerErrorException,
+} from "@nestjs/common";
+import {Sequelize} from "sequelize-typescript";
+
+import {HealthRepository} from "@/modules/shared/database/repository/health.repository";
+import type {HealthResponse} from "@/data/types/api";
+
+@Injectable()
+export class HealthService {
+  constructor(
+    private readonly sequelize: Sequelize,
+    private readonly healthRepo: HealthRepository,
+  ) {
+  }
+
+
+  public async checkHealth(): Promise<HealthResponse> {
+    const tables = await this.healthRepo.getTables();
+    const numberOfModels: number = Object.values(this.sequelize.models).length;
+    // +1 is a migration table
+    if (tables.length !== numberOfModels + 1) {
+      throw new InternalServerErrorException(
+        `Database migration is not finished. Expected ${numberOfModels} tables, but found ${tables.length}`
+      );
+    }
+    return {
+      tables: tables.length,
+    };
+  }
+}
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 6ff43c3de..5994101a0 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -10,6 +10,7 @@ import {VerifyModule} from "@/modules/api/verify/verify.module";
 import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {WebsocketModule} from "@/modules/api/websocket/websocket.module";
 import {FileModule} from "@/modules/api/file/file.module";
+import {HealthModule} from "@/modules/api/health/health.module";
 
 
 /*
@@ -38,6 +39,7 @@ import {FileModule} from "@/modules/api/file/file.module";
     FileModule,
     DatabaseModule,
     WebsocketModule,
+    HealthModule,
     RedisModule.forRoot({
       config: {
         host: config.redis.host,
diff --git a/newback/src/modules/shared/database/database.module.ts b/newback/src/modules/shared/database/database.module.ts
index 72c72fc97..3c2b4d1fb 100644
--- a/newback/src/modules/shared/database/database.module.ts
+++ b/newback/src/modules/shared/database/database.module.ts
@@ -25,6 +25,7 @@ import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
 import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 import {generateOrmConfig} from "@/utils/generate.orm.config";
+import {HealthRepository} from "@/modules/shared/database/repository/health.repository";
 
 const repositories = [
   UserRepository,
@@ -32,6 +33,7 @@ const repositories = [
   IpRepository,
   VerificationRepository,
   MessageRepository,
+  HealthRepository,
 ];
 
 @Module({
diff --git a/newback/src/modules/shared/database/repository/health.repository.e2e.spec.ts b/newback/src/modules/shared/database/repository/health.repository.e2e.spec.ts
new file mode 100644
index 000000000..ed418db99
--- /dev/null
+++ b/newback/src/modules/shared/database/repository/health.repository.e2e.spec.ts
@@ -0,0 +1,35 @@
+import {DatabaseModule} from "@/modules/shared/database/database.module";
+import {ConsoleLogger} from "@nestjs/common";
+import type {TestingModule} from "@nestjs/testing";
+import {Test} from "@nestjs/testing";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
+import {ConfigModule} from "@/modules/shared/config/config.module";
+import {HealthRepository} from "@/modules/shared/database/repository/health.repository";
+
+
+describe("HealthRepository", () => {
+  let app: TestingModule;
+  beforeAll(async() => {
+    app = await Test.createTestingModule({
+      imports: [
+        {
+          module: DatabaseModule,
+          imports: [
+            LoggerModule,
+            ConfigModule,
+            DatabaseModule,
+          ],
+        },
+
+      ],
+    }).setLogger(new ConsoleLogger()).
+      compile();
+  });
+  describe("checkHealth", () => {
+    it("should return ok", async() => {
+      const healthRepository: HealthRepository = app.get(HealthRepository);
+      let tables = await  healthRepository.getTables();
+      expect(tables.length).toBeGreaterThan(2);
+    });
+  });
+});
diff --git a/newback/src/modules/shared/database/repository/health.repository.ts b/newback/src/modules/shared/database/repository/health.repository.ts
new file mode 100644
index 000000000..fff8627bd
--- /dev/null
+++ b/newback/src/modules/shared/database/repository/health.repository.ts
@@ -0,0 +1,16 @@
+import {Injectable} from "@nestjs/common";
+import {Sequelize} from "sequelize-typescript";
+
+
+@Injectable()
+export class HealthRepository {
+  public constructor(
+    private readonly sequelize: Sequelize,
+  ) {
+  }
+
+  public async getTables(): Promise<string[]> {
+    const tables: Record<string, string>[] = await this.sequelize.query("show tables") as Record<string, string>[];
+    return tables.map((t) => Object.values(t)[0]);
+  }
+}
diff --git a/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
index 103761131..81f3006b8 100644
--- a/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
+++ b/newback/src/modules/shared/database/repository/message.repository.e2e.spec.ts
@@ -7,8 +7,6 @@ import {LoggerModule} from "@/modules/shared/logger/logger.module";
 import {ConfigModule} from "@/modules/shared/config/config.module";
 import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
 
-;
-
 describe("MessageRepository", () => {
   let app: TestingModule;
   beforeAll(async() => {

From 49d6dd45b70f328b0abec05434bc98f7d034cc24 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 16 May 2022 00:34:34 +0300
Subject: [PATCH 106/221] Added more kubernetes conf. it works now

---
 .dockerignore                    |  2 ++
 download_content.sh              | 38 +++++++++++++++++++++++++++--
 frontend/src/vue/auth/SignUp.vue |  3 ++-
 kubernetes/DockerfileFrontend    | 27 +++++++++++++++++++++
 kubernetes/backend.yaml          |  2 --
 kubernetes/frontend.json         | 15 ++++++++++++
 kubernetes/frontend.yaml         | 41 ++++++++++++++++++++++++++++++++
 kubernetes/ingress.yaml          | 36 ++++++++++++++++++++++++++++
 kubernetes/namespace.yaml        |  4 ++++
 kubernetes/nginx.conf            | 35 +++++++++++++++++++++++++++
 10 files changed, 198 insertions(+), 5 deletions(-)
 create mode 100644 kubernetes/DockerfileFrontend
 create mode 100644 kubernetes/frontend.json
 create mode 100644 kubernetes/frontend.yaml
 create mode 100644 kubernetes/ingress.yaml
 create mode 100644 kubernetes/namespace.yaml
 create mode 100644 kubernetes/nginx.conf

diff --git a/.dockerignore b/.dockerignore
index 2d3ba8625..0e7cfc99c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,9 +8,11 @@
 !newback/tsconfig.json
 !newback/src
 !common/src
+!kubernetes
 !frontend/src
 !frontend/patches
 !frontend/build
+frontend/build/production.json
 !frontend/package.json
 !frontend/yarn.lock
 !frontend/tsconfig.json
diff --git a/download_content.sh b/download_content.sh
index 970b8957a..724418146 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -73,12 +73,37 @@ update_docker() {
     safeRunCommand docker push deathangel908/pychat-test
 }
 
-apply_minikube() {
+minikube_frontend() {
+  kubectl delete -f ./kubernetes/frontend.yaml
+  sleep 10 &
+  docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .
+  wait
+  minikube image rm deathangel908/pychat-frontend
+  minikube image load deathangel908/pychat-frontend
+  kubectl apply -f ./kubernetes/frontend.yaml
+}
+
+minikube_backend() {
   kubectl delete -f ./kubernetes/backend.yaml
-  sleep 20
+  sleep 10 &
+  docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend .
+  wait
   minikube image rm deathangel908/pychat-backend
   minikube image load deathangel908/pychat-backend
+  kubectl apply -f ./kubernetes/backend.yaml
 }
+
+minikube_all() {
+  kubectl apply -f kubernetes/namespace.yaml
+  kubectl apply -f kubernetes/config-map.yaml
+  kubectl apply -f kubernetes/secret.yaml
+  kubectl apply -f kubernetes/mariadb.yaml
+  kubectl apply -f kubernetes/redis.yaml
+  minikube_backend
+  minikube_frontend
+  kubectl apply -f kubernetes/ingress.yaml
+}
+
 rename_domain() {
     exist_domain="pychat\.org"
     your_domain="$1"
@@ -496,6 +521,12 @@ elif [ "$1" = "copy_docker_prod_files" ]; then
     copy_docker_prod_files
 elif [ "$1" = "copy_root_fs" ]; then
     copy_root_fs
+elif [ "$1" = "minikube_all" ]; then
+    minikube_all
+elif [ "$1" = "minikube_frontend" ]; then
+    minikube_frontend
+elif [ "$1" = "minikube_backend" ]; then
+    minikube_backend
 elif [ "$1" = "redirect" ]; then
     safeRunCommand sudo iptables -t nat -A PREROUTING -p tcp --dport 443 -j REDIRECT --to-port 8080
     safeRunCommand sudo iptables -t nat -I OUTPUT -p tcp -d 127.0.0.1 --dport 443 -j REDIRECT --to-ports 8080
@@ -542,6 +573,9 @@ else
     chp copy_root_fs "Creates soft links from \e[96m$PROJECT_ROOT/rootfs\e[0;33;40m to \e[96m/\e[0;33;40m"
     chp build_nginx "Build nginx with http-upload-module and installs it; . Usage: \e[92msh download_content.sh build_nginx 1.15.3 2.3.0  /tmp/depsFileList.txt\e[0;33;40m where 1.15 is nginx version, 2.3.0 is upload-http-module version"
     chp create_django_tables "Creates database tables and data"
+    chp minikube_all "Creates/updates kubernetes cluster"
+    chp minikube_backend "Build backend docker file and deploy/update it in minikube"
+    chp minikube_frontend "Build frontend docker file and deploy/update it in minikube"
     exit 1
 fi
 
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index c98a96809..deec5bd15 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -129,9 +129,10 @@ import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import RegisterFieldSet from "@/vue/auth/RegisterFieldSet.vue";
 import debounce from "lodash.debounce";
 import {IconColor} from "@/ts/types/types";
-import type {LoginMessage} from "@/ts/types/messages/innerMessages";
+import type {LoginMessage} from "@/ts/types/messages/inner/login";
 import SocialAuthSignUp from "@/vue/auth/SocialAuthSignUp.vue";
 import {USERNAME_REGEX} from "@/ts/utils/consts";
+import {Gender} from "@common/model/enum";
 
 
 @Component({
diff --git a/kubernetes/DockerfileFrontend b/kubernetes/DockerfileFrontend
new file mode 100644
index 000000000..697181f78
--- /dev/null
+++ b/kubernetes/DockerfileFrontend
@@ -0,0 +1,27 @@
+# cd <root>
+# docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .
+# https://stackoverflow.com/a/49478889/3872976
+# minikube tunnel service/backend-service
+FROM node:14.17-alpine3.14 as builder
+
+WORKDIR /usr/src/frontend
+# for yarn install to clone via git in package.json
+RUN apk add git && mkdir /usr/src/common
+COPY ./frontend/package.json ./frontend/yarn.lock ./
+COPY ./frontend/patches ./patches/
+RUN yarn install --frozen-lockfile
+
+COPY ./frontend/tsconfig.node.json ./frontend/tsconfig.json ./
+COPY ./frontend/src ./src/
+COPY ./frontend/build ./build/
+COPY ./common/src /usr/src/common/src
+COPY ./kubernetes/frontend.json ./build/production.json
+
+RUN yarn build
+
+
+FROM nginx:1.21.6-alpine
+
+COPY --from=builder /usr/src/frontend/dist /srv/http/dist
+COPY kubernetes/nginx.conf /etc/nginx/conf.d/pychat.conf
+RUN rm /etc/nginx/conf.d/default.conf
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index 9b860a176..a1272815f 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -39,10 +39,8 @@ metadata:
 spec:
   selector:
     app: backend
-  type: LoadBalancer
   ports:
     - protocol: TCP
       port: 8888
       targetPort: 8888
-      nodePort: 30002
 
diff --git a/kubernetes/frontend.json b/kubernetes/frontend.json
new file mode 100644
index 000000000..1a0bc5d5c
--- /dev/null
+++ b/kubernetes/frontend.json
@@ -0,0 +1,15 @@
+{
+  "BACKEND_ADDRESS": "{}",
+  "IS_DEBUG": true,
+  "ELECTRON_IGNORE_SSL": true,
+  "PUBLIC_PATH": null,
+  "GOOGLE_OAUTH_2_CLIENT_ID": "620421656154-8boctt2h7h5meskhe7vh8aiargj0nae9.apps.googleusercontent.com",
+  "FACEBOOK_APP_ID": "894051850700207",
+  "RECAPTCHA_PUBLIC_KEY": "6LchGhwTAAAAAJwCRgfNKraWrFtCdKPFo0Ri8DLt",
+  "AUTO_REGISTRATION": false,
+  "ISSUES": false,
+  "GIPHY_API_KEY": "thZMTtWsaBQAPDIAY461GzYTctuYIeIj",
+  "GITHUB_LINK": "https://github.com/akoidan/pychat",
+  "FLAGS": true,
+  "WEBRTC_CONFIG": {"iceServers":[{"urls":["stun:turn2.l.google.com"]}]}
+}
diff --git a/kubernetes/frontend.yaml b/kubernetes/frontend.yaml
new file mode 100644
index 000000000..f6faf62ff
--- /dev/null
+++ b/kubernetes/frontend.yaml
@@ -0,0 +1,41 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: frontend-deployment
+  namespace: pychat
+  labels:
+    app: frontend
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: frontend
+  template:
+    metadata:
+      labels:
+        app: frontend
+    spec:
+      containers:
+      - name: frontend
+        imagePullPolicy: IfNotPresent
+        image: deathangel908/pychat-frontend
+        ports:
+        - containerPort: 80
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 80
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend-service
+  namespace: pychat
+spec:
+  selector:
+    app: frontend
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+
diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml
new file mode 100644
index 000000000..7050ff335
--- /dev/null
+++ b/kubernetes/ingress.yaml
@@ -0,0 +1,36 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ingress
+  namespace: pychat
+spec:
+  defaultBackend:
+    service:
+      name: frontend-service
+      port:
+        number: 80
+  rules:
+  - host: pychat.org
+    http:
+      paths:
+      - path: /api
+        pathType: Prefix
+        backend:
+          service:
+            name: backend-service
+            port:
+              number: 8888
+      - path: /ws
+        pathType: Prefix
+        backend:
+          service:
+            name: backend-service
+            port:
+              number: 8888
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: frontend-service
+            port:
+              number: 80
diff --git a/kubernetes/namespace.yaml b/kubernetes/namespace.yaml
new file mode 100644
index 000000000..a4740dbfe
--- /dev/null
+++ b/kubernetes/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: pychat
diff --git a/kubernetes/nginx.conf b/kubernetes/nginx.conf
new file mode 100644
index 000000000..087a60619
--- /dev/null
+++ b/kubernetes/nginx.conf
@@ -0,0 +1,35 @@
+server {
+    gzip on;
+    gzip_static on;
+    gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+    gzip_proxied  any;
+    gzip_vary on;
+    gzip_comp_level 6;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    add_header X-Frame-Options SAMEORIGIN;
+    add_header Strict-Transport-Security "max-age=31536000";
+
+    listen 80;
+
+    charset     utf-8;
+    client_max_body_size 75M;
+
+
+    underscores_in_headers on;
+
+    location ~ "^/photo/(?<filepath>\w{8}_(?<filename>.*))$"  {
+        add_header Content-Disposition 'inline; filename="$filename"';
+        alias /srv/http/photos/$filepath;
+    }
+
+    location /photo  {
+        alias /srv/http/photos;
+    }
+
+    root /srv/http/dist;
+
+    location / {
+        try_files $uri /index.html;
+    }
+}

From 4dac5530b72349695bdbb48eeb033d3d28d9ca9f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 16 May 2022 00:49:22 +0300
Subject: [PATCH 107/221] Added tls

---
 kubernetes/backend.yaml |  2 +-
 kubernetes/ingress.yaml |  4 ++++
 kubernetes/mariadb.yaml |  2 +-
 kubernetes/secret.yaml  | 13 ++++++++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index a1272815f..ec169d1b6 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -27,7 +27,7 @@ spec:
             port: 8888
         envFrom:
         - secretRef:
-            name: pychat-secret
+            name: secret
         - configMapRef:
             name: config-map
 ---
diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml
index 7050ff335..85fea57a2 100644
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/ingress.yaml
@@ -4,6 +4,10 @@ metadata:
   name: ingress
   namespace: pychat
 spec:
+  tls:
+  - hosts:
+    - pychat.org
+    secretName: certificate
   defaultBackend:
     service:
       name: frontend-service
diff --git a/kubernetes/mariadb.yaml b/kubernetes/mariadb.yaml
index ecc3bc4e8..77ac7ac46 100644
--- a/kubernetes/mariadb.yaml
+++ b/kubernetes/mariadb.yaml
@@ -27,7 +27,7 @@ spec:
           value: utf8mb4_general_ci
         envFrom:
         - secretRef:
-            name: pychat-secret
+            name: secret
         - configMapRef:
             name: config-map
 ---
diff --git a/kubernetes/secret.yaml b/kubernetes/secret.yaml
index e116005a0..144672ee3 100644
--- a/kubernetes/secret.yaml
+++ b/kubernetes/secret.yaml
@@ -2,9 +2,20 @@ apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: pychat-secret
+  name: secret
   namespace: pychat
 data:
   MYSQL_ROOT_PASSWORD: cHlwYXNz
   MYSQL_PASSWORD: cHlwYXNz
   MYSQL_USER: cHljaGF0
+---
+
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: certificate
+  namespace: pychat
+data:
+  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K

From 6c4c370ed87655c38b5b8c430d652187de62814f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 17 May 2022 00:07:16 +0300
Subject: [PATCH 108/221] Added persistence storage to kube

---
 download_content.sh              | 11 +++++++++--
 frontend/src/vue/auth/SignUp.vue |  2 +-
 kubernetes/backend.yaml          |  7 +++++++
 kubernetes/migrate-backend.yaml  | 20 ++++++++++++++++++++
 kubernetes/pv-photo.yaml         | 25 +++++++++++++++++++++++++
 5 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 kubernetes/migrate-backend.yaml
 create mode 100644 kubernetes/pv-photo.yaml

diff --git a/download_content.sh b/download_content.sh
index 724418146..0e58397b1 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -83,23 +83,30 @@ minikube_frontend() {
   kubectl apply -f ./kubernetes/frontend.yaml
 }
 
-minikube_backend() {
+minikube_backend_reload() {
   kubectl delete -f ./kubernetes/backend.yaml
   sleep 10 &
   docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend .
   wait
   minikube image rm deathangel908/pychat-backend
   minikube image load deathangel908/pychat-backend
+}
+
+minikube_backend() {
+  minikube_backend_reload
   kubectl apply -f ./kubernetes/backend.yaml
 }
 
 minikube_all() {
   kubectl apply -f kubernetes/namespace.yaml
+  kubectl apply -f kubernetes/pv-photo.yaml
   kubectl apply -f kubernetes/config-map.yaml
   kubectl apply -f kubernetes/secret.yaml
   kubectl apply -f kubernetes/mariadb.yaml
   kubectl apply -f kubernetes/redis.yaml
-  minikube_backend
+  minikube_backend_reload
+  kubectl apply -f kubernetes/migrate-backend.yaml
+  kubectl apply -f kubernetes/backend.yaml
   minikube_frontend
   kubectl apply -f kubernetes/ingress.yaml
 }
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index deec5bd15..2b4c302b9 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -132,7 +132,7 @@ import {IconColor} from "@/ts/types/types";
 import type {LoginMessage} from "@/ts/types/messages/inner/login";
 import SocialAuthSignUp from "@/vue/auth/SocialAuthSignUp.vue";
 import {USERNAME_REGEX} from "@/ts/utils/consts";
-import {Gender} from "@common/model/enum";
+import {Gender} from "@common/model/enum/gender";
 
 
 @Component({
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index ec169d1b6..58a05a9f9 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -30,6 +30,13 @@ spec:
             name: secret
         - configMapRef:
             name: config-map
+        volumeMounts:
+          - mountPath: "/usr/src/newback/photo"
+            name: photo
+      volumes:
+        - name: photo
+          persistentVolumeClaim:
+            claimName: pvc-photo
 ---
 apiVersion: v1
 kind: Service
diff --git a/kubernetes/migrate-backend.yaml b/kubernetes/migrate-backend.yaml
new file mode 100644
index 000000000..edea7ebc1
--- /dev/null
+++ b/kubernetes/migrate-backend.yaml
@@ -0,0 +1,20 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: migrate-backend-job
+  namespace: pychat
+spec:
+  template:
+    spec:
+      containers:
+      - name: migrate-backend
+        imagePullPolicy: IfNotPresent
+        image: deathangel908/pychat-backend
+        envFrom:
+        - secretRef:
+            name: secret
+        - configMapRef:
+            name: config-map
+        command: ["yarn",  "migrate"]
+      restartPolicy: Never
+  backoffLimit: 4
diff --git a/kubernetes/pv-photo.yaml b/kubernetes/pv-photo.yaml
new file mode 100644
index 000000000..221ad1b5f
--- /dev/null
+++ b/kubernetes/pv-photo.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-photo
+spec:
+  accessModes:
+    - ReadWriteMany
+  capacity:
+    storage: 5Gi
+  hostPath:
+    path: /data/photo
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-photo
+  namespace: pychat
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+  storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
+  volumeName: pv-photo

From 70fd59cc839d76553511bf1e54e9815293d4e9b2 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 17 May 2022 00:50:59 +0300
Subject: [PATCH 109/221] maridb pv works

---
 download_content.sh        | 75 ++++++++++++++++++++++++--------------
 kubernetes/mariadb.yaml    | 12 ++++++
 kubernetes/pv-mariadb.yaml | 22 +++++++++++
 kubernetes/pv-photo.yaml   |  2 +-
 4 files changed, 82 insertions(+), 29 deletions(-)
 create mode 100644 kubernetes/pv-mariadb.yaml

diff --git a/download_content.sh b/download_content.sh
index 0e58397b1..2c6eeeb82 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -73,42 +73,61 @@ update_docker() {
     safeRunCommand docker push deathangel908/pychat-test
 }
 
-minikube_frontend() {
-  kubectl delete -f ./kubernetes/frontend.yaml
-  sleep 10 &
-  docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .
-  wait
-  minikube image rm deathangel908/pychat-frontend
-  minikube image load deathangel908/pychat-frontend
-  kubectl apply -f ./kubernetes/frontend.yaml
+minikube_reload_frontend() {
+  minikube_reload backend DockerfileBackend
+}
+
+minikube_reload_backend() {
+  minikube_reload frontend DockerfileFrontend
 }
 
-minikube_backend_reload() {
-  kubectl delete -f ./kubernetes/backend.yaml
-  sleep 10 &
-  docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend .
-  wait
-  minikube image rm deathangel908/pychat-backend
-  minikube image load deathangel908/pychat-backend
+minikube_reload() {
+  image=$1
+  dockerfile=$2
+  # service can be not deployed yet, do not wait
+  kubectl delete -f ./kubernetes/$image.yaml --wait=true
+  safeRunCommand docker build -f ./kubernetes/$dockerfile -t deathangel908/pychat-$image .
+  safeRunCommand minikube image rm deathangel908/pychat-$image
+  safeRunCommand minikube image load deathangel908/pychat-$image
+}
+
+
+minikube_frontend() {
+  safeRunCommand minikube_reload_frontend
+  safeRunCommand kubectl apply -f kubernetes/frontend.yaml
 }
 
 minikube_backend() {
-  minikube_backend_reload
-  kubectl apply -f ./kubernetes/backend.yaml
+  safeRunCommand minikube_reload_backend
+  safeRunCommand kubectl apply -f kubernetes/backend.yaml
+}
+
+minikube_delete_all() {
+  kubectl delete -f kubernetes/ingress.yaml --wait=true
+  kubectl delete -f kubernetes/backend.yaml --wait=true
+  kubectl delete -f kubernetes/migrate-backend.yaml --wait=true
+  kubectl delete -f kubernetes/mariadb.yaml --wait=true
+  kubectl delete -f kubernetes/redis.yaml --wait=true
+  kubectl delete -f kubernetes/secret.yaml --wait=true
+  kubectl delete -f kubernetes/config-map.yaml --wait=true
+  kubectl delete -f kubernetes/pv-photo.yaml --wait=true
+  kubectl delete -f kubernetes/pv-mariadb.yaml --wait=true
+  kubectl delete -f kubernetes/namespace.yaml --wait=true
 }
 
 minikube_all() {
-  kubectl apply -f kubernetes/namespace.yaml
-  kubectl apply -f kubernetes/pv-photo.yaml
-  kubectl apply -f kubernetes/config-map.yaml
-  kubectl apply -f kubernetes/secret.yaml
-  kubectl apply -f kubernetes/mariadb.yaml
-  kubectl apply -f kubernetes/redis.yaml
-  minikube_backend_reload
-  kubectl apply -f kubernetes/migrate-backend.yaml
-  kubectl apply -f kubernetes/backend.yaml
-  minikube_frontend
-  kubectl apply -f kubernetes/ingress.yaml
+  safeRunCommand kubectl apply -f kubernetes/namespace.yaml
+  safeRunCommand kubectl apply -f kubernetes/pv-photo.yaml
+  safeRunCommand kubectl apply -f kubernetes/pv-mariadb.yaml
+  safeRunCommand kubectl apply -f kubernetes/config-map.yaml
+  safeRunCommand kubectl apply -f kubernetes/secret.yaml
+  safeRunCommand kubectl apply -f kubernetes/mariadb.yaml
+  safeRunCommand kubectl apply -f kubernetes/redis.yaml
+  safeRunCommand minikube_reload_backend
+  safeRunCommand kubectl apply -f kubernetes/migrate-backend.yaml
+  safeRunCommand kubectl apply -f kubernetes/backend.yaml
+  safeRunCommand minikube_reload_frontend
+  safeRunCommand kubectl apply -f kubernetes/ingress.yaml
 }
 
 rename_domain() {
diff --git a/kubernetes/mariadb.yaml b/kubernetes/mariadb.yaml
index 77ac7ac46..5f17f4975 100644
--- a/kubernetes/mariadb.yaml
+++ b/kubernetes/mariadb.yaml
@@ -10,6 +10,11 @@ spec:
   selector:
     matchLabels:
       app: mariadb
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
   template:
     metadata:
       labels:
@@ -30,6 +35,13 @@ spec:
             name: secret
         - configMapRef:
             name: config-map
+        volumeMounts:
+        - mountPath: /var/lib/mysql
+          name: mariadb-data
+      volumes:
+      - name: mariadb-data
+        persistentVolumeClaim:
+          claimName: pvc-mariadb
 ---
 apiVersion: v1
 kind: Service
diff --git a/kubernetes/pv-mariadb.yaml b/kubernetes/pv-mariadb.yaml
new file mode 100644
index 000000000..fd71e6530
--- /dev/null
+++ b/kubernetes/pv-mariadb.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-mariadb
+spec:
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: 1Gi
+  hostPath:
+    path: /data/mariadb
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+   name: pvc-mariadb
+spec:
+   accessModes:
+     - ReadWriteOnce
+   resources:
+     requests:
+       storage: 1Gi
diff --git a/kubernetes/pv-photo.yaml b/kubernetes/pv-photo.yaml
index 221ad1b5f..14fc2fc25 100644
--- a/kubernetes/pv-photo.yaml
+++ b/kubernetes/pv-photo.yaml
@@ -17,7 +17,7 @@ metadata:
   namespace: pychat
 spec:
   accessModes:
-    - ReadWriteOnce
+    - ReadWriteMany
   resources:
     requests:
       storage: 5Gi

From f862c227e2bddba89686d5f037f702452e0bb516 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 19 May 2022 01:44:41 +0300
Subject: [PATCH 110/221] Added ability to have multiple backends

---
 download_content.sh                           |  2 +
 frontend/build/static-server.js               |  5 +-
 kubernetes/backend.yaml                       |  2 +-
 kubernetes/pv-redis.yaml                      | 22 ++++++
 kubernetes/redis.yaml                         |  7 ++
 newback/src/data/types/internal.ts            | 14 +++-
 .../modules/api/websocket/message.service.ts  | 17 ++--
 .../api/websocket/websocket.gateway.ts        |  6 +-
 .../modules/api/websocket/websocket.module.ts |  5 +-
 .../api/websocket/websocket.service.ts        | 10 +--
 newback/src/modules/app/app.module.ts         |  7 ++
 .../modules/shared/pubsub/pubsub.module.ts    | 37 +++++++++
 .../shared/pubsub/pubsub.service.spec.ts      | 78 +++++++++++++++++++
 .../modules/shared/pubsub/pubsub.service.ts   | 75 +++++++++++-------
 .../shared/pubsub/redis.subscribe.service.ts  | 47 +++++++++++
 .../src/modules/shared/redis/redis.service.ts | 30 +++----
 newback/tsconfig.json                         | 16 ++--
 17 files changed, 303 insertions(+), 77 deletions(-)
 create mode 100644 kubernetes/pv-redis.yaml
 create mode 100644 newback/src/modules/shared/pubsub/pubsub.module.ts
 create mode 100644 newback/src/modules/shared/pubsub/pubsub.service.spec.ts
 create mode 100644 newback/src/modules/shared/pubsub/redis.subscribe.service.ts

diff --git a/download_content.sh b/download_content.sh
index 2c6eeeb82..4d668bc67 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -111,6 +111,7 @@ minikube_delete_all() {
   kubectl delete -f kubernetes/secret.yaml --wait=true
   kubectl delete -f kubernetes/config-map.yaml --wait=true
   kubectl delete -f kubernetes/pv-photo.yaml --wait=true
+  kubectl delete -f kubernetes/pv-redis.yaml --wait=true
   kubectl delete -f kubernetes/pv-mariadb.yaml --wait=true
   kubectl delete -f kubernetes/namespace.yaml --wait=true
 }
@@ -118,6 +119,7 @@ minikube_delete_all() {
 minikube_all() {
   safeRunCommand kubectl apply -f kubernetes/namespace.yaml
   safeRunCommand kubectl apply -f kubernetes/pv-photo.yaml
+  safeRunCommand kubectl apply -f kubernetes/pv-redis.yaml
   safeRunCommand kubectl apply -f kubernetes/pv-mariadb.yaml
   safeRunCommand kubectl apply -f kubernetes/config-map.yaml
   safeRunCommand kubectl apply -f kubernetes/secret.yaml
diff --git a/frontend/build/static-server.js b/frontend/build/static-server.js
index de2886baf..9f0ab7148 100644
--- a/frontend/build/static-server.js
+++ b/frontend/build/static-server.js
@@ -1,9 +1,8 @@
 const servor = require('servor');
-const {promisify} = require('util');
-const {readFile} = require('fs');
+const {readFile} = require('fs/promises');
 
 async function readFileAsync(name) {
-    return promisify(readFile)(name);
+    return readFile(name);
 }
 
 async function main() {
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index 58a05a9f9..860096183 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: backend
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app: backend
diff --git a/kubernetes/pv-redis.yaml b/kubernetes/pv-redis.yaml
new file mode 100644
index 000000000..3afe3fbaf
--- /dev/null
+++ b/kubernetes/pv-redis.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-redis
+spec:
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: 1Gi
+  hostPath:
+    path: /data/redis
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+   name: pvc-redis
+spec:
+   accessModes:
+     - ReadWriteOnce
+   resources:
+     requests:
+       storage: 1Gi
diff --git a/kubernetes/redis.yaml b/kubernetes/redis.yaml
index e150f298c..36dbfdbd0 100644
--- a/kubernetes/redis.yaml
+++ b/kubernetes/redis.yaml
@@ -20,6 +20,13 @@ spec:
         image: redis:7.0.0-alpine3.15
         ports:
         - containerPort: 6379
+        volumeMounts:
+        - mountPath: /data
+          name: redis-data
+      volumes:
+      - name: redis-data
+        persistentVolumeClaim:
+          claimName: pvc-redis
 ---
 apiVersion: v1
 kind: Service
diff --git a/newback/src/data/types/internal.ts b/newback/src/data/types/internal.ts
index d0d06d92b..52ede9b83 100644
--- a/newback/src/data/types/internal.ts
+++ b/newback/src/data/types/internal.ts
@@ -1,16 +1,21 @@
-import {
+import type {
   DefaultWsInMessage,
-  HandlerName
+  HandlerName,
 } from "@common/ws/common";
 
 import type {RoomModel} from "@/data/model/room.model";
 import type {RoomUsersModel} from "@/data/model/room.users.model";
 import type {ChannelModel} from "@/data/model/channel.model";
 import type {UserModel} from "@/data/model/user.model";
-import {WebSocketContextData} from "@/data/types/patch";
-
+import type {WebSocketContextData} from "@/data/types/patch";
+import type {WebsocketGateway} from "@/modules/api/websocket/websocket.gateway";
 
 
+export interface PubSubHandlerType {
+  target: WebsocketGateway;
+  memberName: keyof WebsocketGateway;
+  handler: string;
+}
 
 export type UserOnlineData = Record<string, string[]>;
 
@@ -32,6 +37,7 @@ export interface OnWsClose {
 
 export interface PubSubMessage<A extends string, H extends HandlerName> {
   body: DefaultWsInMessage<A, H, any>;
+  handler: keyof WebsocketGateway;
 }
 
 /*
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index b4d4229ba..def3f6336 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -1,12 +1,12 @@
-import {MessageStatus} from '@common/model/enum/message.status';
+import {MessageStatus} from "@common/model/enum/message.status";
 
-import {SyncHistoryWsOutBody} from '@common/ws/message/sync.history';
+import type {SyncHistoryWsOutBody} from "@common/ws/message/sync.history";
 import type {
   ShowITypeWsInMessage,
   ShowITypeWsOutBody,
 } from "@common/ws/message/show.i.type";
 
-import {PrintMessageWsOutBody} from '@common/ws/message/print.message';
+import type {PrintMessageWsOutBody} from "@common/ws/message/print.message";
 import {
   Injectable,
   Logger,
@@ -28,7 +28,7 @@ import {
 } from "@/data/transformers/out.message/inner.transformer";
 import {transformPrintMessage} from "@/data/transformers/out.message/print.message.transformer";
 import {getMaxSymbol} from "@/data/transformers/helper/get.max.symbol";
-import {WebSocketContextData} from "@/data/types/patch";
+import type {WebSocketContextData} from "@/data/types/patch";
 
 
 @Injectable()
@@ -42,7 +42,7 @@ export class MessageService {
     this.messageRepository.attachHooks();
   }
 
-  public showIType(data: ShowITypeWsOutBody, context: WebSocketContextData): void {
+  public async showIType(data: ShowITypeWsOutBody, context: WebSocketContextData): Promise<void> {
     const body: ShowITypeWsInMessage = {
       action: "showIType",
       handler: "room",
@@ -51,9 +51,9 @@ export class MessageService {
         userId: context.userId,
       },
     };
-    this.pubsubService.emit(
-      "sendToClient",
+    await this.pubsubService.emit(
       {
+        handler: "sendToClient",
         body,
       },
       String(data.roomId),
@@ -127,7 +127,8 @@ export class MessageService {
         await this.messageRepository.deleteUploadedFiles(files.map((f) => f.id), transaction);
       }
       const body = transformPrintMessage(messageModel, mentions, images);
-      this.pubsubService.emit("sendToClient", {body}, data.roomId);
+      await this.pubsubService.emit({body,
+        handler: "sendToClient"}, data.roomId);
     });
   }
 }
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index c3742acd2..451606e76 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -106,11 +106,11 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
   @UseGuards(
     OwnRoomGuard((data: ShowITypeWsOutBody) => [data.roomId])
   )
-  public showIType(
+  public async showIType(
     @MessageBody() data: ShowITypeWsOutBody,
       @WsContext() context: WebSocketContextData
-  ): void {
-    this.messageService.showIType(data, context);
+  ): Promise<void> {
+    await this.messageService.showIType(data, context);
   }
 
   @SubscribeMessage("getCountryCode")
diff --git a/newback/src/modules/api/websocket/websocket.module.ts b/newback/src/modules/api/websocket/websocket.module.ts
index ab2642505..85cc2d9c2 100644
--- a/newback/src/modules/api/websocket/websocket.module.ts
+++ b/newback/src/modules/api/websocket/websocket.module.ts
@@ -8,20 +8,21 @@ import {DatabaseModule} from "@/modules/shared/database/database.module";
 import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import {WsDataService} from "@/modules/api/websocket/ws.data.service";
 import {MessageService} from "@/modules/api/websocket/message.service";
+import {PubsubModule} from "@/modules/shared/pubsub/pubsub.module";
 
 
 @Module({
-  imports: [DatabaseModule],
+  imports: [DatabaseModule, PubsubModule],
   providers: [
     SessionService,
     WebsocketService,
     PasswordService,
     RedisService,
-    PubsubService,
     WsDataService,
     MessageService,
     WebsocketGateway,
   ],
+
 })
 export class WebsocketModule {
 }
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 2aeff8a05..0396841fb 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -14,7 +14,7 @@ import {transformSetWsId} from "@/data/transformers/out.message/set.ws.id.transf
 import {transformAddUserOnline} from "@/data/transformers/out.message/add.online.user.transformer";
 import {getLogoutMessage} from "@/data/transformers/out.message/remove.online.user.transformer";
 import type {AddOnlineUserMessage} from "@common/ws/message/add.online.user";
-import {WebSocketContextData} from "@/data/types/patch";
+import type {WebSocketContextData} from "@/data/types/patch";
 
 
 @Injectable()
@@ -65,9 +65,9 @@ export class WebsocketService {
     context.sendToClient(response);
     this.pubsubService.subscribe(context, ...channelsToListen);
     const data: AddOnlineUserMessage = transformAddUserOnline(online, user, id);
-    this.pubsubService.emit(
-      "sendToClient",
+    await this.pubsubService.emit(
       {
+        handler: "sendToClient",
         body: data,
       },
       "*"
@@ -83,9 +83,9 @@ export class WebsocketService {
     if (context.userId && !online[context.userId]) {
       const lastTimeOnline: number = Date.now();
       await this.userRepository.setLastTimeOnline(context.userId, lastTimeOnline);
-      this.pubsubService.emit(
-        "sendToClient",
+      await this.pubsubService.emit(
         {
+          handler: "sendToClient",
           body: getLogoutMessage(online, lastTimeOnline, context, lastTimeOnline),
         },
         "*"
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 5994101a0..779292500 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -47,6 +47,13 @@ import {HealthModule} from "@/modules/api/health/health.module";
         db: config.redis.database,
       },
     }),
+  RedisModule.forRoot({
+      config: {
+        host: config.redis.host,
+        port: config.redis.port,
+        db: config.redis.database,
+      },
+    }, 'pubsub'),
   ],
   providers: [
     {
diff --git a/newback/src/modules/shared/pubsub/pubsub.module.ts b/newback/src/modules/shared/pubsub/pubsub.module.ts
new file mode 100644
index 000000000..be19fc0d9
--- /dev/null
+++ b/newback/src/modules/shared/pubsub/pubsub.module.ts
@@ -0,0 +1,37 @@
+import {
+  Logger,
+  Module,
+} from "@nestjs/common";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
+import {RedisModule} from "@nestjs-modules/ioredis";
+import {config} from "node-ts-config";
+import {RedisSubscribeService} from "@/modules/shared/pubsub/redis.subscribe.service";
+
+@Module({
+  imports: [
+    RedisModule.forRoot({
+      config: {
+        host: config.redis.host,
+        port: config.redis.port,
+        db: config.redis.database,
+      },
+    }, "pubsub"),
+  ],
+  providers: [
+    RedisService,
+    RedisSubscribeService,
+    {
+      provide: PubsubService,
+      inject: [Logger, RedisService, RedisSubscribeService],
+      useFactory: async(l: Logger, r: RedisService, rs: RedisSubscribeService) => {
+        const ps = new PubsubService(l, r, rs);
+        await ps.startListening();
+        return ps;
+      },
+    },
+  ],
+  exports: [PubsubService]
+})
+export class PubsubModule {
+}
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.spec.ts b/newback/src/modules/shared/pubsub/pubsub.service.spec.ts
new file mode 100644
index 000000000..0e56325d4
--- /dev/null
+++ b/newback/src/modules/shared/pubsub/pubsub.service.spec.ts
@@ -0,0 +1,78 @@
+import {MessageStatus} from "@common/model/enum/message.status";
+import {ConsoleLogger} from "@nestjs/common";
+import type {TestingModule} from "@nestjs/testing";
+import {Test} from "@nestjs/testing";
+import {MessageRepository} from "@/modules/shared/database/repository/messages.repository";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {RedisModule} from "@nestjs-modules/ioredis";
+import {config} from "node-ts-config";
+import {LoggerModule} from "@/modules/shared/logger/logger.module";
+import {
+  PubsubService,
+  SubscribePuBSub,
+} from "@/modules/shared/pubsub/pubsub.service";
+import type {
+  PubSubMessage,
+  SendToClientPubSubMessage,
+} from "@/data/types/internal";
+import type {
+  DefaultWsInMessage,
+  HandlerName,
+} from "@common/ws/common";
+import {SubscribeMessage} from "@nestjs/websockets";
+import type {WebSocketContextData} from "@/data/types/patch";
+import waitForExpect from "wait-for-expect";
+import {PubsubModule} from "@/modules/shared/pubsub/pubsub.module";
+
+describe("PubSubService", () => {
+  let app: TestingModule;
+  let pubsubService: PubsubService;
+  beforeAll(async() => {
+    app = await Test.createTestingModule({
+      imports: [
+        LoggerModule,
+        RedisModule.forRoot({
+          config: {
+            host: config.redis.host,
+            port: config.redis.port,
+            db: config.redis.database,
+          },
+        },),
+        PubsubModule,
+      ],
+    }).setLogger(new ConsoleLogger()).
+      compile();
+    pubsubService = app.get(PubsubService);
+  });
+  describe("subscribe", () => {
+    jest.setTimeout(1000000);
+    it("should produce correct sql", async() => {
+      let called = false;
+      const message: PubSubMessage<"asd", "ws-message"> = {
+        handler: "sendToClient",
+        body: {
+          action: "asd",
+          data: {a: 3},
+          handler: "ws-message",
+        },
+      };
+      SubscribePuBSub("sendToClient")({
+        sendToClient(ctx: WebSocketContextData, data: SendToClientPubSubMessage<any, any, any>) {
+          console.log("asd");
+          called = true;
+        },
+      } as any, "sendToClient", undefined);
+      await pubsubService.subscribe({
+        id: "asd",
+        userId: 3,
+        sendToClient<H extends HandlerName>(data: DefaultWsInMessage<any, H, any>) {
+          console.log("asd");
+        },
+      }, "1");
+      await pubsubService.emit(message, "1");
+      await waitForExpect(() => {
+        expect(called).toBe(true);
+      }, 30000);
+    });
+  });
+});
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
index 2cf1799d3..173cc8b81 100644
--- a/newback/src/modules/shared/pubsub/pubsub.service.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.service.ts
@@ -4,19 +4,13 @@ import {
   Logger,
 } from "@nestjs/common";
 import type {
+  PubSubHandlerType,
   PubSubMessage,
 } from "@/data/types/internal";
 import type {HandlerName} from "@common/ws/common";
-import {WebSocketContextData} from "@/data/types/patch";
-
-
-interface HandlerType {
-  target: WebsocketGateway;
-  memberName: keyof WebsocketGateway;
-  handler: string;
-}
-
-const handlers: HandlerType[] = [];
+import type {WebSocketContextData} from "@/data/types/patch";
+import {RedisService} from "@/modules/shared/redis/redis.service";
+import {RedisSubscribeService} from "@/modules/shared/pubsub/redis.subscribe.service";
 
 
 /*
@@ -29,7 +23,7 @@ const handlers: HandlerType[] = [];
  */
 export function SubscribePuBSub<T extends keyof WebsocketGateway>(handler: T) {
   return (target: WebsocketGateway, memberName: T, propertyDescriptor: PropertyDescriptor) => {
-    handlers.push({
+    PubsubService.handlers.push({
       handler,
       memberName,
       target,
@@ -37,41 +31,62 @@ export function SubscribePuBSub<T extends keyof WebsocketGateway>(handler: T) {
   };
 }
 
-const receivers: Record<string, {ctx: WebSocketContextData}[]> = {};
-
 @Injectable()
 export class PubsubService {
+  private receivers: Record<string, {ctx: WebSocketContextData}[]> = {};
+
+  public static readonly handlers: PubSubHandlerType[] = [];
+
+  private readonly subscribedChannel: string[] = [];
+
   constructor(
     private readonly logger: Logger,
+    private readonly redis: RedisService,
+    private readonly subscribeService: RedisSubscribeService,
   ) {
   }
 
   // A extends string,H extends HandlerName
 
-  public emit<PS extends PubSubMessage<A, H>, A extends string, H extends HandlerName>(handler: keyof WebsocketGateway, data: PS, ...channel: (number | string)[]) {
-    channel.forEach((channel) => {
-      if (receivers[channel]) {
-        receivers[channel].forEach((receiver) => {
-          const proxy = handlers.find((h) => h.handler === handler);
-          (proxy.target[proxy.memberName] as any)(receiver.ctx, data);
-        });
-      }
+  public async emit<PS extends PubSubMessage<A, H>, A extends string, H extends HandlerName>(data: PS, ...channel: (number | string)[]) {
+    await this.redis.emit(channel[0] as any, data);
+  }
+
+  async startListening() {
+    await this.subscribeService.onMessage((channel, message) => {
+      this.onRedisMessage(channel, message as PubSubMessage<any, any>);
     });
   }
 
-  public subscribe(context: WebSocketContextData, ...channel: string[]) {
+  public onRedisMessage(channel: string, data: PubSubMessage<any, any>) {
+    if (this.receivers[channel]) {
+      this.receivers[channel].forEach((receiver) => {
+        const proxy = PubsubService.handlers.find((h) => h.handler === data.handler);
+        if (!proxy) {
+          throw Error(`Invalid handler ${data.handler}`);
+        }
+        (proxy.target[proxy.memberName] as any)(receiver.ctx, data.body);
+      });
+    }
+  }
+
+  public async subscribe(context: WebSocketContextData, ...channel: string[]) {
+    const newChannels = channel.filter((c) => !this.subscribedChannel.includes(c));
+    if (newChannels.length > 0) {
+      await this.subscribeService.listen(newChannels);
+    }
     channel.forEach((channel) => {
-      if (!receivers[channel]) {
-        receivers[channel] = [];
+      if (!this.receivers[channel]) {
+        this.receivers[channel] = [];
       }
-      receivers[channel].push({
+      this.receivers[channel].push({
         ctx: context,
       });
     });
   }
 
   public unsubscribeAll(context: WebSocketContextData) {
-    Object.values(receivers).forEach((contexts) => {
+    Object.values(this.receivers).forEach((contexts) => {
       const index = contexts.findIndex((c) => c.ctx = context);
       if (index >= 0) {
         contexts.splice(index, 1);
@@ -81,17 +96,17 @@ export class PubsubService {
 
   public unsubscribe(context: WebSocketContextData, ...channels: [string, ...string[]]) {
     channels.forEach((channel) => {
-      if (receivers[channel]) {
-        const index = receivers[channel].findIndex((c) => c.ctx = context);
+      if (this.receivers[channel]) {
+        const index = this.receivers[channel].findIndex((c) => c.ctx = context);
         if (index >= 0) {
-          receivers[channel].splice(index, 1);
+          this.receivers[channel].splice(index, 1);
         }
       }
     });
   }
 
   public getMyChannels(context: WebSocketContextData): string[] {
-    return Object.entries(receivers).filter(([k, v]) => v.find((k) => k.ctx === context)).
+    return Object.entries(this.receivers).filter(([k, v]) => v.find((k) => k.ctx === context)).
       map(([k, v]) => k);
   }
 }
diff --git a/newback/src/modules/shared/pubsub/redis.subscribe.service.ts b/newback/src/modules/shared/pubsub/redis.subscribe.service.ts
new file mode 100644
index 000000000..ff0735678
--- /dev/null
+++ b/newback/src/modules/shared/pubsub/redis.subscribe.service.ts
@@ -0,0 +1,47 @@
+import {
+  Injectable,
+  Logger,
+} from "@nestjs/common";
+import {
+  InjectRedis,
+  Redis,
+} from "@nestjs-modules/ioredis";
+
+@Injectable()
+export class RedisSubscribeService {
+  public constructor(
+
+    /*
+     * Once the client enters the subscribed state it is not supposed to issue any other commands,
+     * except for additional SUBSCRIBE, PSUBSCRIBE, UNSUBSCRIBE and PUNSUBSCRIBE commands.
+     */
+    @InjectRedis("pubsub") private readonly redis: Redis,
+    private readonly logger: Logger,
+  ) {
+  }
+
+  public async onMessage(cb: (channel: string, message: unknown) => void): Promise<void> {
+    return new Promise((resolve) => {
+      this.redis.on("message", (channel: string, message: string) => {
+        this.logger.debug(`Got on channel='${channel}' message='${message}'`, "redis");
+        const data: unknown = JSON.parse(message);
+        cb(channel, data);
+      });
+      resolve();
+    });
+  }
+
+
+  public async listen(channels: (Buffer | string)[]): Promise<unknown> {
+    return new Promise<unknown>((resolve, reject) => {
+      this.logger.debug(`Listening channels=[${channels.join(", ")}]`, "redis");
+      this.redis.subscribe(...channels, (err, data) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(data);
+        }
+      });
+    });
+  }
+}
diff --git a/newback/src/modules/shared/redis/redis.service.ts b/newback/src/modules/shared/redis/redis.service.ts
index 195e22456..ec8711ee6 100644
--- a/newback/src/modules/shared/redis/redis.service.ts
+++ b/newback/src/modules/shared/redis/redis.service.ts
@@ -36,7 +36,9 @@ export class RedisService {
   }
 
   public async setIps(value: UserJoinedInfoModel[]): Promise<void> {
-    await this.redis.set(REDIS_KEYS.REDIS_IPS_KEY, JSON.stringify(value));
+    let data = JSON.stringify(value);
+    this.logger.debug(`set ${REDIS_KEYS.REDIS_IPS_KEY}[${data}]`, "redis");
+    await this.redis.set(REDIS_KEYS.REDIS_IPS_KEY, data);
   }
 
   public async removeSession(session: string) {
@@ -53,6 +55,20 @@ export class RedisService {
     return parseInt(a);
   }
 
+  public async emit(channel: string, message: unknown): Promise<number> {
+    return new Promise((resolve, reject) => {
+      let data = JSON.stringify(message);
+      this.logger.debug(`Publish to channel='${channel}' message='${data}'`, "redis");
+      this.redis.publish(channel, data, (err, d) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(d);
+        }
+      });
+    });
+  }
+
   public async addOnline(id: string): Promise<void> {
     this.logger.debug(`sadd ${REDIS_KEYS.REDIS_ONLINE_KEY}=${id}`, "redis");
     this.redis.sadd(REDIS_KEYS.REDIS_ONLINE_KEY, id);
@@ -80,16 +96,4 @@ export class RedisService {
       return set;
     }, {});
   }
-
-  public async getNewRedisInstance() {
-
-  }
-
-  /*
-   * Import  {promisify} from 'util';
-   * Public async subscribe(channels: string[]) {
-   *   // @ts-expect-error
-   *   Await promisify(this.redis.subscribe)(...channels);
-   * }
-   */
 }
diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index 1f0738c8e..218423989 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -1,16 +1,16 @@
 {
  "exclude": [
     "node_modules",
-    "**/*.spec.ts",
+//    "**/*.spec.ts",
     "dist"
   ],
-  "ts-node": {
-    "files": true
-  },
-  "files": [
-    "src/main.ts",
-    "src/data/types/patch.d.ts"
-  ],
+//  "ts-node": {
+//    "files": true
+//  },
+//  "files": [
+//    "src/main.ts",
+//    "src/data/types/patch.d.ts"
+//  ],
   "compilerOptions": {
      "paths": {
       "@/*": ["src/*"],

From 27c68613dbbe1b28dc125dd52a99ce45bb8724fd Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 19 May 2022 11:07:46 +0300
Subject: [PATCH 111/221] Fixed tests

---
 newback/src/config/env/test.json              |   6 +-
 .../modules/api/health/health.module.spec.ts  | 510 +-----------------
 .../src/modules/api/health/health.service.ts  |   2 +-
 ...vice.spec.ts => pubsub.module.e2e.spec.ts} |   0
 4 files changed, 23 insertions(+), 495 deletions(-)
 rename newback/src/modules/shared/pubsub/{pubsub.service.spec.ts => pubsub.module.e2e.spec.ts} (100%)

diff --git a/newback/src/config/env/test.json b/newback/src/config/env/test.json
index 73d293d83..badf6f0e2 100644
--- a/newback/src/config/env/test.json
+++ b/newback/src/config/env/test.json
@@ -1,4 +1,8 @@
 {
   "recaptcha": null,
-  "email": null
+  "email": null,
+  "frontend": {
+    "address": "https://localhost:8080",
+    "issueReportLink": "https://github.com/akoidan/pychat/issues/new"
+  }
 }
diff --git a/newback/src/modules/api/health/health.module.spec.ts b/newback/src/modules/api/health/health.module.spec.ts
index 6482bd689..0e8190646 100644
--- a/newback/src/modules/api/health/health.module.spec.ts
+++ b/newback/src/modules/api/health/health.module.spec.ts
@@ -1,54 +1,23 @@
 import type {INestApplication} from "@nestjs/common";
 import {
   ConsoleLogger,
-  Logger,
   ValidationPipe,
 } from "@nestjs/common";
 import * as supertest from "supertest";
 import {Test} from "@nestjs/testing";
-import {AuthService} from "@/modules/api/auth/auth.service";
-import {AuthController} from "@/modules/api/auth/auth.controller";
 import {LoggerModule} from "@/modules/shared/logger/logger.module";
-import {PasswordService} from "@/modules/shared/password/password.service";
-import {UserRepository} from "@/modules/shared/database/repository/user.repository";
-import {RoomRepository} from "@/modules/shared/database/repository/room.repository";
-import {RedisService} from "@/modules/shared/redis/redis.service";
-import {EmailService} from "@/modules/shared/email/email.service";
-import {MailerService} from "@nestjs-modules/mailer";
-import {Sequelize} from "sequelize-typescript";
-import {HtmlService} from "@/modules/shared/html/html.service";
-import waitForExpect from "wait-for-expect";
-import {GoogleAuthService} from "@/modules/api/auth/google.auth.service";
-import type {OAuth2Client} from "google-auth-library";
-import {HttpService} from "@/modules/shared/http/http.service";
-import type fetch from "node-fetch";
-import * as googleResponseFixture from "@/fixtures/google.response.fixture.json";
-import * as facebookGetTokenResponseFixture from "@/fixtures/facebook.get.token.response.json";
-import * as facebookGetUserResponseFixture from "@/fixtures/facebook.get.user.response.json";
 import {ConfigService} from "@/modules/shared/config/config.service";
 import {config} from "node-ts-config";
-import {FacebookAuthService} from "@/modules/api/auth/facebook.auth.service";
-import {IpCacheService} from "@/modules/shared/ip/ip.cache.service";
-import {IpService} from "@/modules/shared/ip/ip.service";
-import {IpRepository} from "@/modules/shared/database/repository/ip.repository";
-import type {IpAddressModel} from "@/data/model/ip.address.model";
-import {VerificationRepository} from "@/modules/shared/database/repository/verification.repository";
-import {SessionService} from "@/modules/shared/session/session.service";
+import {HealthController} from "@/modules/api/health/health.controller";
+import {HealthService} from "@/modules/api/health/health.service";
+import {HealthRepository} from "@/modules/shared/database/repository/health.repository";
+import {Sequelize} from "sequelize-typescript";
 
 describe("AuthModule", () => {
   let app: INestApplication;
   let request: supertest.SuperTest<supertest.Test>;
-  const userRepository: UserRepository = {} as UserRepository;
-  const verificationRepository: VerificationRepository = {} as VerificationRepository;
-  const ipRepository: IpRepository = {} as IpRepository;
-  ipRepository.connectCreateHook = jest.fn().mockReturnValue(undefined);
-  const roomRepository: RoomRepository = {} as RoomRepository;
-  const redisService: RedisService = {} as RedisService;
+  const healthRepository: HealthRepository = {} as HealthRepository;
   const sequelize: Sequelize = {} as Sequelize;
-  const mailerService: MailerService = {} as MailerService;
-  const oauth2Client: OAuth2Client = {} as OAuth2Client;
-  let nodeApply: (...args) => void = () => {
-  };
   const configService: ConfigService = {} as ConfigService;
   beforeAll(async() => {
     // Required to compile Guards like CaptchaGuard
@@ -56,67 +25,21 @@ describe("AuthModule", () => {
     const moduleFixture = await Test.createTestingModule({
       imports: [LoggerModule],
       providers: [
-        PasswordService,
-        AuthService,
-        HtmlService,
-        EmailService,
-        SessionService,
-        IpCacheService,
-        IpService,
-        FacebookAuthService,
+        HealthService,
         {
-          provide: ConfigService,
-          useValue: configService,
-        },
-        {
-          provide: MailerService,
-          useValue: mailerService,
+          provide: HealthRepository,
+          useValue: healthRepository,
         },
         {
           provide: Sequelize,
           useValue: sequelize,
         },
         {
-          provide: MailerService,
-          useValue: mailerService,
-        },
-        {
-          provide: RedisService,
-          useValue: redisService,
-        },
-        {
-          provide: UserRepository,
-          useValue: userRepository,
-        },
-        {
-          provide: VerificationRepository,
-          useValue: verificationRepository,
-        },
-        {
-          provide: IpRepository,
-          useValue: ipRepository,
-        },
-        {
-          provide: RoomRepository,
-          useValue: roomRepository,
-        },
-        {
-          provide: GoogleAuthService,
-          inject: [Logger],
-          useFactory: (logger) => new GoogleAuthService(logger, oauth2Client),
-        },
-        {
-          provide: HttpService,
-          inject: [Logger],
-          useFactory: (logger) => new HttpService(logger, new Proxy(() => {
-          }, {
-            apply(target: {}, thisArg: any, argArray: any[]): any {
-              return nodeApply.apply(this, argArray);
-            },
-          }) as typeof fetch),
+          provide: ConfigService,
+          useValue: configService,
         },
       ],
-      controllers: [AuthController],
+      controllers: [HealthController],
     }).setLogger(new ConsoleLogger()).
       compile();
     app = moduleFixture.createNestApplication();
@@ -131,18 +54,8 @@ describe("AuthModule", () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    Object.keys(userRepository).forEach((key) => delete userRepository[key]);
-    Object.keys(roomRepository).forEach((key) => delete roomRepository[key]);
-    Object.keys(redisService).forEach((key) => delete redisService[key]);
-    Object.keys(sequelize).forEach((key) => delete sequelize[key]);
-    Object.keys(mailerService).forEach((key) => delete mailerService[key]);
-    Object.keys(oauth2Client).forEach((key) => delete oauth2Client[key]);
-    Object.keys(ipRepository).forEach((key) => delete ipRepository[key]);
-    nodeApply = () => {
-    };
-    ipRepository.connectCreateHook = jest.fn().mockReturnValue(undefined);
+    Object.keys(healthRepository).forEach((key) => delete healthRepository[key]);
     Object.keys(configService).forEach((key) => delete configService[key]);
-    Object.keys(verificationRepository).forEach((key) => delete configService[key]);
   });
 
   afterAll(async() => {
@@ -151,400 +64,11 @@ describe("AuthModule", () => {
 
   describe("sign-in", () => {
     it("should throw if user not exists", async() => {
-      userRepository.getUserByUserName = jest.fn().mockResolvedValue(null);
-      await request.post("/api/auth/sign-in").send({
-        username: "a",
-        password: "as$",
-      }).
-        expect(409, {
-          error: "Conflict",
-          message: "User with login doesn't exists",
-          statusCode: 409,
-        });
-    });
-    it("should throw exception that captcha missing", async() => {
-      configService.getConfig = jest.fn().mockReturnValue({
-        recaptcha: {
-          publicKey: "a",
-          privateKey: "a",
-        },
-      } as typeof config);
-      const {body} = await request.post("/api/auth/sign-in").send({
-        username: "a",
-        password: "as$",
-      }).
-        expect(400, {
-          statusCode: 400,
-          message: "Captcha is missing",
-          error: "Bad Request",
-        });
-    });
-    it("should go throw captcha when its presnt", async() => {
-      const passwordService = app.get(PasswordService);
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      const password = await passwordService.createPassword("koko");
-      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
-        userAuth: {
-          password,
-        },
-        id: 3,
-      });
-      configService.getConfig = jest.fn().mockReturnValue({
-        recaptcha: {
-          publicKey: "a",
-          privateKey: "a",
-        },
-      } as typeof config);
-      nodeApply = jest.fn().mockReturnValue({json: jest.fn().mockResolvedValue({success: true})});
-      const {body} = await request.post("/api/auth/sign-in").send({
-        username: "a",
-        password: "koko",
-        captcha: "asd",
-      });
-      expect(body).toMatchObject({session: expect.any(String)});
-    });
-
-    it("should throw if password invalid", async() => {
-      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
-        userAuth: {
-          password: "s",
-        },
-        id: 3,
-      });
-      const {body} = await request.post("/api/auth/sign-in").send({
-        username: "a",
-        password: "as$",
-      }).
-        expect(401, {
-          error: "Unauthorized",
-          message: "Invalid password",
-          statusCode: 401,
-        });
-    });
-    it("should return session", async() => {
-      const passwordService = app.get(PasswordService);
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      const password = await passwordService.createPassword("koko");
-      userRepository.getUserByUserName = jest.fn().mockResolvedValue({
-        userAuth: {
-          password,
-        },
-        id: 3,
-      });
-      const {body} = await request.post("/api/auth/sign-in").send({
-        username: "a",
-        password: "koko",
-      });
-      expect(body).toMatchObject({session: expect.any(String)});
-    });
-  });
-
-  describe("google-sign-in", () => {
-    it("should login if user exists", async() => {
-      sequelize.transaction = (resolve) => resolve();
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue({
-        id: 1,
-        user: {
-          username: "as",
-        },
-      });
-      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
-        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
-      });
-      const {body} = await request.post("/api/auth/google-sign-in").send({
-        token: "aasdasd",
-      }).
-        expect(201);
-      expect(body).toMatchObject({
-        session: expect.any(String),
-        isNewAccount: false,
-      });
-    });
-    it("should create a new user when email is new and user with email not exist", async() => {
-      sequelize.transaction = (resolve) => resolve("transaction");
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
-      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      userRepository.createUser = jest.fn().mockResolvedValue(3);
-      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-      const createUserSpy = jest.spyOn(userRepository, "createUser");
-      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
-        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
-      });
-      const {body} = await request.post("/api/auth/google-sign-in").send({
-        token: "aasdasd",
-      }).
-        expect(201);
-      expect(body).toMatchObject({
-        session: expect.any(String),
-        isNewAccount: true,
-        username: "death", // From fixture
-      });
-      expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
-        email: "death@gmail.com",
-        googleId: "death@gmail.com",
-        name: "Andrew",
-        password: expect.any(String),
-        sex: "OTHER",
-        surname: "Superman",
-        thumbnail: "https://lh3.googleusercontent.com/a-/xxxxxxxxxxxx-xxxxxxxxxxxx",
-        username: "death",
-      }), "transaction");
-    });
-    it("should throw an error if email exists", async() => {
-      sequelize.transaction = (resolve) => resolve();
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      userRepository.getUserMyAuthGoogle = jest.fn().mockResolvedValue(null);
-      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
-
-      /*
-       * UserRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-       * userRepository.createUser = jest.fn().mockResolvedValue(3);
-       * roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-       */
-      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
-        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
-      });
-      const {body} = await request.post("/api/auth/google-sign-in").send({
-        token: "aasdasd",
-      }).
-        expect(409);
-      expect(body).toMatchObject({
-        error: "Conflict",
-        statusCode: 409,
-        message: "User with this email already exist, but has no connected google account." +
-          " If this is you, please login as this user and connect this google profile in profile settings",
-      });
-    });
-  });
-
-  describe("facebook-sign-in", () => {
-    it("should login if user exists", async() => {
-      sequelize.transaction = (resolve) => resolve();
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      nodeApply = jest.fn().mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
-        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
-      configService.getConfig = jest.fn().mockReturnValue({
-        auth: {
-          facebook: {
-            accessToken: "test",
-          },
-        },
-      } as typeof config);
-      userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue({
-        id: 1,
-        user: {
-          username: "as",
-        },
-      });
-      const {body} = await request.post("/api/auth/facebook-sign-in").send({
-        token: "aasdasd",
-      }).
-        expect(201);
-      expect(body).toMatchObject({
-        session: expect.any(String),
-        isNewAccount: false,
-      });
-    });
-    it("should create a new user when email is new and user with email not exist", async() => {
-      sequelize.transaction = (resolve) => resolve("transaction");
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-
-      nodeApply = jest.fn().mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetTokenResponseFixture)}).
-        mockReturnValueOnce({json: jest.fn().mockResolvedValue(facebookGetUserResponseFixture)});
-      configService.getConfig = jest.fn().mockReturnValue({
-        auth: {
-          facebook: {
-            accessToken: "test",
-          },
-        },
-      } as typeof config);
-      userRepository.getUserMyAuthFacebook = jest.fn().mockResolvedValue(null);
-
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      userRepository.createUser = jest.fn().mockResolvedValue(3);
-      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-      const createUserSpy = jest.spyOn(userRepository, "createUser");
-      oauth2Client.verifyIdToken = jest.fn().mockResolvedValue({
-        getPayload: jest.fn().mockReturnValue(googleResponseFixture),
-      });
-      const {body} = await request.post("/api/auth/facebook-sign-in").send({
-        token: "aasdasd",
-      }).
-        expect(201);
-      expect(body).toMatchObject({
-        session: expect.any(String),
-        isNewAccount: true,
-        username: "Andrew_Koidan", // From fixture
-      });
-      expect(createUserSpy).toHaveBeenCalledWith(expect.objectContaining({
-        facebookId: "1096917160382471",
-        name: "Andrew",
-        password: expect.any(String),
-        sex: "OTHER",
-        surname: "Koidan",
-        username: "Andrew_Koidan",
-      }), "transaction");
-    });
-  });
-
-  describe("sign-up", () => {
-    it("returns session", async() => {
-      sequelize.transaction = (resolve) => resolve();
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      userRepository.createUser = jest.fn().mockResolvedValue(3);
-      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      const {body} = await request.post("/api/auth/sign-up").send({
-        username: "a",
-        password: "as$",
-      }).
-        expect(201);
-
-      expect(body).toMatchObject({session: expect.any(String)});
-    });
-    it("sends an email", async() => {
-      configService.getConfig = jest.fn().mockReturnValue({
-        ...config,
-        email: {},
-      });
-      sequelize.transaction = (resolve) => resolve();
-      verificationRepository.createVerification = jest.fn().mockResolvedValue(undefined);
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
-      userRepository.createUser = jest.fn().mockResolvedValue(3);
-      roomRepository.createRoomUser = jest.fn().mockResolvedValue(undefined);
-      mailerService.sendMail = jest.fn();
-      ipRepository.getIp = jest.fn().mockResolvedValue({
-        country: "Ukraine",
-        city: "Mariupol",
-        isp: "AZOV",
-      } as IpAddressModel);
-      const spy = jest.spyOn(mailerService, "sendMail").mockResolvedValue(true);
-      redisService.saveSession = jest.fn().mockResolvedValue(undefined);
-      const {body} = await request.post("/api/auth/sign-up").send({
-        username: "a",
-        password: "as$",
-        email: "death@gmail.com",
-      }).
-        expect(201);
-
-      expect(body).toMatchObject({session: expect.any(String)});
-      await waitForExpect(() => {
-        expect(spy).toHaveBeenCalledTimes(1);
-      }, 30); // 30ms is more than enough
-      expect(spy).toHaveBeenCalledWith(expect.objectContaining({html: expect.any(String)}));
-    });
-    it("throws an error if user exists", async() => {
-      sequelize.transaction = (resolve) => resolve();
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
-      const {body} = await request.post("/api/auth/sign-up").send({
-        username: "a",
-        password: "as$",
-      }).
-        expect(409, {
-          error: "Conflict",
-          message: "User with this username already exist",
-          statusCode: 409,
-        });
-    });
-    it("throws an error if email exists", async() => {
-      sequelize.transaction = (resolve) => resolve();
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
-      const {body} = await request.post("/api/auth/sign-up").send({
-        username: "a",
-        password: "as$",
-        email: "death@gmail.com",
-      }).
-        expect(409, {
-          error: "Conflict",
-          message: "User with this email already exist",
-          statusCode: 409,
-        });
-    });
-  });
-
-  describe("validate-email", () => {
-    it("should return ok", async() => {
-      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(false);
-      await request.post("/api/auth/validate-email").send({
-        email: "blah@gmail.com",
-      }).
-        expect(201, {ok: true});
-    });
-    it("should error if email exists", async() => {
-      userRepository.checkUserExistByEmail = jest.fn().mockResolvedValue(true);
-      await request.post("/api/auth/validate-email").send({
-        email: "exist@gmail.com",
-      }).
-        expect(409, {
-          error: "Conflict",
-          message: "User with this email already exist",
-          statusCode: 409,
-        });
-    });
-    it("should give error on invalid email", async() => {
-      await request.post("/api/auth/validate-email").send({
-        email: "invalidemail",
-      }).
-        expect(400, {
-          error: "Bad Request",
-          message: ["email must be an email"],
-          statusCode: 400,
-        });
-    });
-  });
-  describe("validate-user", () => {
-    it("should return ok", async() => {
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(false);
-      await request.post("/api/auth/validate-user").send({
-        username: "a",
-      }).
-        expect(201, {ok: true});
-    });
-    it("should error if user exists", async() => {
-      userRepository.checkUserExistByUserName = jest.fn().mockResolvedValue(true);
-      await request.post("/api/auth/validate-user").send({
-        username: "a",
-      }).
-        expect(409, {
-          error: "Conflict",
-          message: "User with this username already exist",
-          statusCode: 409,
-        });
-    });
-    it("should give error on invalid character for username", async() => {
-      await request.post("/api/auth/validate-user").send({
-        username: "%",
-      }).
-        expect(400, {
-          error: "Bad Request",
-          message: ["Username can only contain latin characters, numbers and symbols '-' '_'"],
-          statusCode: 400,
-        });
-    });
-    it("should give error on invalid and also correct ones", async() => {
-      await request.post("/api/auth/validate-user").send({
-        username: "%asfasdf",
-      }).
-        expect(400, {
-          error: "Bad Request",
-          message: ["Username can only contain latin characters, numbers and symbols '-' '_'"],
-          statusCode: 400,
-        });
-    });
-    it("should give error if username has great length", async() => {
-      await request.post("/api/auth/validate-user").send({
-        username: "1234567890123456789",
-      }).
-        expect(400, {
-          error: "Bad Request",
-          message: ["Username should be 1-16 characters"],
-          statusCode: 400,
-        });
+      healthRepository.getTables = jest.fn().mockResolvedValue(["user", "message", "migration"]);
+      (sequelize.models as any) = {user: 1,
+        message: 2};
+      await request.get("/api/health").send().
+        expect(200, {tables: 3});
     });
   });
 });
diff --git a/newback/src/modules/api/health/health.service.ts b/newback/src/modules/api/health/health.service.ts
index 23bc17a89..0faee0842 100644
--- a/newback/src/modules/api/health/health.service.ts
+++ b/newback/src/modules/api/health/health.service.ts
@@ -22,7 +22,7 @@ export class HealthService {
     // +1 is a migration table
     if (tables.length !== numberOfModels + 1) {
       throw new InternalServerErrorException(
-        `Database migration is not finished. Expected ${numberOfModels} tables, but found ${tables.length}`
+        `Database migration is not finished. Expected ${numberOfModels + 1} tables, but found ${tables.length}`
       );
     }
     return {
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.spec.ts b/newback/src/modules/shared/pubsub/pubsub.module.e2e.spec.ts
similarity index 100%
rename from newback/src/modules/shared/pubsub/pubsub.service.spec.ts
rename to newback/src/modules/shared/pubsub/pubsub.module.e2e.spec.ts

From ca437f80d6e34691daf79c3b83332b4ff1afc0bb Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 19 May 2022 11:13:12 +0300
Subject: [PATCH 112/221] fix

---
 newback/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newback/tsconfig.json b/newback/tsconfig.json
index 218423989..1c4912571 100644
--- a/newback/tsconfig.json
+++ b/newback/tsconfig.json
@@ -1,7 +1,7 @@
 {
  "exclude": [
     "node_modules",
-//    "**/*.spec.ts",
+//    "**/*.spec.ts", // otherwise eslintdoesn't work for this files
     "dist"
   ],
 //  "ts-node": {

From 05750a11f562a439b37b94780f6798dc14732ad6 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 19 May 2022 19:11:08 +0300
Subject: [PATCH 113/221] Removed underscores_in_headers Refactored http api on
 frontend

---
 common/src/helpers.ts                         |  25 --
 common/src/http/auth/facebook.auth.ts         |   3 -
 common/src/http/auth/facebook.sign.in.ts      |   4 +
 common/src/http/auth/google.auth.ts           |   3 -
 common/src/http/auth/google.sign.in.ts        |   4 +
 common/src/legacy.ts                          |   5 +-
 docker/nginx.conf                             |   1 -
 frontend/src/ts/classes/Fetch.ts              |  54 ++--
 .../src/ts/classes/NotificationHandler.ts     |  24 +-
 frontend/src/ts/instances/routerInstance.ts   |  26 +-
 frontend/src/ts/instances/sessionInstance.ts  |   4 -
 frontend/src/ts/main.ts                       |  11 +-
 frontend/src/ts/message_handlers/Api.ts       | 276 ++----------------
 .../ts/message_handlers/WsMessageHandler.ts   |   2 +-
 .../message_handlers/http_modules/AuthApi.ts  |  78 +++++
 .../message_handlers/http_modules/FileApi.ts  |  27 ++
 .../message_handlers/http_modules/GiphyApi.ts |  49 ++++
 .../ts/message_handlers/http_modules/JsApi.ts |  37 +++
 .../message_handlers/http_modules/RestApi.ts  |  95 ++++++
 .../http_modules/VerifyApi.ts                 |  59 ++++
 frontend/src/ts/types/env.d.ts                |   2 -
 frontend/src/vue/auth/ApplyResetPassword.vue  |   4 +-
 frontend/src/vue/auth/AuthPage.vue            |   2 +-
 frontend/src/vue/auth/CaptchaComponent.vue    |   2 +-
 frontend/src/vue/auth/FacebookAuth.vue        |   2 +-
 frontend/src/vue/auth/GoogleAuth.vue          |   2 +-
 frontend/src/vue/auth/ResetPassword.vue       |   2 +-
 frontend/src/vue/auth/SignIn.vue              |   4 +-
 frontend/src/vue/auth/SignUp.vue              |  18 +-
 frontend/src/vue/auth/SocialAuthSignUp.vue    |   5 +-
 .../src/vue/chat/textarea/GiphySearch.vue     |   4 +-
 frontend/src/vue/pages/ConfirmMail.vue        |   2 +-
 frontend/src/vue/pages/EmailChanged.vue       |   2 +-
 .../src/vue/pages/UserProfileChangeEmail.vue  |   2 +-
 .../vue/pages/UserProfileChangePassword.vue   |   2 +-
 frontend/src/vue/pages/UserProfileImage.vue   |   2 +-
 frontend/src/vue/pages/UserProfileInfo.vue    |   2 +-
 .../vue/pages/UserProfileOauthSettings.vue    |  10 +-
 frontend/src/vue/pages/ViewProfilePage.vue    |   2 +-
 kubernetes/nginx.conf                         |   3 -
 newback/src/modules/api/auth/auth.service.ts  |  22 +-
 .../facebook.auth.request.validator.ts        |   5 +-
 .../google.auth.reques.validator.ts           |   4 +-
 .../modules/shared/pubsub/pubsub.service.ts   |   9 -
 rootfs/etc/nginx/sites-enabled/pychat.conf    |   1 -
 45 files changed, 495 insertions(+), 407 deletions(-)
 delete mode 100644 common/src/http/auth/facebook.auth.ts
 delete mode 100644 common/src/http/auth/google.auth.ts
 delete mode 100644 frontend/src/ts/instances/sessionInstance.ts
 create mode 100644 frontend/src/ts/message_handlers/http_modules/AuthApi.ts
 create mode 100644 frontend/src/ts/message_handlers/http_modules/FileApi.ts
 create mode 100644 frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
 create mode 100644 frontend/src/ts/message_handlers/http_modules/JsApi.ts
 create mode 100644 frontend/src/ts/message_handlers/http_modules/RestApi.ts
 create mode 100644 frontend/src/ts/message_handlers/http_modules/VerifyApi.ts

diff --git a/common/src/helpers.ts b/common/src/helpers.ts
index 9ce47a576..1db920a84 100644
--- a/common/src/helpers.ts
+++ b/common/src/helpers.ts
@@ -1,28 +1,3 @@
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
-import {Gender} from "@common/model/enum/gender";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {
-  SignInRequest,
-  SignInResponse,
-} from "@common/http/auth/sign.in";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {AcceptTokenRequest} from "@common/http/verify/accept.token";
-import {
-  ValidateEmailResponse,
-  ValidateUserEmailRequest,
-} from "@common/http/auth/validte.email";
-import {
-  ValidateUserRequest,
-  ValidateUserResponse,
-} from "@common/http/auth/validate.user";
-
-
 export interface CaptchaRequest {
   captcha?: string;
 }
diff --git a/common/src/http/auth/facebook.auth.ts b/common/src/http/auth/facebook.auth.ts
deleted file mode 100644
index a91fc83e6..000000000
--- a/common/src/http/auth/facebook.auth.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface FaceBookAuthRequest {
-  token: string;
-}
diff --git a/common/src/http/auth/facebook.sign.in.ts b/common/src/http/auth/facebook.sign.in.ts
index 811bd1fde..fb09c81ef 100644
--- a/common/src/http/auth/facebook.sign.in.ts
+++ b/common/src/http/auth/facebook.sign.in.ts
@@ -1,3 +1,7 @@
 import type {OauthSessionResponse} from "@common/helpers";
 
 export type FacebookSignInResponse = OauthSessionResponse;
+
+export interface FaceBookSignInRequest {
+  token: string;
+}
diff --git a/common/src/http/auth/google.auth.ts b/common/src/http/auth/google.auth.ts
deleted file mode 100644
index 8bb405f02..000000000
--- a/common/src/http/auth/google.auth.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface GoogleAuthRequest {
-  token: string;
-}
diff --git a/common/src/http/auth/google.sign.in.ts b/common/src/http/auth/google.sign.in.ts
index 09efe2771..c57b69652 100644
--- a/common/src/http/auth/google.sign.in.ts
+++ b/common/src/http/auth/google.sign.in.ts
@@ -1,3 +1,7 @@
 import type {OauthSessionResponse} from "@common/helpers";
 
 export type GoogleSignInResponse = OauthSessionResponse;
+
+export interface GoogleSignInRequest {
+  token: string;
+}
diff --git a/common/src/legacy.ts b/common/src/legacy.ts
index 5f354c98d..990e79bac 100644
--- a/common/src/legacy.ts
+++ b/common/src/legacy.ts
@@ -10,10 +10,7 @@ import type {
   RoomDto,
   RoomNoUsersDto,
 } from "@common/model/dto/room.dto";
-import type {
-  UserProfileDto,
-  UserProfileDtoWoImage,
-} from "@common/model/dto/user.profile.dto";
+import type {UserProfileDtoWoImage,} from "@common/model/dto/user.profile.dto";
 import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 
 
diff --git a/docker/nginx.conf b/docker/nginx.conf
index 7c95f9b39..9ef7a44e0 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -36,7 +36,6 @@ http  {
 
         ssl_certificate /etc/nginx/ssl/certificate.crt;
         ssl_certificate_key  /etc/nginx/ssl/server.key;
-        underscores_in_headers on;
 
         location ~ "^/photo/(?<filepath>\w{8}_(?<filename>.*))$"  {
             add_header Content-Disposition 'inline; filename="$filename"';
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index a0adb16a5..9c8740d45 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -1,20 +1,22 @@
-import type {
-  PostData,
+import type {PostData,
   SessionHolder,
-} from "@/ts/types/types";
-import {UploadData} from "@/ts/types/types";
+  UploadData} from "@/ts/types/types";
 import {XHR_API_URL} from "@/ts/utils/runtimeConsts";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
+import {CONNECTION_ERROR} from "@/ts/utils/consts";
 
 export default class Fetch {
   protected httpLogger: Logger;
 
-  protected sessionHolder: SessionHolder;
+  protected getHeaders: () => Record<string, string>;
 
-  public constructor(sessionHolder: SessionHolder) {
-    this.sessionHolder = sessionHolder;
+  private readonly url: string;
+
+  public constructor(url: string, getHeaders: () => Record<string, string>) {
     this.httpLogger = loggerFactory.getLogger("http");
+    this.url = url;
+    this.getHeaders = getHeaders;
   }
 
   public async doGet<T>(url: string, onSetAbortFunction?: (c: () => void) => void): Promise<T> {
@@ -52,9 +54,8 @@ export default class Fetch {
     return new Promise((resolve, reject) => {
       const r = new XMLHttpRequest();
       r.addEventListener("load", () => {
-        let {response} = r;
         try {
-          response = JSON.parse(r.response);
+          let response = JSON.parse(r.response);
           if (r.status < 200 || r.status >= 300) {
             this.processException(response);
           } else {
@@ -65,10 +66,9 @@ export default class Fetch {
           reject(e);
           return;
         }
-        resolve(response);
       });
       r.addEventListener("error", () => {
-        reject("Network Error");
+        reject(CONNECTION_ERROR);
       });
       if (onSetAbortFunction) {
         onSetAbortFunction(() => {
@@ -82,8 +82,10 @@ export default class Fetch {
           }
         });
       }
-      r.open("POST", `${XHR_API_URL}${url}`);
-      r.setRequestHeader("session-id", this.sessionHolder.session!);
+      r.open("POST", `${this.url}${url}`);
+      Object.entries(this.getHeaders()).forEach(([k, v]) => {
+        r.setRequestHeader(k, v);
+      });
       const form = new FormData();
       Object.entries(data).forEach(([key, value]) => {
         form.append(key, value);
@@ -92,20 +94,6 @@ export default class Fetch {
     });
   }
 
-  public async loadJs(fullFileUrlWithProtocol: string): Promise<Event> {
-    return new Promise((resolve, reject) => {
-      this.httpLogger.log("GET out {}", fullFileUrlWithProtocol)();
-      const fileRef = document.createElement("script");
-      fileRef.setAttribute("type", "text/javascript");
-      fileRef.setAttribute("src", fullFileUrlWithProtocol);
-
-      document.getElementsByTagName("head")[0].appendChild(fileRef);
-      fileRef.onload = resolve;
-      fileRef.onerror = reject;
-    });
-  }
-
-  // @ts-expect-error TS2366
   private async processResponse<T>(response: Response): Promise<T> {
     const body = await response.json();
     if (response.ok) {
@@ -114,7 +102,7 @@ export default class Fetch {
     this.processException(body);
   }
 
-  private processException(body: any) {
+  private processException(body: any): never {
     if (typeof body?.message === "string") {
       throw Error(body.message);
     } else if (body?.message?.length && typeof body.message[0] === "string") {
@@ -135,14 +123,12 @@ export default class Fetch {
         controller.abort();
       });
     }
-    const is3rdPartyApi = (/^https?:\/\//u).test(url);
-    const fetchUrl = is3rdPartyApi ? url : `${XHR_API_URL}${url}`;
-    if (!is3rdPartyApi) {
-      headers["session-id"] = this.sessionHolder.session!;
-    }
+    Object.entries(this.getHeaders()).forEach(([k, v]) => {
+      headers[k] = v;
+    });
     return {
       signal,
-      fetchUrl,
+      fetchUrl: `${this.url}${url}`,
       headers,
     };
   }
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index f89f5f50d..23381f1ee 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -1,4 +1,4 @@
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {extractError} from "@/ts/utils/pureFunctions";
@@ -6,6 +6,7 @@ import type Api from "@/ts/message_handlers/Api";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {
+  CONNECTION_ERROR,
   GIT_HASH,
   IS_DEBUG,
   SERVICE_WORKER_URL,
@@ -15,6 +16,10 @@ import {
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {MainWindow} from "@/ts/classes/MainWindow";
 import type Subscription from "@/ts/classes/Subscription";
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 
 
 export default class NotifierHandler extends MessageHandler {
@@ -28,6 +33,7 @@ export default class NotifierHandler extends MessageHandler {
 
   private readonly popedNotifQueue: Notification[] = [];
 
+  private retryFcm: Function | null = null;
 
   /* This is required to know if this tab is the only one and don't spam with same notification for each tab*/
   private serviceWorkedTried = false;
@@ -75,6 +81,9 @@ export default class NotifierHandler extends MessageHandler {
     if (!this.serviceWorkedTried) {
       await this.tryAgainRegisterServiceWorker();
     }
+    if (this.retryFcm) {
+      this.retryFcm();
+    }
   }
 
   public replaceIfMultiple(data: {title: string; options: NotificationOptions}) {
@@ -246,7 +255,18 @@ export default class NotifierHandler extends MessageHandler {
 
     if (subscription.endpoint && subscription.endpoint.startsWith("https://fcm.googleapis.com/fcm/send")) {
       const registrationId = subscription.endpoint.split("/").pop();
-      await this.api.registerFCB(registrationId, this.browserVersion, this.isMobile);
+      this.retryFcm = async() => {
+        try {
+          await this.api.restApi.registerFCM(registrationId, this.browserVersion, this.isMobile);
+          this.retryFcm = null;
+        } catch (e) {
+          if (e !== CONNECTION_ERROR) {
+            this.retryFcm = null;
+          }
+          throw e;
+        }
+      };
+      this.retryFcm();
       this.logger.log("Saved subscription to server")();
     } else {
       this.logger.warn("Unsupported subscription type {}", subscription.endpoint)();
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index ce42bfab2..77553dfd5 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -1,11 +1,10 @@
-import {LoginMessage} from "@/ts/types/messages/inner/login";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import type {LoginMessageBody} from "@/ts/types/messages/inner/login";
+import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import type {RouterNavigateMessageBody} from "@/ts/types/messages/inner/router.navigate";
 import {
   createRouter,
   createWebHashHistory,
 } from "vue-router";
-import sessionHolder from "@/ts/instances/sessionInstance";
 import {store} from "@/ts/instances/storeInstance";
 import MainPage from "@/vue/pages/MainPage.vue";
 import ChannelsPage from "@/vue/pages/ChannelsPage.vue";
@@ -39,9 +38,14 @@ import PainterPage from "@/vue/pages/PainterPage.vue";
 import RoomUsersListPage from "@/vue/pages/RoomUsersListPage.vue";
 import ChannelAddRoom from "@/vue/pages/ChannelAddRoom.vue";
 import type Subscription from "@/ts/classes/Subscription";
+import type {SessionHolder} from "@/ts/types/types";
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 
 
-export function routerFactory(sub: Subscription) {
+export function routerFactory(sub: Subscription, sessionHolder: SessionHolder) {
   const logger: Logger = loggerFactory.getLogger("router");
   const router = createRouter({
     history: createWebHashHistory(), // Seems like createWebHistory is really hard for sw to detect what to cache, so use this one
@@ -195,23 +199,23 @@ export function routerFactory(sub: Subscription) {
   sub.subscribe("router", new class RouterProcessor extends MessageHandler {
     protected readonly logger: Logger = logger;
 
-    protected readonly handlers: HandlerTypes<keyof RouterProcessor, "router"> = {
-      login: <HandlerType<"login", "router">> this.login,
-      logout: <HandlerType<"logout", "router">> this.logout,
-      navigate: <HandlerType<"navigate", "router">> this.navigate,
+    protected readonly handlers: HandlerTypes<keyof RouterProcessor, "router", any> = {
+      login: <HandlerType<"login", "router", LoginMessageBody>> this.login,
+      logout: <HandlerType<"logout", "router", {}>> this.logout,
+      navigate: <HandlerType<"navigate", "router", RouterNavigateMessageBody>> this.navigate,
     };
 
     logout(a: LogoutMessage) {
       router.replace("/auth/sign-in");
     }
 
-    navigate(a: RouterNavigateMessage) {
+    navigate(a: RouterNavigateMessageBody) {
       if (router.currentRoute.value.path !== a.to) {
         router.replace(a.to);
       }
     }
 
-    login(a: LoginMessage) {
+    login(a: LoginMessageBody) {
       if (!a.session) {
         throw Error(`Invalid session ${a.session}`);
       }
diff --git a/frontend/src/ts/instances/sessionInstance.ts b/frontend/src/ts/instances/sessionInstance.ts
deleted file mode 100644
index 88d77d81b..000000000
--- a/frontend/src/ts/instances/sessionInstance.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type {SessionHolder} from "@/ts/types/types";
-import {SessionHolderImpl} from "@/ts/classes/SessionHolderImpl";
-
-export default new SessionHolderImpl() as SessionHolder;
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index 44488f77d..ba1f77a6e 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -14,7 +14,6 @@ import {createApp} from "vue";
 import {store} from "@/ts/instances/storeInstance";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import sessionHolder from "@/ts/instances/sessionInstance";
 import type {App as VueApp} from "@vue/runtime-core";
 import type {PlatformUtil} from "@/ts/types/model";
 import "@/assets/icon.png"; // eslint-disable-line import/no-unassigned-import
@@ -41,7 +40,8 @@ import {
 } from "@/ts/utils/directives";
 import Subscription from "@/ts/classes/Subscription";
 import type {Router} from "vue-router";
-import Fetch from '@/ts/classes/Fetch';
+import {SessionHolderImpl} from "@/ts/classes/SessionHolderImpl";
+import {SessionHolder} from "@/ts/types/types";
 
 
 const logger: Logger = loggerFactory.getLoggerColor("main", "#007a70");
@@ -111,9 +111,9 @@ function init(): void {
     event.preventDefault();
   });
 
+  const sessionHolder: SessionHolder = new SessionHolderImpl();
   const sub = new Subscription();
-  const xhr: Fetch = new Fetch(sessionHolder);
-  const api: Api = new Api(xhr, sub);
+  const api: Api = new Api(sessionHolder);
 
   let storage;
   try {
@@ -135,7 +135,7 @@ function init(): void {
   const webrtcApi: WebRtcApi = new WebRtcApi(ws, store, notifier, messageHelper, sub);
   const platformUtil: PlatformUtil = constants.IS_ANDROID ? new AndroidPlatformUtil() : new WebPlatformUtils();
   const messageSenderProxy: MessageSenderProxy = new MessageSenderProxy(store, webrtcApi, wsMessageHandler);
-  const router = routerFactory(sub);
+  const router = routerFactory(sub, sessionHolder);
   const vue = bootstrapVue(sub, api, ws, webrtcApi, platformUtil, messageSenderProxy, smileyApi, router);
 
   vue.mount(document.body);
@@ -154,7 +154,6 @@ function init(): void {
     window.roomHandler = roomHandler;
     window.ws = ws;
     window.api = api;
-    window.xhr = xhr;
     window.storage = storage;
     window.webrtcApi = webrtcApi;
     window.sub = sub;
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 382ac82c9..c0c210123 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -1,265 +1,39 @@
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {SignInRequest,} from "@common/http/auth/sign.in";
-import {VerifyTokenResponse} from '@common/http/verify/verify.token';
-import {ConfirmEmailResponse} from '@common/http/verify/confirm.email';
-import {AcceptTokenResponse} from '@common/http/verify/accept.token';
+import Fetch from "@/ts/classes/Fetch";
+import AuthApi from "@/ts/message_handlers/http_modules/AuthApi";
+import type {SessionHolder} from "@/ts/types/types";
+import {XHR_API_URL} from "@/ts/utils/runtimeConsts";
+import VerifyApi from "@/ts/message_handlers/http_modules/VerifyApi";
+import FileApi from "@/ts/message_handlers/http_modules/FileApi";
+import RestApi from "@/ts/message_handlers/http_modules/RestApi";
+import JsApi from "@/ts/message_handlers/http_modules/JsApi";
+import GiphyApi from "@/ts/message_handlers/http_modules/GiphyApi";
 import {
-  SaveFileRequest,
-  SaveFileResponse
-} from '@common/http/file/save.file';
-import {
-  CONNECTION_ERROR,
   GIPHY_API_KEY,
   GIPHY_URL,
 } from "@/ts/utils/consts";
 
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
-import loggerFactory from "@/ts/instances/loggerFactory";
-import type {Logger} from "lines-logger";
-
-
-import type {MultiResponse} from "giphy-api";
-import type Subscription from "@/ts/classes/Subscription";
-import type Fetch from "@/ts/classes/Fetch";
-
-import {
-  OauthStatus,
-  ViewUserProfileDto
-} from "@/ts/types/dto";
-
-export default class Api extends MessageHandler {
-  protected readonly handlers: HandlerTypes<keyof Api, "*"> = {
-    internetAppear: <HandlerType<"internetAppear", "*">> this.internetAppear,
-  };
+export default class Api {
+  public readonly authApi: AuthApi;
 
-  protected readonly logger: Logger;
+  public readonly verifyApi: VerifyApi;
 
-  private readonly fetch: Fetch;
+  public readonly fileApi: FileApi;
 
-  private retryFcb: Function | null = null;
+  public readonly restApi: RestApi;
 
-  public constructor(fetch: Fetch, sub: Subscription) {
-    super();
-    sub.subscribe("*", this);
-    this.logger = loggerFactory.getLogger("api");
-    this.fetch = fetch;
-  }
+  public readonly jsApi: JsApi;
 
-  public async signIn(body: SignInRequest): Promise<SessionResponse> {
-    return this.fetch.doPost<SessionResponse>({
-      url: "/auth/sign-in",
-      params: {...body},
-    });
-  }
+  public readonly giphyApi: GiphyApi;
 
-  public async changePassword(old_password: string, password: string): Promise<void> {
-    return this.fetch.doPost<void>({
-      url: "/change_password",
-      params: {
-        old_password,
-        password,
-      },
+  public constructor(sessionHolder: SessionHolder) {
+    const getHeaders = (): Record<string, string> => ({
+      "session-id": sessionHolder.session!,
     });
-  }
-
-  public async logout(registration_id: string | null = null): Promise<void> {
-    await this.fetch.doPost({
-      url: "/logout",
-      params: {registration_id},
-    });
-  }
-
-  public async sendRestorePassword(params: SendRestorePasswordRequest): Promise<OkResponse> {
-    return this.fetch.doPost<OkResponse>({
-      url: "/verify/send-restore-password",
-      params: params as any,
-    });
-  }
-
-  public async signUp(data: SignUpRequest): Promise<SignUpResponse> {
-    return this.fetch.doPost<SessionResponse>({
-      url: "/auth/sign-up",
-      params: data as any,
-    });
-  }
-
-  public async searchGiphys(
-    text: string,
-    offset: number,
-    limit: number,
-    onSetAbortFunction: (c: () => void) => void,
-  ): Promise<MultiResponse> {
-    let response!: MultiResponse;
-    if ((/^\s*$/).exec(text)) {
-      // https://developers.giphy.com/docs/api/endpoint#trending
-      response = await this.fetch.doGet<MultiResponse>(
-        `${GIPHY_URL}/gifs/trending?api_key=${GIPHY_API_KEY}&limit=${limit}&offset=${offset}`,
-        onSetAbortFunction,
-      );
-    } else {
-      // https://developers.giphy.com/docs/api/endpoint#search
-      response = await this.fetch.doGet<MultiResponse>(
-        `${GIPHY_URL}/gifs/search?api_key=${GIPHY_API_KEY}&limit=12&q=${encodeURIComponent(text)}&offset=${offset}`,
-        onSetAbortFunction,
-      );
-    }
-
-    if (response?.meta?.msg === "OK") {
-      return response;
-    }
-    throw Error(`Invalid giphy response ${response?.meta?.msg}`);
-  }
-
-  public async getOauthStatus(): Promise<OauthStatus> {
-    return this.fetch.doGet<OauthStatus>("/oauth_status");
-  }
-
-  public async setGoogleOauth(token: string): Promise<void> {
-    return this.fetch.doPost<void>({
-      url: "/set_google_oauth",
-      params: {token},
-    });
-  }
-
-  public async setFacebookOauth(token: string): Promise<void> {
-    return this.fetch.doPost<void>({
-      url: "/set_facebook_oauth",
-      params: {token},
-    });
-  }
-
-  public async googleAuth(token: string): Promise<GoogleSignInResponse> {
-    return this.fetch.doPost<OauthSessionResponse>({
-      url: "/auth/google-sign-in",
-      params: {
-        token,
-      },
-    });
-  }
-
-  public async facebookAuth(token: string): Promise<OauthSessionResponse> {
-    return this.fetch.doPost<OauthSessionResponse>({
-      url: "/auth/facebook-sign-in",
-      params: {
-        token,
-      },
-    });
-  }
-
-  public async loadGoogle(): Promise<void> {
-    await this.fetch.loadJs("https://apis.google.com/js/platform.js");
-  }
-
-  public async loadFacebook(): Promise<void> {
-    await this.fetch.loadJs("https://connect.facebook.net/en_US/sdk.js");
-  }
-
-  public async loadRecaptcha(callbackId: string): Promise<void> {
-    await this.fetch.loadJs(`https://www.google.com/recaptcha/api.js?render=explicit&onload=${callbackId}`);
-  }
-
-  public async registerFCB(registration_id: string, agent: string, is_mobile: boolean): Promise<void> {
-    try {
-      await this.fetch.doPost({
-        url: "/register_fcb",
-        params: {
-          registration_id,
-          agent,
-          is_mobile,
-        },
-      });
-      return;
-    } catch (e) {
-      if (e === CONNECTION_ERROR) {
-        this.retryFcb = () => {
-          this.registerFCB(registration_id, agent, is_mobile);
-        };
-      } else {
-        this.retryFcb = null;
-      }
-      throw e;
-    }
-  }
-
-  public async validateUsername(username: string, onSetAbortFunction: (c: () => void) => void): Promise<ValidateUserResponse> {
-    return this.fetch.doPost({
-      url: "/auth/validate-user",
-      params: {username},
-      onSetAbortFunction,
-    });
-  }
-
-  public async uploadProfileImage(file: Blob): Promise<void> {
-    await this.fetch.upload<void>({
-      url:"/upload_profile_image",
-      data: {file}
-    });
-  }
-
-  public async showProfile(id: number): Promise<ViewUserProfileDto> {
-    return this.fetch.doGet<ViewUserProfileDto>(`/profile?id=${id}`);
-  }
-
-  public async changeEmail(token: string): Promise<string> {
-    return this.fetch.doGet<string>(`/change_email?token=${token}`);
-  }
-
-  public async changeEmailLogin(email: string, password: string): Promise<void> {
-    return this.fetch.doPost({
-      url: "/change_email_login",
-      params: {
-        email,
-        password,
-      },
-    });
-  }
-
-  public async confirmEmail(params: ConfirmEmailRequest): Promise<ConfirmEmailResponse> {
-    return this.fetch.doPost({
-      url: "/verify/confirm-email",
-      params,
-    });
-  }
-
-  public async uploadFile(data: SaveFileRequest, onProgress: (i: number) => void, onSetAbortFunction: (e: () => void) => void): Promise<SaveFileResponse> {
-    return this.fetch.upload<SaveFileResponse>({
-      url: "/file/upload-file",
-      data,
-      onSetAbortFunction,
-      onProgress,
-    });
-  }
-
-  public async validateEmail(params: ValidateUserEmailRequest, onSetAbortFunction: (c: () => void) => void): Promise<ValidateEmailResponse> {
-    return this.fetch.doPost({
-      url: "/auth/validate-email",
-      params,
-      onSetAbortFunction,
-    });
-  }
-
-  public async verifyToken(params: VerifyTokenRequest): Promise<VerifyTokenResponse> {
-    return this.fetch.doPost<VerifyTokenResponse>({
-      url: "/verify/verify-token",
-      params,
-    });
-  }
-
-  public async acceptToken(params: AcceptTokenRequest): Promise<AcceptTokenResponse> {
-    return this.fetch.doPost({
-      url: "/verify/accept-token",
-      params,
-    });
-  }
-
-  public internetAppear(m: InternetAppearMessage): void {
-    if (this.retryFcb) {
-      this.retryFcb();
-    }
+    this.authApi = new AuthApi(new Fetch(`${XHR_API_URL}/auth`, getHeaders));
+    this.verifyApi = new VerifyApi(new Fetch(`${XHR_API_URL}/verify`, getHeaders));
+    this.fileApi = new FileApi(new Fetch(`${XHR_API_URL}/file`, getHeaders));
+    this.restApi = new RestApi(new Fetch(XHR_API_URL, getHeaders));
+    this.giphyApi = new GiphyApi(new Fetch(`${GIPHY_URL}/gifs`, () => ({})), GIPHY_API_KEY);
+    this.jsApi = new JsApi();
   }
 }
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 3a7e5fd72..f44684d3d 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -242,7 +242,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     try {
       let total = 0;
       for (let i = 0; i < files.length; i++) {
-        const res: SaveFileResponse = await this.api.uploadFile(
+        const res: SaveFileResponse = await this.api.fileApi.uploadFile(
           files[i],
           (uploaded) => {
             const payload: SetMessageProgress = {
diff --git a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
new file mode 100644
index 000000000..5ac897a7f
--- /dev/null
+++ b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
@@ -0,0 +1,78 @@
+import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {
+  SignUpRequest,
+  SignUpResponse,
+} from "@common/http/auth/sign.up";
+import type {SignInRequest} from "@common/http/auth/sign.in";
+import loggerFactory from "@/ts/instances/loggerFactory";
+import type {Logger} from "lines-logger";
+import type Fetch from "@/ts/classes/Fetch";
+import type {SessionResponse} from "@common/helpers";
+import type {
+  FaceBookSignInRequest,
+  FacebookSignInResponse,
+} from "@common/http/auth/facebook.sign.in";
+import type {
+  ValidateEmailResponse,
+  ValidateUserEmailRequest,
+} from "@common/http/auth/validte.email";
+import type {
+  ValidateUserRequest,
+  ValidateUserResponse,
+} from "@common/http/auth/validate.user";
+import {GoogleSignInRequest} from "@common/http/auth/google.sign.in";
+
+export default class AuthApi {
+  protected readonly logger: Logger;
+
+  private readonly fetch: Fetch;
+
+  public constructor(fetch: Fetch) {
+    this.logger = loggerFactory.getLogger("api");
+    this.fetch = fetch;
+  }
+
+  public async signIn(body: SignInRequest): Promise<SessionResponse> {
+    return this.fetch.doPost<SessionResponse>({
+      url: "/sign-in",
+      params: {...body},
+    });
+  }
+
+  public async signUp(data: SignUpRequest): Promise<SignUpResponse> {
+    return this.fetch.doPost<SessionResponse>({
+      url: "/sign-up",
+      params: data as any,
+    });
+  }
+
+  public async validateUsername(params: ValidateUserRequest, onSetAbortFunction: (c: () => void) => void): Promise<ValidateUserResponse> {
+    return this.fetch.doPost<ValidateUserResponse>({
+      url: "/validate-user",
+      params,
+      onSetAbortFunction,
+    });
+  }
+
+  public async googleAuth(params: GoogleSignInRequest): Promise<GoogleSignInResponse> {
+    return this.fetch.doPost<GoogleSignInResponse>({
+      url: "/google-sign-in",
+      params,
+    });
+  }
+
+  public async facebookAuth(params: FaceBookSignInRequest): Promise<FacebookSignInResponse> {
+    return this.fetch.doPost<FacebookSignInResponse>({
+      url: "/facebook-sign-in",
+      params,
+    });
+  }
+
+  public async validateEmail(params: ValidateUserEmailRequest, onSetAbortFunction: (c: () => void) => void): Promise<ValidateEmailResponse> {
+    return this.fetch.doPost({
+      url: "/validate-email",
+      params,
+      onSetAbortFunction,
+    });
+  }
+}
diff --git a/frontend/src/ts/message_handlers/http_modules/FileApi.ts b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
new file mode 100644
index 000000000..5d8d81a03
--- /dev/null
+++ b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
@@ -0,0 +1,27 @@
+import loggerFactory from "@/ts/instances/loggerFactory";
+import type {Logger} from "lines-logger";
+import type Fetch from "@/ts/classes/Fetch";
+import type {
+  SaveFileRequest,
+  SaveFileResponse,
+} from "@common/http/file/save.file";
+
+export default class FileApi {
+  protected readonly logger: Logger;
+
+  private readonly fetch: Fetch;
+
+  public constructor(fetch: Fetch) {
+    this.logger = loggerFactory.getLogger("api");
+    this.fetch = fetch;
+  }
+
+  public async uploadFile(data: SaveFileRequest, onProgress: (i: number) => void, onSetAbortFunction: (e: () => void) => void): Promise<SaveFileResponse> {
+    return this.fetch.upload<SaveFileResponse>({
+      url: "/upload-file",
+      data,
+      onSetAbortFunction,
+      onProgress,
+    });
+  }
+}
diff --git a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
new file mode 100644
index 000000000..46b0b7d8f
--- /dev/null
+++ b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
@@ -0,0 +1,49 @@
+import loggerFactory from "@/ts/instances/loggerFactory";
+import type {Logger} from "lines-logger";
+import type {MultiResponse} from "giphy-api";
+import {
+  GIPHY_API_KEY,
+  GIPHY_URL,
+} from "@/ts/utils/consts";
+import type Fetch from "@/ts/classes/Fetch";
+
+export default class GiphyApi {
+  protected readonly logger: Logger;
+  private fetch: Fetch;
+  private apiKey: string;
+
+  public constructor(fetch: Fetch, apiKey: string) {
+    this.fetch = fetch;
+    this.apiKey = apiKey;
+    this.logger = loggerFactory.getLogger("api");
+  }
+
+  public async searchGiphys(
+    text: string,
+    offset: number,
+    limit: number,
+    onSetAbortFunction: (c: () => void) => void,
+  ): Promise<MultiResponse> {
+    let response!: MultiResponse;
+    if ((/^\s*$/).exec(text)) {
+      // https://developers.giphy.com/docs/api/endpoint#trending
+      response = await this.fetch.doGet<MultiResponse>(
+        `/trending?api_key=${this.apiKey}&limit=${limit}&offset=${offset}`,
+        onSetAbortFunction,
+      );
+    } else {
+      // https://developers.giphy.com/docs/api/endpoint#search
+      response = await this.fetch.doGet<MultiResponse>(
+        `/search?api_key=${this.apiKey}&limit=12&q=${encodeURIComponent(text)}&offset=${offset}`,
+        onSetAbortFunction,
+      );
+    }
+
+    if (response?.meta?.msg === "OK") {
+      return response;
+    }
+    throw Error(`Invalid giphy response ${response?.meta?.msg}`);
+  }
+}
+
+
diff --git a/frontend/src/ts/message_handlers/http_modules/JsApi.ts b/frontend/src/ts/message_handlers/http_modules/JsApi.ts
new file mode 100644
index 000000000..3d9c8f330
--- /dev/null
+++ b/frontend/src/ts/message_handlers/http_modules/JsApi.ts
@@ -0,0 +1,37 @@
+import loggerFactory from "@/ts/instances/loggerFactory";
+import type {Logger} from "lines-logger";
+
+export default class JsApi {
+  protected readonly logger: Logger;
+
+  public constructor() {
+    this.logger = loggerFactory.getLogger("api");
+  }
+
+  public async loadGoogle(): Promise<void> {
+    await this.loadJs("https://apis.google.com/js/platform.js");
+  }
+
+  public async loadFacebook(): Promise<void> {
+    await this.loadJs("https://connect.facebook.net/en_US/sdk.js");
+  }
+
+  public async loadRecaptcha(callbackId: string): Promise<void> {
+    await this.loadJs(`https://www.google.com/recaptcha/api.js?render=explicit&onload=${callbackId}`);
+  }
+
+  public async loadJs(fullFileUrlWithProtocol: string): Promise<Event> {
+    return new Promise((resolve, reject) => {
+      this.logger.log("GET out {}", fullFileUrlWithProtocol)();
+      const fileRef = document.createElement("script");
+      fileRef.setAttribute("type", "text/javascript");
+      fileRef.setAttribute("src", fullFileUrlWithProtocol);
+
+      document.getElementsByTagName("head")[0].appendChild(fileRef);
+      fileRef.onload = resolve;
+      fileRef.onerror = reject;
+    });
+  }
+}
+
+
diff --git a/frontend/src/ts/message_handlers/http_modules/RestApi.ts b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
new file mode 100644
index 000000000..8ccb4ee0c
--- /dev/null
+++ b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
@@ -0,0 +1,95 @@
+import loggerFactory from "@/ts/instances/loggerFactory";
+import type {Logger} from "lines-logger";
+import type Fetch from "@/ts/classes/Fetch";
+import type {MultiResponse} from "giphy-api";
+import {
+  GIPHY_API_KEY,
+  GIPHY_URL,
+} from "@/ts/utils/consts";
+import type {
+  OauthStatus,
+  ViewUserProfileDto,
+} from "@/ts/types/dto";
+
+export default class RestApi {
+  protected readonly logger: Logger;
+
+  private readonly fetch: Fetch;
+
+  public constructor(fetch: Fetch) {
+    this.logger = loggerFactory.getLogger("api");
+    this.fetch = fetch;
+  }
+
+  public async getOauthStatus(): Promise<OauthStatus> {
+    return this.fetch.doGet<OauthStatus>("/oauth_status");
+  }
+
+  public async setGoogleOauth(token: string): Promise<void> {
+    return this.fetch.doPost<void>({
+      url: "/set_google_oauth",
+      params: {token},
+    });
+  }
+
+  public async setFacebookOauth(token: string): Promise<void> {
+    return this.fetch.doPost<void>({
+      url: "/set_facebook_oauth",
+      params: {token},
+    });
+  }
+
+  public async registerFCM(registration_id: string, agent: string, is_mobile: boolean): Promise<void> {
+    await this.fetch.doPost({
+      url: "/register_fcb",
+      params: {
+        registration_id,
+        agent,
+        is_mobile,
+      },
+    });
+  }
+
+
+  public async uploadProfileImage(file: Blob): Promise<void> {
+    await this.fetch.upload<void>({
+      url: "/upload_profile_image",
+      data: {file},
+    });
+  }
+
+  public async showProfile(id: number): Promise<ViewUserProfileDto> {
+    return this.fetch.doGet<ViewUserProfileDto>(`/profile?id=${id}`);
+  }
+
+  public async changeEmail(token: string): Promise<string> {
+    return this.fetch.doGet<string>(`/change_email?token=${token}`);
+  }
+
+  public async changeEmailLogin(email: string, password: string): Promise<void> {
+    return this.fetch.doPost({
+      url: "/change_email_login",
+      params: {
+        email,
+        password,
+      },
+    });
+  }
+
+  public async changePassword(old_password: string, password: string): Promise<void> {
+    return this.fetch.doPost<void>({
+      url: "/change_password",
+      params: {
+        old_password,
+        password,
+      },
+    });
+  }
+
+  public async logout(registration_id: string | null = null): Promise<void> {
+    await this.fetch.doPost({
+      url: "/logout",
+      params: {registration_id},
+    });
+  }
+}
diff --git a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
new file mode 100644
index 000000000..72be1c7da
--- /dev/null
+++ b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
@@ -0,0 +1,59 @@
+import loggerFactory from "@/ts/instances/loggerFactory";
+import type {Logger} from "lines-logger";
+import type Fetch from "@/ts/classes/Fetch";
+import type {
+  VerifyTokenRequest,
+  VerifyTokenResponse,
+} from "@common/http/verify/verify.token";
+import type {
+  AcceptTokenRequest,
+  AcceptTokenResponse,
+} from "@common/http/verify/accept.token";
+import type {
+  SendRestorePasswordRequest,
+  SendRestorePasswordResponse,
+} from "@common/http/verify/send.restore.password";
+import type {
+  ConfirmEmailRequest,
+  ConfirmEmailResponse,
+} from "@common/http/verify/confirm.email";
+
+export default class VerifyApi {
+  protected readonly logger: Logger;
+
+  private readonly fetch: Fetch;
+
+  public constructor(fetch: Fetch) {
+    this.logger = loggerFactory.getLogger("api");
+    this.fetch = fetch;
+  }
+
+  public async verifyToken(params: VerifyTokenRequest): Promise<VerifyTokenResponse> {
+    return this.fetch.doPost<VerifyTokenResponse>({
+      url: "/verify-token",
+      params,
+    });
+  }
+
+  public async confirmEmail(params: ConfirmEmailRequest): Promise<ConfirmEmailResponse> {
+    return this.fetch.doPost({
+      url: "/confirm-email",
+      params,
+    });
+  }
+
+
+  public async acceptToken(params: AcceptTokenRequest): Promise<AcceptTokenResponse> {
+    return this.fetch.doPost({
+      url: "/accept-token",
+      params,
+    });
+  }
+
+  public async sendRestorePassword(params: SendRestorePasswordRequest): Promise<SendRestorePasswordResponse> {
+    return this.fetch.doPost<SendRestorePasswordResponse>({
+      url: "/send-restore-password",
+      params: params,
+    });
+  }
+}
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index d764bff75..2325eed94 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -18,7 +18,6 @@ import type {MessageSenderProxy} from "@/ts/message_handlers/MessageSenderProxy"
 import type {RoomHandler} from "@/ts/message_handlers/RomHandler";
 import type {App as VueApp} from "@vue/runtime-core";
 import type {SmileysApi} from "@/ts/utils/smileys";
-import type Fetch from "@/ts/classes/Fetch";
 
 declare global {
   interface Window {
@@ -30,7 +29,6 @@ declare global {
     deferredPrompt: BeforeInstallPromptEvent;
     wsMessageHandler: WsMessageHandler;
     roomHandler: RoomHandler;
-    xhr: Fetch;
     ws: WsHandler;
     storage: IStorage;
     store: DefaultStore;
diff --git a/frontend/src/vue/auth/ApplyResetPassword.vue b/frontend/src/vue/auth/ApplyResetPassword.vue
index dea556928..45106d171 100644
--- a/frontend/src/vue/auth/ApplyResetPassword.vue
+++ b/frontend/src/vue/auth/ApplyResetPassword.vue
@@ -71,7 +71,7 @@ export default class ApplyResetPassword extends Vue {
     vueProperty: "error",
   })
   async created() {
-    let data = await this.$api.verifyToken({token: (this.$route.query.token) as string});
+    let data = await this.$api.verifyApi.verifyToken({token: (this.$route.query.token) as string});
     this.restoreUser = data.username;
   }
 
@@ -84,7 +84,7 @@ export default class ApplyResetPassword extends Vue {
     if (this.password !== this.repeatPassword) {
       this.$store.growlError("Passords don't match");
     } else {
-      let response = await this.$api.acceptToken({
+      let response = await this.$api.verifyApi.acceptToken({
         token: this.$route.query.token as string,
         password: this.password
       });
diff --git a/frontend/src/vue/auth/AuthPage.vue b/frontend/src/vue/auth/AuthPage.vue
index 0f308db47..1a3fa1e8b 100644
--- a/frontend/src/vue/auth/AuthPage.vue
+++ b/frontend/src/vue/auth/AuthPage.vue
@@ -38,7 +38,7 @@ export default class AuthPage extends Vue {
   @ApplyGrowlErr({message: "Auto-registration error"})
   public async created() {
     if (AUTO_REGISTRATION) {
-      const {session} = await this.$api.signUp({
+      const {session} = await this.$api.authApi.signUp({
         username: this.getRandom(),
         password: this.getRandom(),
       });
diff --git a/frontend/src/vue/auth/CaptchaComponent.vue b/frontend/src/vue/auth/CaptchaComponent.vue
index 3a13bac65..07ad964ba 100644
--- a/frontend/src/vue/auth/CaptchaComponent.vue
+++ b/frontend/src/vue/auth/CaptchaComponent.vue
@@ -154,7 +154,7 @@ export default class CaptchaComponent extends Vue {
         this.renderCaptcha();
       } else {
         this.$emit("update:loading", true);
-        await this.$api.loadRecaptcha("onloadrecaptcha");
+        await this.$api.jsApi.loadRecaptcha("onloadrecaptcha");
       }
     }
   }
diff --git a/frontend/src/vue/auth/FacebookAuth.vue b/frontend/src/vue/auth/FacebookAuth.vue
index ff5ea66d0..61d497fa4 100644
--- a/frontend/src/vue/auth/FacebookAuth.vue
+++ b/frontend/src/vue/auth/FacebookAuth.vue
@@ -49,7 +49,7 @@ export default class FacebookAuth extends Vue {
   @ApplyGrowlErr({message: "Unable to load facebook"})
   public async loadFaceBook(): Promise<void> {
     if (!fbInited && FACEBOOK_APP_ID) {
-      await this.$api.loadFacebook();
+      await this.$api.jsApi.loadFacebook();
       this.$logger.log("Initing facebook sdk...")();
       FB.init({
         appId: FACEBOOK_APP_ID,
diff --git a/frontend/src/vue/auth/GoogleAuth.vue b/frontend/src/vue/auth/GoogleAuth.vue
index 60ac3815f..69432bb8c 100644
--- a/frontend/src/vue/auth/GoogleAuth.vue
+++ b/frontend/src/vue/auth/GoogleAuth.vue
@@ -47,7 +47,7 @@ export default class GoogleAuth extends Vue {
   public async loadGoogle(): Promise<void> {
     if (!googleInited && GOOGLE_OAUTH_2_CLIENT_ID) {
       this.$logger.log("Initializing google sdk")();
-      await this.$api.loadGoogle();
+      await this.$api.jsApi.loadGoogle();
       if (typeof gapi.load !== "function") { // TODO
         throw Error(`Gapi doesnt have load function ${JSON.stringify(Object.keys(gapi))}`);
       }
diff --git a/frontend/src/vue/auth/ResetPassword.vue b/frontend/src/vue/auth/ResetPassword.vue
index d93aeddc7..533282e95 100644
--- a/frontend/src/vue/auth/ResetPassword.vue
+++ b/frontend/src/vue/auth/ResetPassword.vue
@@ -61,7 +61,7 @@ export default class ResetPassword extends Vue {
     message: "Can't reset password",
   })
   public async restorePassword(event: Event) {
-    await this.$api.sendRestorePassword({
+    await this.$api.verifyApi.sendRestorePassword({
       captcha: this.captcha,
       email: this.userNameOrEmail.includes('@') ? this.userNameOrEmail : undefined,
       username: !this.userNameOrEmail.includes('@') ? this.userNameOrEmail: undefined,
diff --git a/frontend/src/vue/auth/SignIn.vue b/frontend/src/vue/auth/SignIn.vue
index 3c409c484..4434e117f 100644
--- a/frontend/src/vue/auth/SignIn.vue
+++ b/frontend/src/vue/auth/SignIn.vue
@@ -87,13 +87,13 @@ export default class SignIn extends Vue {
   public async login() {
     let response;
     if (this.username?.includes('@')) {
-      response = await this.$api.signIn({
+      response = await this.$api.authApi.signIn({
         email: this.username,
         password: this.password,
         captcha: this.captcha,
       });
     } else {
-      response = await this.$api.signIn({
+      response = await this.$api.authApi.signIn({
         username: this.username,
         password: this.password,
         captcha: this.captcha,
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index 2b4c302b9..8627e9d16 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -147,7 +147,9 @@ export default class SignUp extends Vue {
   @Prop() public fb_app_id!: string;
 
   signUpSexMale = Gender.MALE;
+
   signUpSexFemale = Gender.FEMALE;
+
   signUpSexOther = Gender.OTHER;
 
   running: boolean = false;
@@ -178,7 +180,7 @@ export default class SignUp extends Vue {
   debouncedValidateUserName!: Function;
 
 
-  private abortUsernameValidation: (() => void)|null = null;
+  private abortUsernameValidation: (() => void) | null = null;
 
   async checkUserName(username: string) {
     if (this.abortUsernameValidation) {
@@ -186,7 +188,7 @@ export default class SignUp extends Vue {
       this.abortUsernameValidation = null;
     }
     try {
-      await this.$api.validateUsername(username, (r: () => void) => this.abortUsernameValidation = r);
+      await this.$api.authApi.validateUsername({username}, (r: () => void) => this.abortUsernameValidation = r);
       this.userCheckValue = IconColor.SUCCESS;
       this.userDescription = "Username is ok!";
       this.usernameValidity = "";
@@ -280,7 +282,7 @@ export default class SignUp extends Vue {
 
   debouncedValidateEmail!: Function;
 
-  private abortEmailValidation: (() => void)| null = null;
+  private abortEmailValidation: (() => void) | null = null;
 
   async checkEmail(email: string) {
     if (this.abortEmailValidation) {
@@ -288,7 +290,7 @@ export default class SignUp extends Vue {
       this.abortEmailValidation = null;
     }
     try {
-      await this.$api.validateEmail({email}, (r: () => void) => this.abortEmailValidation = r);
+      await this.$api.authApi.validateEmail({email}, (r: () => void) => this.abortEmailValidation = r);
       this.emailCheckValue = IconColor.SUCCESS;
       this.emailDescription = "Email is ok!";
       this.emailValidity = "";
@@ -349,19 +351,19 @@ export default class SignUp extends Vue {
 
   @ApplyGrowlErr({
     runningProp: "running",
-    message: "Can't sign up"
+    message: "Can't sign up",
   })
   async register() {
-    const {session} = await this.$api.signUp({
+    const {session} = await this.$api.authApi.signUp({
       username: this.username,
       password: this.password,
-      email: this.email || undefined, // undefined is not sending via json.stringify
+      email: this.email || undefined, // Undefined is not sending via json.stringify
       sex: this.sex,
     });
     const message: LoginMessage = {
       action: "login",
       handler: "router",
-      session
+      session,
     };
     this.$messageBus.notify(message);
   }
diff --git a/frontend/src/vue/auth/SocialAuthSignUp.vue b/frontend/src/vue/auth/SocialAuthSignUp.vue
index aad9d3d02..bd1957a1d 100644
--- a/frontend/src/vue/auth/SocialAuthSignUp.vue
+++ b/frontend/src/vue/auth/SocialAuthSignUp.vue
@@ -17,6 +17,7 @@ import {
   FACEBOOK_APP_ID,
   GOOGLE_OAUTH_2_CLIENT_ID,
 } from "@/ts/utils/consts";
+import {OauthSessionResponse} from "@common/helpers";
 
 
 @Component({
@@ -32,11 +33,11 @@ export default class SocialAuthSignUp extends Vue {
   public readonly FACEBOOK_APP_ID = FACEBOOK_APP_ID;
 
   async googleAuth({resolve, reject, token}: {token: string; resolve: Function; reject: Function}) {
-    await this.makeAuth(resolve, reject, this.$api.googleAuth(token));
+    await this.makeAuth(resolve, reject, this.$api.authApi.googleAuth({token}));
   }
 
   async facebookAuth({resolve, reject, token}: {token: string; resolve: Function; reject: Function}) {
-    await this.makeAuth(resolve, reject, this.$api.facebookAuth(token));
+    await this.makeAuth(resolve, reject, this.$api.authApi.facebookAuth({token}));
   }
 
   async makeAuth(resolve: Function, reject: Function, method: Promise<OauthSessionResponse>) {
diff --git a/frontend/src/vue/chat/textarea/GiphySearch.vue b/frontend/src/vue/chat/textarea/GiphySearch.vue
index 6e417c858..6967471ba 100644
--- a/frontend/src/vue/chat/textarea/GiphySearch.vue
+++ b/frontend/src/vue/chat/textarea/GiphySearch.vue
@@ -125,7 +125,7 @@ export default class GiphySearch extends Vue {
       this.abortFn();
       this.abortFn = null;
     }
-    const response = await this.$api.searchGiphys(this.search, 0, LOAD_GIPHIES_PER_REQUEST, (r) => this.abortFn = r);
+    const response = await this.$api.giphyApi.searchGiphys(this.search, 0, LOAD_GIPHIES_PER_REQUEST, (r) => this.abortFn = r);
     this.pagination = response.pagination;
     this.abortFn = null;
     this.images = response.data;
@@ -149,7 +149,7 @@ export default class GiphySearch extends Vue {
      * W/0 +1, it returns duplicate id
      * the weird thing docs say, that pagination start with 0, but it seems like with 1
      */
-    const response: MultiResponse = await this.$api.searchGiphys(this.search, this.images.length + 1, LOAD_GIPHIES_PER_REQUEST, (r) => this.abortFn = r);
+    const response: MultiResponse = await this.$api.giphyApi.searchGiphys(this.search, this.images.length + 1, LOAD_GIPHIES_PER_REQUEST, (r) => this.abortFn = r);
     this.pagination = response.pagination;
     this.images.push(...response.data.filter((n) => !this.images.find((o) => o.id === n.id)));
   }
diff --git a/frontend/src/vue/pages/ConfirmMail.vue b/frontend/src/vue/pages/ConfirmMail.vue
index 255828c66..5100c424f 100644
--- a/frontend/src/vue/pages/ConfirmMail.vue
+++ b/frontend/src/vue/pages/ConfirmMail.vue
@@ -43,7 +43,7 @@ export default class ConfirmMail extends Vue {
     message: "Confirming email error ",
   })
   public async created() {
-    await this.$api.confirmEmail({token: this.$route.query.token as string});
+    await this.$api.verifyApi.confirmEmail({token: this.$route.query.token as string});
     this.message = "Email has been confirmed";
   }
 }
diff --git a/frontend/src/vue/pages/EmailChanged.vue b/frontend/src/vue/pages/EmailChanged.vue
index cec422b5b..d3180ce0c 100644
--- a/frontend/src/vue/pages/EmailChanged.vue
+++ b/frontend/src/vue/pages/EmailChanged.vue
@@ -29,7 +29,7 @@ export default class ConfirmMail extends Vue {
     message: "Error changing mail",
   })
   public async created() {
-    this.message = await this.$api.changeEmail(<string> this.$route.query.token);
+    this.message = await this.$api.restApi.changeEmail(<string> this.$route.query.token);
   }
 }
 </script>
diff --git a/frontend/src/vue/pages/UserProfileChangeEmail.vue b/frontend/src/vue/pages/UserProfileChangeEmail.vue
index ab9ebd7e1..81a4f0e07 100644
--- a/frontend/src/vue/pages/UserProfileChangeEmail.vue
+++ b/frontend/src/vue/pages/UserProfileChangeEmail.vue
@@ -79,7 +79,7 @@ export default class UserProfileChangeEmail extends Vue {
     runningProp: "running",
   })
   public async saveProfile() {
-    await this.$api.changeEmailLogin(this.email, this.password);
+    await this.$api.restApi.changeEmailLogin(this.email, this.password);
     this.$store.growlSuccess("Email has been changed");
   }
 }
diff --git a/frontend/src/vue/pages/UserProfileChangePassword.vue b/frontend/src/vue/pages/UserProfileChangePassword.vue
index e8cefb772..ffeea7414 100644
--- a/frontend/src/vue/pages/UserProfileChangePassword.vue
+++ b/frontend/src/vue/pages/UserProfileChangePassword.vue
@@ -108,7 +108,7 @@ export default class UserProfileChangePassword extends Vue {
     if (this.newPassword != this.confirmPassword) {
       this.$store.growlError("Passwords don't match");
     } else {
-      await this.$api.changePassword(this.oldPassword, this.newPassword);
+      await this.$api.restApi.changePassword(this.oldPassword, this.newPassword);
       this.$store.growlSuccess("Password has been changed");
     }
   }
diff --git a/frontend/src/vue/pages/UserProfileImage.vue b/frontend/src/vue/pages/UserProfileImage.vue
index db021096b..3fafec9e2 100644
--- a/frontend/src/vue/pages/UserProfileImage.vue
+++ b/frontend/src/vue/pages/UserProfileImage.vue
@@ -60,7 +60,7 @@ export default class UserProfileImage extends Vue {
   public async upload() {
     const blob = await this.cropper.cropImage();
     if (blob) {
-      await this.$api.uploadProfileImage(blob);
+      await this.$api.restApi.uploadProfileImage(blob);
       this.$store.growlSuccess("Image uploaded");
     } else {
       throw Error("Please select image first");
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index 531a91cef..efed3c358 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -162,7 +162,7 @@ export default class UserProfileInfo extends Vue {
 
 
   public async signOut() {
-    this.$api.logout(); // Do not make user wait, logout instantly
+    this.$api.restApi.logout(); // Do not make user wait, logout instantly
     const message: LogoutMessage = {
       action: "logout",
       handler: "*",
diff --git a/frontend/src/vue/pages/UserProfileOauthSettings.vue b/frontend/src/vue/pages/UserProfileOauthSettings.vue
index 33496061a..88d160adb 100644
--- a/frontend/src/vue/pages/UserProfileOauthSettings.vue
+++ b/frontend/src/vue/pages/UserProfileOauthSettings.vue
@@ -42,26 +42,26 @@ export default class UserProfileOauthSettings extends Vue {
 
 
   async created() {
-    const response: OauthStatus = await this.$api.getOauthStatus();
+    const response: OauthStatus = await this.$api.restApi.getOauthStatus();
     this.googleConnected = response.google;
     this.facebookConnected = response.facebook;
   }
 
   async disconnectGoogle() {
-    await this.$api.setGoogleOauth("");
+    await this.$api.restApi.setGoogleOauth("");
     this.googleConnected = false;
     this.$store.growlSuccess("Google account has been disconnected");
   }
 
   async disconnectFacebook() {
-    await this.$api.setFacebookOauth("");
+    await this.$api.restApi.setFacebookOauth("");
     this.facebookConnected = false;
     this.$store.growlSuccess("Facebook account has been disconnected");
   }
 
   async googleAuth({resolve, reject, token}: {token: string; resolve: Function; reject: Function}) {
     try {
-      await this.$api.setGoogleOauth(token);
+      await this.$api.restApi.setGoogleOauth(token);
       this.googleConnected = true;
       this.$store.growlSuccess("Google ouath has been configured successfully");
     } catch (e) {
@@ -74,7 +74,7 @@ export default class UserProfileOauthSettings extends Vue {
 
   async facebookAuth({resolve, reject, token}: {token: string; resolve: Function; reject: Function}) {
     try {
-      await this.$api.setFacebookOauth(token);
+      await this.$api.restApi.setFacebookOauth(token);
       this.facebookConnected = true;
       this.$store.growlSuccess("Facebook ouath has been configured successfully");
     } catch (e) {
diff --git a/frontend/src/vue/pages/ViewProfilePage.vue b/frontend/src/vue/pages/ViewProfilePage.vue
index 729151fb4..0200f1a01 100644
--- a/frontend/src/vue/pages/ViewProfilePage.vue
+++ b/frontend/src/vue/pages/ViewProfilePage.vue
@@ -98,7 +98,7 @@ export default class ViewProfilePage extends Vue {
     runningProp: "loading",
   })
   public async created() {
-    this.userProfileInfo = await this.$api.showProfile(this.id);
+    this.userProfileInfo = await this.$api.restApi.showProfile(this.id);
   }
 }
 </script>
diff --git a/kubernetes/nginx.conf b/kubernetes/nginx.conf
index 087a60619..0d43df2c4 100644
--- a/kubernetes/nginx.conf
+++ b/kubernetes/nginx.conf
@@ -15,9 +15,6 @@ server {
     charset     utf-8;
     client_max_body_size 75M;
 
-
-    underscores_in_headers on;
-
     location ~ "^/photo/(?<filepath>\w{8}_(?<filename>.*))$"  {
         add_header Content-Disposition 'inline; filename="$filename"';
         alias /srv/http/photos/$filepath;
diff --git a/newback/src/modules/api/auth/auth.service.ts b/newback/src/modules/api/auth/auth.service.ts
index c3bd4794f..0a9126d91 100644
--- a/newback/src/modules/api/auth/auth.service.ts
+++ b/newback/src/modules/api/auth/auth.service.ts
@@ -1,7 +1,11 @@
-import type {FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
+import type {
+  FaceBookSignInRequest,
+  FacebookSignInResponse,
+} from "@common/http/auth/facebook.sign.in";
+import type {
+  GoogleSignInRequest,
+  GoogleSignInResponse,
+} from "@common/http/auth/google.sign.in";
 import type {
   SignUpRequest,
   SignUpResponse,
@@ -10,8 +14,8 @@ import type {
   SignInRequest,
   SignInResponse,
 } from "@common/http/auth/sign.in";
-import {Gender} from '@common/model/enum/gender';
-import {VerificationType} from '@common/model/enum/verification.type';
+import {Gender} from "@common/model/enum/gender";
+import {VerificationType} from "@common/model/enum/verification.type";
 
 
 import {
@@ -36,7 +40,7 @@ import {SessionService} from "@/modules/shared/session/session.service";
 import {generateUserName} from "@/data/transformers/helper/generate.user.name";
 import {
   ALL_ROOM_ID,
-  MAX_USERNAME_LENGTH
+  MAX_USERNAME_LENGTH,
 } from "@common/consts";
 
 @Injectable()
@@ -57,7 +61,7 @@ export class AuthService {
   }
 
 
-  public async authorizeFacebook(body: FaceBookAuthRequest): Promise<FacebookSignInResponse> {
+  public async authorizeFacebook(body: FaceBookSignInRequest): Promise<FacebookSignInResponse> {
     const fbResponse: FacebookGetUserResponse = await this.facebookService.validate(body.token);
     return this.sequelize.transaction(async(t) => {
       const userAuth = await this.userRepository.getUserMyAuthFacebook(fbResponse.id, t);
@@ -98,7 +102,7 @@ export class AuthService {
   }
 
 
-  public async authorizeGoogle(body: GoogleAuthRequest): Promise<GoogleSignInResponse> {
+  public async authorizeGoogle(body: GoogleSignInRequest): Promise<GoogleSignInResponse> {
     const googleResponse: TokenPayload = await this.googleAuthService.validate(body.token);
     return this.sequelize.transaction(async(t) => {
       const userAuth = await this.userRepository.getUserMyAuthGoogle(googleResponse.email, t);
diff --git a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
index d05e577eb..537c42ff5 100644
--- a/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
+++ b/newback/src/modules/api/auth/validators/facebook.auth.request.validator.ts
@@ -1,8 +1,7 @@
-import type {FaceBookAuthRequest} from "@common/http/auth/facebook.auth";
 import {IsString} from "class-validator";
+import type {FaceBookSignInRequest} from "@common/http/auth/facebook.sign.in";
 
-
-export class FacebookAuthRequestValidator implements FaceBookAuthRequest {
+export class FacebookAuthRequestValidator implements FaceBookSignInRequest {
   @IsString()
   public token: string;
 }
diff --git a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
index 19a20fcd8..558b2d70e 100644
--- a/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
+++ b/newback/src/modules/api/auth/validators/google.auth.reques.validator.ts
@@ -1,8 +1,8 @@
-import type {GoogleAuthRequest} from "@common/http/auth/google.auth";
 import {IsString} from "class-validator";
+import type {GoogleSignInRequest} from "@common/http/auth/google.sign.in";
 
 
-export class GoogleAuthRequestValidator implements GoogleAuthRequest {
+export class GoogleAuthRequestValidator implements GoogleSignInRequest {
   @IsString()
   public token: string;
 }
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
index 173cc8b81..f61341f9c 100644
--- a/newback/src/modules/shared/pubsub/pubsub.service.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.service.ts
@@ -12,15 +12,6 @@ import type {WebSocketContextData} from "@/data/types/patch";
 import {RedisService} from "@/modules/shared/redis/redis.service";
 import {RedisSubscribeService} from "@/modules/shared/pubsub/redis.subscribe.service";
 
-
-/*
- * Function stateDecoratorFactory<TPT extends VuexModule>(vuexModule: TPT):
- * <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
- * (vueComponent: TCT, fileName: TPN) => void {
- *   return <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
- *   (vueComponent: TCT, fileName: TPN):
- *
- */
 export function SubscribePuBSub<T extends keyof WebsocketGateway>(handler: T) {
   return (target: WebsocketGateway, memberName: T, propertyDescriptor: PropertyDescriptor) => {
     PubsubService.handlers.push({
diff --git a/rootfs/etc/nginx/sites-enabled/pychat.conf b/rootfs/etc/nginx/sites-enabled/pychat.conf
index fbe6899c4..19342c2e3 100644
--- a/rootfs/etc/nginx/sites-enabled/pychat.conf
+++ b/rootfs/etc/nginx/sites-enabled/pychat.conf
@@ -65,7 +65,6 @@ server {
     listen 443 ssl http2;
     ssl_certificate /etc/letsencrypt/live/pychat.org/fullchain.pem; # managed by Certbot
     ssl_certificate_key /etc/letsencrypt/live/pychat.org/privkey.pem; # managed by Certbot
-    underscores_in_headers on;
 
     charset     utf-8;
     client_max_body_size 500M;

From 2685205f5d24c2e472021aa90777c6e2b98dd47f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 19 May 2022 20:03:12 +0300
Subject: [PATCH 114/221] Added ability to config pubsub through redis
 REDIS_PUBSUB

---
 kubernetes/backend.yaml                       |  3 +++
 newback/package.json                          |  2 +-
 newback/src/config/Config.d.ts                |  1 +
 newback/src/config/default.json               | 16 +++++++++++++
 newback/src/config/env/development.json       | 11 ++-------
 newback/src/config/env/production.json        |  6 ++---
 .../modules/api/websocket/message.service.ts  |  6 +++--
 .../modules/shared/pubsub/pubsub.module.ts    |  9 +++----
 .../modules/shared/pubsub/pubsub.service.ts   | 24 ++++++++++++-------
 newback/yarn.lock                             |  8 +++----
 10 files changed, 55 insertions(+), 31 deletions(-)
 create mode 100644 newback/src/config/default.json

diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index 860096183..f1e25d1f8 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -25,6 +25,9 @@ spec:
           httpGet:
             path: /api/health
             port: 8888
+        env:
+        - name: REDIS_PUBSUB
+          value: true
         envFrom:
         - secretRef:
             name: secret
diff --git a/newback/package.json b/newback/package.json
index 6df185605..791265fcc 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -46,7 +46,7 @@
     "lines-logger": "^2.1.2",
     "mysql2": "^2.3.3",
     "node-db-migration": "^1.4.0",
-    "node-ts-config": "^1.0.5",
+    "node-ts-config": "^1.1.0",
     "nodemailer": "^6.7.3",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7",
diff --git a/newback/src/config/Config.d.ts b/newback/src/config/Config.d.ts
index 43909252f..b9c1119c0 100644
--- a/newback/src/config/Config.d.ts
+++ b/newback/src/config/Config.d.ts
@@ -50,6 +50,7 @@ declare module "node-ts-config" {
   interface Redis {
     host: string
     port: number
+    pubsub: boolean
     database: number
   }
   interface Settings {
diff --git a/newback/src/config/default.json b/newback/src/config/default.json
new file mode 100644
index 000000000..019bbf3a9
--- /dev/null
+++ b/newback/src/config/default.json
@@ -0,0 +1,16 @@
+{
+  "name": "pychat",
+  "application": {
+    "port": 8888
+  },
+  "settings": {
+    "flags": true
+  },
+  "redis": {
+    "pubsub": true,
+    "database": 0
+  },
+  "frontend": {
+    "issueReportLink": "https://github.com/akoidan/pychat/issues/new"
+  }
+}
diff --git a/newback/src/config/env/development.json b/newback/src/config/env/development.json
index 40353104d..92243f4de 100644
--- a/newback/src/config/env/development.json
+++ b/newback/src/config/env/development.json
@@ -1,23 +1,16 @@
 {
-  "name": "pychat",
   "application": {
-    "port": 8888,
     "ssl" : {
       "crtPath": "../frontend/build/certs/server.crt.pem",
       "keyPath": "../frontend/build/certs/private.key.pem"
     }
   },
-  "settings": {
-    "flags": true
-  },
   "redis": {
     "host": "localhost",
-    "port": 6379,
-    "database": 0
+    "port": 6379
   },
   "frontend": {
-    "address": "https://localhost:8080",
-    "issueReportLink": "https://github.com/akoidan/pychat/issues/new"
+    "address": "https://localhost:8080"
   },
   "mysql": {
     "host": "localhost",
diff --git a/newback/src/config/env/production.json b/newback/src/config/env/production.json
index de95028c3..863161d7f 100644
--- a/newback/src/config/env/production.json
+++ b/newback/src/config/env/production.json
@@ -15,12 +15,12 @@
     }
   },
   "settings": {
-    "flags": true
+    "flags": "@@FLAGS"
   },
   "redis": {
     "host": "@@REDIS_HOST",
     "port":  "@@REDIS_PORT",
-    "database": 0
+    "pubsub": "@@REDIS_PUBSUB"
   },
   "frontend": {
     "address": "@@FRONTEND_ADDRESS",
@@ -40,7 +40,7 @@
     }
   },
   "mysql": {
-    "logging": true,
+    "logging": "@@MYSQL_LOGGING",
     "host": "@@MYSQL_HOST",
     "port": "@@MYSQL_PORT",
     "username": "@@MYSQL_USER",
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index def3f6336..d4f57c62a 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -127,8 +127,10 @@ export class MessageService {
         await this.messageRepository.deleteUploadedFiles(files.map((f) => f.id), transaction);
       }
       const body = transformPrintMessage(messageModel, mentions, images);
-      await this.pubsubService.emit({body,
-        handler: "sendToClient"}, data.roomId);
+      await this.pubsubService.emit({
+        body,
+        handler: "sendToClient",
+      }, String(data.roomId));
     });
   }
 }
diff --git a/newback/src/modules/shared/pubsub/pubsub.module.ts b/newback/src/modules/shared/pubsub/pubsub.module.ts
index be19fc0d9..534da19a8 100644
--- a/newback/src/modules/shared/pubsub/pubsub.module.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.module.ts
@@ -7,6 +7,7 @@ import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import {RedisModule} from "@nestjs-modules/ioredis";
 import {config} from "node-ts-config";
 import {RedisSubscribeService} from "@/modules/shared/pubsub/redis.subscribe.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 
 @Module({
   imports: [
@@ -23,15 +24,15 @@ import {RedisSubscribeService} from "@/modules/shared/pubsub/redis.subscribe.ser
     RedisSubscribeService,
     {
       provide: PubsubService,
-      inject: [Logger, RedisService, RedisSubscribeService],
-      useFactory: async(l: Logger, r: RedisService, rs: RedisSubscribeService) => {
-        const ps = new PubsubService(l, r, rs);
+      inject: [Logger, RedisService, RedisSubscribeService, ConfigService],
+      useFactory: async(l: Logger, r: RedisService, rs: RedisSubscribeService, cs: ConfigService) => {
+        const ps = new PubsubService(l, r, cs, rs);
         await ps.startListening();
         return ps;
       },
     },
   ],
-  exports: [PubsubService]
+  exports: [PubsubService],
 })
 export class PubsubModule {
 }
diff --git a/newback/src/modules/shared/pubsub/pubsub.service.ts b/newback/src/modules/shared/pubsub/pubsub.service.ts
index f61341f9c..c02e3c792 100644
--- a/newback/src/modules/shared/pubsub/pubsub.service.ts
+++ b/newback/src/modules/shared/pubsub/pubsub.service.ts
@@ -11,6 +11,7 @@ import type {HandlerName} from "@common/ws/common";
 import type {WebSocketContextData} from "@/data/types/patch";
 import {RedisService} from "@/modules/shared/redis/redis.service";
 import {RedisSubscribeService} from "@/modules/shared/pubsub/redis.subscribe.service";
+import {ConfigService} from "@/modules/shared/config/config.service";
 
 export function SubscribePuBSub<T extends keyof WebsocketGateway>(handler: T) {
   return (target: WebsocketGateway, memberName: T, propertyDescriptor: PropertyDescriptor) => {
@@ -33,20 +34,25 @@ export class PubsubService {
   constructor(
     private readonly logger: Logger,
     private readonly redis: RedisService,
+    private readonly configService: ConfigService,
     private readonly subscribeService: RedisSubscribeService,
   ) {
   }
 
-  // A extends string,H extends HandlerName
-
-  public async emit<PS extends PubSubMessage<A, H>, A extends string, H extends HandlerName>(data: PS, ...channel: (number | string)[]) {
-    await this.redis.emit(channel[0] as any, data);
+  public async emit<PS extends PubSubMessage<A, H>, A extends string, H extends HandlerName>(data: PS, channel: string) {
+    if (this.configService.getConfig().redis.pubsub) {
+      await this.redis.emit(channel, data);
+    } else {
+      this.onRedisMessage(channel, data);
+    }
   }
 
   async startListening() {
-    await this.subscribeService.onMessage((channel, message) => {
-      this.onRedisMessage(channel, message as PubSubMessage<any, any>);
-    });
+    if (this.configService.getConfig().redis.pubsub) {
+      await this.subscribeService.onMessage((channel, message) => {
+        this.onRedisMessage(channel, message as PubSubMessage<any, any>);
+      });
+    }
   }
 
   public onRedisMessage(channel: string, data: PubSubMessage<any, any>) {
@@ -64,7 +70,9 @@ export class PubsubService {
   public async subscribe(context: WebSocketContextData, ...channel: string[]) {
     const newChannels = channel.filter((c) => !this.subscribedChannel.includes(c));
     if (newChannels.length > 0) {
-      await this.subscribeService.listen(newChannels);
+      if (this.configService.getConfig().redis.pubsub) {
+        await this.subscribeService.listen(newChannels);
+      }
     }
     channel.forEach((channel) => {
       if (!this.receivers[channel]) {
diff --git a/newback/yarn.lock b/newback/yarn.lock
index 52e7d32c7..8ad05ecf5 100644
--- a/newback/yarn.lock
+++ b/newback/yarn.lock
@@ -5380,10 +5380,10 @@ node-releases@^2.0.2:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
   integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
 
-node-ts-config@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/node-ts-config/-/node-ts-config-1.0.5.tgz#6eb6b5760dc80e55c3df1ea53a4ac26794b51cf1"
-  integrity sha512-w7aSkwKsS52k+3xAZr4BRRs30lkmkJjNViPaxH3G1gqs2ZCJq7FVonazAyP388qwOgLiSxSrTJm3c7/DGWzaSw==
+node-ts-config@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/node-ts-config/-/node-ts-config-1.1.0.tgz#210641426dd1e0d909874a271e18e23060f9fa28"
+  integrity sha512-Gge3RT5mbG7xhkt2g85XSMrhh5RHaO3afsCekBLZH2MdGxLuErIJ9FU+RVQdoIY/vrQfpm83CpwL5GNvcM/Pjg==
   dependencies:
     json-to-ts "^1.6.0"
     minimist "^1.2.0"

From 6f2323e8f1e5253b62016aa0fb8d9522cc6795d5 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 19 May 2022 20:37:16 +0300
Subject: [PATCH 115/221] Fixed configs

---
 newback/src/config/default.json          |  2 +-
 newback/src/config/env/test.json         |  3 +--
 newback/src/modules/app/app.module.ts    | 16 ++++------------
 newback/src/utils/generate.orm.config.ts |  6 +-----
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/newback/src/config/default.json b/newback/src/config/default.json
index 019bbf3a9..39d104e93 100644
--- a/newback/src/config/default.json
+++ b/newback/src/config/default.json
@@ -8,7 +8,7 @@
   },
   "redis": {
     "pubsub": true,
-    "database": 0
+    "db": 0
   },
   "frontend": {
     "issueReportLink": "https://github.com/akoidan/pychat/issues/new"
diff --git a/newback/src/config/env/test.json b/newback/src/config/env/test.json
index badf6f0e2..9c1d8cc33 100644
--- a/newback/src/config/env/test.json
+++ b/newback/src/config/env/test.json
@@ -2,7 +2,6 @@
   "recaptcha": null,
   "email": null,
   "frontend": {
-    "address": "https://localhost:8080",
-    "issueReportLink": "https://github.com/akoidan/pychat/issues/new"
+    "address": "https://localhost:8080"
   }
 }
diff --git a/newback/src/modules/app/app.module.ts b/newback/src/modules/app/app.module.ts
index 779292500..c76b16bd4 100644
--- a/newback/src/modules/app/app.module.ts
+++ b/newback/src/modules/app/app.module.ts
@@ -41,19 +41,11 @@ import {HealthModule} from "@/modules/api/health/health.module";
     WebsocketModule,
     HealthModule,
     RedisModule.forRoot({
-      config: {
-        host: config.redis.host,
-        port: config.redis.port,
-        db: config.redis.database,
-      },
+      config: config.redis,
     }),
-  RedisModule.forRoot({
-      config: {
-        host: config.redis.host,
-        port: config.redis.port,
-        db: config.redis.database,
-      },
-    }, 'pubsub'),
+    RedisModule.forRoot({
+      config: config.redis,
+    }, "pubsub"),
   ],
   providers: [
     {
diff --git a/newback/src/utils/generate.orm.config.ts b/newback/src/utils/generate.orm.config.ts
index 3479eeee5..5d60475b8 100644
--- a/newback/src/utils/generate.orm.config.ts
+++ b/newback/src/utils/generate.orm.config.ts
@@ -10,11 +10,7 @@ export function generateOrmConfig(logging: ((sql: string) => void)): Omit<Sequel
     synchronize: sync,
     logging,
     dialect: "mysql",
-    host: config.mysql.host,
-    port: config.mysql.port,
-    username: config.mysql.username,
-    password: config.mysql.password,
-    database: config.mysql.database,
+    ...config.mysql,
     autoLoadModels: true,
     sync: {
       force: sync,

From ee4cb53f131f55261954275933cfd856754ead30 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 20 May 2022 00:07:59 +0300
Subject: [PATCH 116/221] Separated model

---
 common/src/helpers.ts                         |  73 ++++++
 common/src/legacy.ts                          | 243 ------------------
 common/src/ws/common.ts                       |   6 -
 .../destroy.call.connection.ts                |  11 +
 .../destroy.file.connection.ts                |   7 +
 .../ws/message/peer-connection/retry.file.ts  |   3 +
 .../message/peer-connection/send.rtc.data.ts  |  11 +
 common/src/ws/message/room/add.channel.ts     |  10 +
 common/src/ws/message/room/add.invite.ts      |  10 +
 .../ws/message/{ => room}/add.online.user.ts  |   0
 common/src/ws/message/room/add.room.ts        |   9 +
 common/src/ws/message/room/create.new.user.ts |  11 +
 common/src/ws/message/room/delete.channel.ts  |   9 +
 common/src/ws/message/room/delete.room.ts     |   7 +
 common/src/ws/message/room/invite.user.ts     |  11 +
 common/src/ws/message/room/leave.user.ts      |   9 +
 .../src/ws/message/room/remove.online.user.ts |   6 +
 .../ws/message/room/save.channel.settings.ts  |  11 +
 .../src/ws/message/room/save.room.settings.ts |   5 +
 .../src/ws/message/{ => room}/show.i.type.ts  |   0
 .../src/ws/message/sync/set.connection.id.ts  |   8 +
 .../ws/message/webrtc-transfer/accept.call.ts |  10 +
 .../ws/message/webrtc-transfer/accept.file.ts |   8 +
 .../ws/message/webrtc-transfer/reply.call.ts  |   7 +
 .../ws/message/webrtc-transfer/reply.file.ts  |   7 +
 .../ws/message/webrtc/notify.call.active.ts   |  12 +
 common/src/ws/message/webrtc/offer.call.ts    |  16 ++
 common/src/ws/message/webrtc/offer.file.ts    |  16 ++
 common/src/ws/message/webrtc/offer.message.ts |  16 ++
 .../ws/message/ws-message/delete.message.ts   |  10 +
 .../message/{ => ws-message}/print.message.ts |   0
 common/src/ws/message/ws/ping.ts              |   6 +
 common/src/ws/message/ws/pong.ts              |   6 +
 common/src/ws/message/ws/set.profile.image.ts |   6 +
 common/src/ws/message/ws/set.settings.ts      |   5 +
 common/src/ws/message/ws/set.user.profile.ts  |   5 +
 common/src/ws/message/{ => ws}/set.ws.id.ts   |   0
 .../src/ws/message/ws/user.profile.changed.ts |   5 +
 38 files changed, 346 insertions(+), 249 deletions(-)
 delete mode 100644 common/src/legacy.ts
 create mode 100644 common/src/ws/message/peer-connection/destroy.call.connection.ts
 create mode 100644 common/src/ws/message/peer-connection/destroy.file.connection.ts
 create mode 100644 common/src/ws/message/peer-connection/retry.file.ts
 create mode 100644 common/src/ws/message/peer-connection/send.rtc.data.ts
 create mode 100644 common/src/ws/message/room/add.channel.ts
 create mode 100644 common/src/ws/message/room/add.invite.ts
 rename common/src/ws/message/{ => room}/add.online.user.ts (100%)
 create mode 100644 common/src/ws/message/room/add.room.ts
 create mode 100644 common/src/ws/message/room/create.new.user.ts
 create mode 100644 common/src/ws/message/room/delete.channel.ts
 create mode 100644 common/src/ws/message/room/delete.room.ts
 create mode 100644 common/src/ws/message/room/invite.user.ts
 create mode 100644 common/src/ws/message/room/leave.user.ts
 create mode 100644 common/src/ws/message/room/remove.online.user.ts
 create mode 100644 common/src/ws/message/room/save.channel.settings.ts
 create mode 100644 common/src/ws/message/room/save.room.settings.ts
 rename common/src/ws/message/{ => room}/show.i.type.ts (100%)
 create mode 100644 common/src/ws/message/sync/set.connection.id.ts
 create mode 100644 common/src/ws/message/webrtc-transfer/accept.call.ts
 create mode 100644 common/src/ws/message/webrtc-transfer/accept.file.ts
 create mode 100644 common/src/ws/message/webrtc-transfer/reply.call.ts
 create mode 100644 common/src/ws/message/webrtc-transfer/reply.file.ts
 create mode 100644 common/src/ws/message/webrtc/notify.call.active.ts
 create mode 100644 common/src/ws/message/webrtc/offer.call.ts
 create mode 100644 common/src/ws/message/webrtc/offer.file.ts
 create mode 100644 common/src/ws/message/webrtc/offer.message.ts
 create mode 100644 common/src/ws/message/ws-message/delete.message.ts
 rename common/src/ws/message/{ => ws-message}/print.message.ts (100%)
 create mode 100644 common/src/ws/message/ws/ping.ts
 create mode 100644 common/src/ws/message/ws/pong.ts
 create mode 100644 common/src/ws/message/ws/set.profile.image.ts
 create mode 100644 common/src/ws/message/ws/set.settings.ts
 create mode 100644 common/src/ws/message/ws/set.user.profile.ts
 rename common/src/ws/message/{ => ws}/set.ws.id.ts (100%)
 create mode 100644 common/src/ws/message/ws/user.profile.changed.ts

diff --git a/common/src/helpers.ts b/common/src/helpers.ts
index 1db920a84..4725dbab7 100644
--- a/common/src/helpers.ts
+++ b/common/src/helpers.ts
@@ -1,3 +1,7 @@
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {RoomDto} from "@common/model/dto/room.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+
 export interface CaptchaRequest {
   captcha?: string;
 }
@@ -14,6 +18,11 @@ export interface ChangeUserOnlineBase {
   time: number;
 }
 
+export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
+  content: BrowserBase;
+  userId: number;
+}
+
 interface TypeGeneratorForOauth2 extends SessionResponse {
   isNewAccount: false;
 }
@@ -31,3 +40,67 @@ export interface SessionResponse {
 export interface OkResponse {
   ok: true;
 }
+
+
+export interface ChangeUserOnlineBase {
+  online: Record<number, string[]>;
+  userId: number;
+  lastTimeOnline: number;
+  time: number;
+}
+
+
+export interface NewRoom {
+  inviterUserId: number;
+  time: number;
+}
+
+export interface RoomExistedBefore {
+  inviteeUserId: number[];
+}
+
+export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
+}
+
+export interface OpponentWsId {
+  opponentWsId: string;
+}
+
+export interface WebRtcDefaultMessage {
+  connId: string;
+}
+
+export interface OfferFileContent extends BrowserBase {
+  size: number;
+  name: string;
+}
+
+export type ChangeDeviceType =
+  "i_deleted"
+  | "invited"
+  | "room_created"
+  | "someone_joined"
+  | "someone_left";
+export type ChangeOnlineType =
+  "appear_online"
+  | "gone_offline";
+
+export interface BrowserBase {
+  browser: string;
+}
+
+
+export interface ResolveCallbackId {
+  resolveCbId?: number; // If this callback id is present, resolve it
+}
+
+export type CallStatus =
+  "accepted"
+  | "not_inited"
+  | "received_offer"
+  | "sent_offer";
+
+
+export interface MessagesResponseMessage {
+  content: MessageModelDto[];
+}
diff --git a/common/src/legacy.ts b/common/src/legacy.ts
deleted file mode 100644
index 990e79bac..000000000
--- a/common/src/legacy.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-import type {
-  DefaultWsInMessage,
-  HandlerName,
-  HandlerType,
-} from "@common/ws/common";
-import type {UserDto} from "@common/model/dto/user.dto";
-import type {ChannelDto} from "@common/model/dto/channel.dto";
-import type {MessageModelDto} from "@common/model/dto/message.model.dto";
-import type {
-  RoomDto,
-  RoomNoUsersDto,
-} from "@common/model/dto/room.dto";
-import type {UserProfileDtoWoImage,} from "@common/model/dto/user.profile.dto";
-import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-
-
-export interface ChangeUserOnlineBase {
-  online: Record<number, string[]>;
-  userId: number;
-  lastTimeOnline: number;
-  time: number;
-}
-
-
-export interface AcceptFileContent {
-  received: number;
-}
-
-export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
-  content: BrowserBase;
-  userId: number;
-}
-
-export interface NewRoom {
-  inviterUserId: number;
-  time: number;
-}
-
-export interface RoomExistedBefore {
-  inviteeUserId: number[];
-}
-
-export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
-}
-
-export interface OpponentWsId {
-  opponentWsId: string;
-}
-
-export interface WebRtcDefaultMessage {
-  connId: string;
-}
-
-export interface OfferFileContent extends BrowserBase {
-  size: number;
-  name: string;
-}
-
-export type ChangeDeviceType =
-  "i_deleted"
-  | "invited"
-  | "room_created"
-  | "someone_joined"
-  | "someone_left";
-export type ChangeOnlineType =
-  "appear_online"
-  | "gone_offline";
-
-export interface BrowserBase {
-  browser: string;
-}
-
-
-export interface ResolveCallbackId {
-  resolveCbId?: number; // If this callback id is present, resolve it
-}
-
-export interface IMessageHandler {
-  handle<H extends HandlerName>(message: DefaultWsInMessage<string, H, HandlerName>): void;
-
-  // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-  getHandler<H extends HandlerName, A extends string>(message: DefaultWsInMessage<A, H, any>): HandlerType<A, H, any> | undefined;
-}
-
-export type CallStatus =
-  "accepted"
-  | "not_inited"
-  | "received_offer"
-  | "sent_offer";
-
-
-/** WsInMessages.ts */
-/**
- * This file should only contain structures created by server. Only BE -> FE by websockets
- * and processed by MessageHandler
- */
-
-
-export interface MessagesResponseMessage {
-  content: MessageModelDto[];
-}
-
-
-// Export type EditMessage = DefaultWsInMessage<"editMessage", "ws-message", MessageModelDto>;
-
-
-export type DeleteMessage = DefaultWsInMessage<"deleteMessage", "ws-message", {
-  roomId: number;
-  id: number;
-  edited: number;
-}>;
-
-
-export interface CreateNewUserBodyMessage extends UserDto {
-  rooms: {
-    roomId: number;
-    users: number[];
-  }[];
-}
-
-export type CreateNewUsedMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserBodyMessage>;
-
-export type RemoveOnlineUserMessage = DefaultWsInMessage<"removeOnlineUser", "room", ChangeUserOnlineBase>;
-
-
-export type DeleteRoomMessage = DefaultWsInMessage<"deleteRoom", "room", {
-  roomId: number;
-}>;
-
-
-export type LeaveUserMessage = DefaultWsInMessage<"leaveUser", "room", {
-  roomId: number;
-  userId: number;
-  users: number[];
-}>;
-
-export interface AddChannelMessageBody extends ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
-  channelUsers: number[];
-}
-export type AddChannelMessage = DefaultWsInMessage<"addChannel", "room", AddChannelMessageBody>;
-
-export interface InviteUserMessageBody extends NewRoom, RoomExistedBefore {
-  roomId: number;
-  users: number[];
-}
-export type InviteUserMessage = DefaultWsInMessage<"inviteUser", "room", InviteUserMessageBody>;
-
-
-export type AddInviteMessage = DefaultWsInMessage<"addInvite", "room", AddRoomBase | RoomExistedBefore | {
-} >;
-
-export type SaveChannelSettingsMessage = DefaultWsInMessage<"saveChannelSettings", "room", ChannelDto | {
-  notifications: boolean;
-  volume: number;
-  p2p: boolean;
-  userId: number;
-}>;
-
-export type DeleteChannelMessage = DefaultWsInMessage<"deleteChannel", "room", {
-  channelId: number;
-  roomIds: number[];
-}>;
-
-export type SaveRoomSettingsMessage = DefaultWsInMessage<"saveRoomSettings", "room", RoomNoUsersDto | {
-
-}>;
-
-
-
-export type WebRtcSetConnectionIdMessage = DefaultWsInMessage<"setConnectionId", "void", WebRtcDefaultMessage | {
-  time: number;
-}>;
-
-export type AddRoomMessage = DefaultWsInMessage<"addRoom", "room", AddRoomBase | {
-  channelUsers: number[];
-  channelId: number;
-}>;
-
-export type OfferFile = DefaultWsInMessage<"offerFile", "webrtc", OpponentWsId | WebRtcDefaultMessage | {
-  content: OfferFileContent;
-  roomId: number;
-  threadId: number | null;
-  userId: number;
-  time: number;
-}>;
-
-export type OfferCall = DefaultWsInMessage<"offerCall", "webrtc", OpponentWsId | WebRtcDefaultMessage | {
-  content: BrowserBase;
-  roomId: number;
-  userId: number;
-  time: number;
-}>;
-
-export type ReplyCallMessage = DefaultWsInMessage<"replyCall", "webrtcTransfer:*", ReplyWebRtc>;
-
-export type NotifyCallActiveMessage = DefaultWsInMessage<"notifyCallActive", "webrtc", OpponentWsId | WebRtcDefaultMessage | {
-  roomId: number;
-  userId: number;
-}>;
-
-export type DestroyCallConnection = DefaultWsInMessage<"destroyCallConnection", "peerConnection:*", OpponentWsId | WebRtcDefaultMessage | {
-  content: string;
-}>;
-
-export type OfferMessage = DefaultWsInMessage<"offerMessage", "webrtc", OpponentWsId | WebRtcDefaultMessage | {
-  content: BrowserBase;
-  roomId: number;
-  userId: number;
-  time: number;
-}>;
-
-export type SetSettingsMessage = DefaultWsInMessage<"setSettings", "ws", UserSettingsDto>;
-
-export type SetUserProfileMessage = DefaultWsInMessage<"setUserProfile", "ws", UserProfileDtoWoImage>;
-
-export type UserProfileChangedMessage = DefaultWsInMessage<"userProfileChanged", "ws", UserDto>;
-
-
-
-export type PingMessage = DefaultWsInMessage<"ping", "ws", {
-  time: string;
-}>;
-
-export type PongMessage = DefaultWsInMessage<"pong", "ws", {
-  time: string;
-}>;
-
-export type ReplyFileMessage = DefaultWsInMessage<"replyFile", "webrtcTransfer:*", ReplyWebRtc>;
-
-export type SetProfileImageMessage = DefaultWsInMessage<"setProfileImage", "ws", string>;
-
-export type AcceptCallMessage = DefaultWsInMessage<"acceptCall", "webrtcTransfer:*", OpponentWsId | WebRtcDefaultMessage>;
-
-export type AcceptFileMessage = DefaultWsInMessage<"acceptFile", "peerConnection:*", AcceptFileContent>;
-
-export type SendRtcDataMessage = DefaultWsInMessage<"sendRtcData", "peerConnection:*", OpponentWsId | WebRtcDefaultMessage | {
-  content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
-}>;
-
-export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*", {}>;
-
-export type DestroyFileConnectionMessage = DefaultWsInMessage<"destroyFileConnection", "peerConnection:*", "decline" | "success">;
-
diff --git a/common/src/ws/common.ts b/common/src/ws/common.ts
index 797a28362..76130f9cb 100644
--- a/common/src/ws/common.ts
+++ b/common/src/ws/common.ts
@@ -34,9 +34,3 @@ export type HandlerName =
   | "ws-message"
   | "ws";
 
-
-export type HandlerType<A extends string, H extends HandlerName, D> = (a: DefaultWsInMessage<A, H | "*", D>) => Promise<void> | void;
-
-export type HandlerTypes<K extends string, H extends HandlerName, D> = {
-  [Key in K]?: HandlerType<Key, H, D>
-};
diff --git a/common/src/ws/message/peer-connection/destroy.call.connection.ts b/common/src/ws/message/peer-connection/destroy.call.connection.ts
new file mode 100644
index 000000000..1f452ae6a
--- /dev/null
+++ b/common/src/ws/message/peer-connection/destroy.call.connection.ts
@@ -0,0 +1,11 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  OpponentWsId,
+  WebRtcDefaultMessage,
+} from "@common/legacy";
+
+
+export interface DestroyCallConnectionBody extends OpponentWsId, WebRtcDefaultMessage {
+  content: string;
+}
+export type DestroyCallConnectionMessage = DefaultWsInMessage<"destroyCallConnection", "peerConnection:*", DestroyCallConnectionBody>;
diff --git a/common/src/ws/message/peer-connection/destroy.file.connection.ts b/common/src/ws/message/peer-connection/destroy.file.connection.ts
new file mode 100644
index 000000000..a34bb6da6
--- /dev/null
+++ b/common/src/ws/message/peer-connection/destroy.file.connection.ts
@@ -0,0 +1,7 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+
+export interface DestroyFileConnectionBody {
+  status: "decline" | "success";
+}
+export type DestroyFileConnectionMessage = DefaultWsInMessage<"destroyFileConnection", "peerConnection:*", DestroyFileConnectionBody>;
diff --git a/common/src/ws/message/peer-connection/retry.file.ts b/common/src/ws/message/peer-connection/retry.file.ts
new file mode 100644
index 000000000..92b3121d2
--- /dev/null
+++ b/common/src/ws/message/peer-connection/retry.file.ts
@@ -0,0 +1,3 @@
+import {DefaultWsInMessage} from "@common/ws/common";
+
+export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*", {}>;
diff --git a/common/src/ws/message/peer-connection/send.rtc.data.ts b/common/src/ws/message/peer-connection/send.rtc.data.ts
new file mode 100644
index 000000000..9efa85efb
--- /dev/null
+++ b/common/src/ws/message/peer-connection/send.rtc.data.ts
@@ -0,0 +1,11 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  OpponentWsId,
+  WebRtcDefaultMessage,
+} from "@common/legacy";
+
+
+export interface SendRtcDataBody extends OpponentWsId, WebRtcDefaultMessage {
+  content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
+}
+export type SendRtcDataMessage = DefaultWsInMessage<"sendRtcData", "peerConnection:*", SendRtcDataBody>;
diff --git a/common/src/ws/message/room/add.channel.ts b/common/src/ws/message/room/add.channel.ts
new file mode 100644
index 000000000..903664b12
--- /dev/null
+++ b/common/src/ws/message/room/add.channel.ts
@@ -0,0 +1,10 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {NewRoom} from "@common/legacy";
+import type {ChannelDto} from "@common/model/dto/channel.dto";
+import type {RoomDto} from "@common/model/dto/room.dto";
+
+export interface AddChannelBody extends ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
+  channelUsers: number[];
+}
+
+export type AddChannelMessage = DefaultWsInMessage<"addChannel", "room", AddChannelBody>;
diff --git a/common/src/ws/message/room/add.invite.ts b/common/src/ws/message/room/add.invite.ts
new file mode 100644
index 000000000..376be7770
--- /dev/null
+++ b/common/src/ws/message/room/add.invite.ts
@@ -0,0 +1,10 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import {
+  AddRoomBase,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/legacy";
+
+export type AddInviteBody = AddRoomBase | RoomExistedBefore;
+
+export type AddInviteMessage = DefaultWsInMessage<"addInvite", "room", AddInviteBody>;
diff --git a/common/src/ws/message/add.online.user.ts b/common/src/ws/message/room/add.online.user.ts
similarity index 100%
rename from common/src/ws/message/add.online.user.ts
rename to common/src/ws/message/room/add.online.user.ts
diff --git a/common/src/ws/message/room/add.room.ts b/common/src/ws/message/room/add.room.ts
new file mode 100644
index 000000000..aa26e7f8c
--- /dev/null
+++ b/common/src/ws/message/room/add.room.ts
@@ -0,0 +1,9 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {AddRoomBase} from "@common/legacy";
+
+export interface AddRoomBody extends AddRoomBase {
+  channelUsers: number[];
+  channelId: number;
+}
+
+export type AddRoomMessage = DefaultWsInMessage<"addRoom", "room", AddRoomBody>;
diff --git a/common/src/ws/message/room/create.new.user.ts b/common/src/ws/message/room/create.new.user.ts
new file mode 100644
index 000000000..8ebb6e3e1
--- /dev/null
+++ b/common/src/ws/message/room/create.new.user.ts
@@ -0,0 +1,11 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import {UserDto} from "@common/model/dto/user.dto";
+
+export interface CreateNewUserBody extends UserDto {
+  rooms: {
+    roomId: number;
+    users: number[];
+  }[];
+}
+
+export type CreateNewUsedMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserBody>;
diff --git a/common/src/ws/message/room/delete.channel.ts b/common/src/ws/message/room/delete.channel.ts
new file mode 100644
index 000000000..875c7bcbf
--- /dev/null
+++ b/common/src/ws/message/room/delete.channel.ts
@@ -0,0 +1,9 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {ChannelDto} from "@common/model/dto/channel.dto";
+
+export interface DeleteChannelBody {
+  channelId: number;
+  roomIds: number[];
+}
+
+export type DeleteChannelMessage = DefaultWsInMessage<"deleteChannel", "room", DeleteChannelBody>;
diff --git a/common/src/ws/message/room/delete.room.ts b/common/src/ws/message/room/delete.room.ts
new file mode 100644
index 000000000..71ec63c26
--- /dev/null
+++ b/common/src/ws/message/room/delete.room.ts
@@ -0,0 +1,7 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export interface DeleteRoomBody {
+  roomId: number;
+}
+
+export type DeleteRoomMessage = DefaultWsInMessage<"deleteRoom", "room", DeleteRoomBody>;
diff --git a/common/src/ws/message/room/invite.user.ts b/common/src/ws/message/room/invite.user.ts
new file mode 100644
index 000000000..be926d740
--- /dev/null
+++ b/common/src/ws/message/room/invite.user.ts
@@ -0,0 +1,11 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import {
+  NewRoom,
+  RoomExistedBefore
+} from "@common/legacy";
+
+export interface InviteUserBody extends NewRoom, RoomExistedBefore {
+  roomId: number;
+  users: number[];
+}
+export type InviteUserMessage = DefaultWsInMessage<"inviteUser", "room", InviteUserBody>;
diff --git a/common/src/ws/message/room/leave.user.ts b/common/src/ws/message/room/leave.user.ts
new file mode 100644
index 000000000..d51b472e7
--- /dev/null
+++ b/common/src/ws/message/room/leave.user.ts
@@ -0,0 +1,9 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export interface LeaveUserBody {
+  roomId: number;
+  userId: number;
+  users: number[];
+}
+
+export type LeaveUserMessage = DefaultWsInMessage<"leaveUser", "room", LeaveUserBody>;
diff --git a/common/src/ws/message/room/remove.online.user.ts b/common/src/ws/message/room/remove.online.user.ts
new file mode 100644
index 000000000..d947331e0
--- /dev/null
+++ b/common/src/ws/message/room/remove.online.user.ts
@@ -0,0 +1,6 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import {ChangeUserOnlineBase} from "@common/legacy";
+
+export type RemoveOnlineUserBody = ChangeUserOnlineBase;
+
+export type RemoveOnlineUserMessage = DefaultWsInMessage<"removeOnlineUser", "room", RemoveOnlineUserBody>;
diff --git a/common/src/ws/message/room/save.channel.settings.ts b/common/src/ws/message/room/save.channel.settings.ts
new file mode 100644
index 000000000..f17d4ab94
--- /dev/null
+++ b/common/src/ws/message/room/save.channel.settings.ts
@@ -0,0 +1,11 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {ChannelDto} from "@common/model/dto/channel.dto";
+
+export interface SaveChannelSettingsBody extends ChannelDto {
+  notifications: boolean;
+  volume: number;
+  p2p: boolean;
+  userId: number;
+}
+
+export type SaveChannelSettingsMessage = DefaultWsInMessage<"saveChannelSettings", "room", SaveChannelSettingsBody>;
diff --git a/common/src/ws/message/room/save.room.settings.ts b/common/src/ws/message/room/save.room.settings.ts
new file mode 100644
index 000000000..2e235a853
--- /dev/null
+++ b/common/src/ws/message/room/save.room.settings.ts
@@ -0,0 +1,5 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {RoomNoUsersDto} from "@common/model/dto/room.dto";
+
+export type SaveRoomSettingsBody = RoomNoUsersDto;
+export type SaveRoomSettingsMessage = DefaultWsInMessage<"saveRoomSettings", "room", SaveRoomSettingsBody>;
diff --git a/common/src/ws/message/show.i.type.ts b/common/src/ws/message/room/show.i.type.ts
similarity index 100%
rename from common/src/ws/message/show.i.type.ts
rename to common/src/ws/message/room/show.i.type.ts
diff --git a/common/src/ws/message/sync/set.connection.id.ts b/common/src/ws/message/sync/set.connection.id.ts
new file mode 100644
index 000000000..50ba61f2d
--- /dev/null
+++ b/common/src/ws/message/sync/set.connection.id.ts
@@ -0,0 +1,8 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {WebRtcDefaultMessage} from "@common/legacy";
+import {ResponseWsInMessage} from "@common/ws/common";
+
+export interface WebRtcSetConnectionIdBody extends WebRtcDefaultMessage {
+  time: number;
+}
+export type WebRtcSetConnectionIdMessage = ResponseWsInMessage<WebRtcSetConnectionIdBody>;
diff --git a/common/src/ws/message/webrtc-transfer/accept.call.ts b/common/src/ws/message/webrtc-transfer/accept.call.ts
new file mode 100644
index 000000000..5269dd05e
--- /dev/null
+++ b/common/src/ws/message/webrtc-transfer/accept.call.ts
@@ -0,0 +1,10 @@
+import {DefaultWsInMessage} from "@common/ws/common";
+import {
+  OpponentWsId,
+  WebRtcDefaultMessage
+} from "@common/legacy";
+
+export interface AcceptCallBody extends OpponentWsId, WebRtcDefaultMessage {
+
+}
+export type AcceptCallMessage = DefaultWsInMessage<"acceptCall", "webrtcTransfer:*", AcceptCallBody>;
diff --git a/common/src/ws/message/webrtc-transfer/accept.file.ts b/common/src/ws/message/webrtc-transfer/accept.file.ts
new file mode 100644
index 000000000..013b054d7
--- /dev/null
+++ b/common/src/ws/message/webrtc-transfer/accept.file.ts
@@ -0,0 +1,8 @@
+import {DefaultWsInMessage} from "@common/ws/common";
+
+
+export interface AcceptFileBody {
+  received: number;
+}
+
+export type AcceptFileMessage = DefaultWsInMessage<"acceptFile", "peerConnection:*", AcceptFileBody>;
diff --git a/common/src/ws/message/webrtc-transfer/reply.call.ts b/common/src/ws/message/webrtc-transfer/reply.call.ts
new file mode 100644
index 000000000..841b5abbe
--- /dev/null
+++ b/common/src/ws/message/webrtc-transfer/reply.call.ts
@@ -0,0 +1,7 @@
+import {DefaultWsInMessage} from "@common/ws/common";
+import {ReplyWebRtc} from "@common/helpers";
+
+
+export type ReplyCallBody = ReplyWebRtc;
+
+export type ReplyCallMessage = DefaultWsInMessage<"replyCall", "webrtcTransfer:*", ReplyCallBody>;
diff --git a/common/src/ws/message/webrtc-transfer/reply.file.ts b/common/src/ws/message/webrtc-transfer/reply.file.ts
new file mode 100644
index 000000000..adcea911c
--- /dev/null
+++ b/common/src/ws/message/webrtc-transfer/reply.file.ts
@@ -0,0 +1,7 @@
+import {DefaultWsInMessage} from "@common/ws/common";
+import {ReplyWebRtc} from "@common/helpers";
+
+
+export type ReplyFileBody = ReplyWebRtc;
+
+export type ReplyFileMessage = DefaultWsInMessage<"replyFile", "webrtcTransfer:*", ReplyFileBody>;
diff --git a/common/src/ws/message/webrtc/notify.call.active.ts b/common/src/ws/message/webrtc/notify.call.active.ts
new file mode 100644
index 000000000..379c16e2c
--- /dev/null
+++ b/common/src/ws/message/webrtc/notify.call.active.ts
@@ -0,0 +1,12 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  OpponentWsId,
+  WebRtcDefaultMessage,
+} from "@common/legacy";
+
+export interface NotifyCallActiveBody extends WebRtcDefaultMessage, OpponentWsId {
+  roomId: number;
+  userId: number;
+}
+
+export type NotifyCallActiveMessage = DefaultWsInMessage<"notifyCallActive", "webrtc", NotifyCallActiveBody>;
diff --git a/common/src/ws/message/webrtc/offer.call.ts b/common/src/ws/message/webrtc/offer.call.ts
new file mode 100644
index 000000000..b8a161847
--- /dev/null
+++ b/common/src/ws/message/webrtc/offer.call.ts
@@ -0,0 +1,16 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  BrowserBase,
+  OpponentWsId,
+  WebRtcDefaultMessage,
+} from "@common/legacy";
+
+
+export interface OfferCallBody extends OpponentWsId, WebRtcDefaultMessage {
+  content: BrowserBase;
+  roomId: number;
+  userId: number;
+  time: number;
+}
+
+export type OfferCallMessage = DefaultWsInMessage<"offerCall", "webrtc", OfferCallBody>;
diff --git a/common/src/ws/message/webrtc/offer.file.ts b/common/src/ws/message/webrtc/offer.file.ts
new file mode 100644
index 000000000..d9b64dbb7
--- /dev/null
+++ b/common/src/ws/message/webrtc/offer.file.ts
@@ -0,0 +1,16 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  OfferFileContent,
+  OpponentWsId,
+  WebRtcDefaultMessage,
+} from "@common/legacy";
+
+export interface OfferFileBody extends OpponentWsId, WebRtcDefaultMessage {
+  content: OfferFileContent;
+  roomId: number;
+  threadId: number | null;
+  userId: number;
+  time: number;
+}
+
+export type OfferFileMessage = DefaultWsInMessage<"offerFile", "webrtc", OfferFileBody>;
diff --git a/common/src/ws/message/webrtc/offer.message.ts b/common/src/ws/message/webrtc/offer.message.ts
new file mode 100644
index 000000000..fa1ae52bd
--- /dev/null
+++ b/common/src/ws/message/webrtc/offer.message.ts
@@ -0,0 +1,16 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  BrowserBase,
+  OpponentWsId,
+  WebRtcDefaultMessage,
+} from "@common/legacy";
+
+
+export interface OfferBody extends OpponentWsId, WebRtcDefaultMessage {
+  content: BrowserBase;
+  roomId: number;
+  userId: number;
+  time: number;
+}
+
+export type OfferMessage = DefaultWsInMessage<"offerMessage", "webrtc", OfferBody>;
diff --git a/common/src/ws/message/ws-message/delete.message.ts b/common/src/ws/message/ws-message/delete.message.ts
new file mode 100644
index 000000000..d47064112
--- /dev/null
+++ b/common/src/ws/message/ws-message/delete.message.ts
@@ -0,0 +1,10 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import {UserDto} from "@common/model/dto/user.dto";
+
+export interface DeleteMessageBody {
+  roomId: number;
+  id: number;
+  edited: number;
+}
+
+export type DeleteMessage = DefaultWsInMessage<"deleteMessage", "ws-message", DeleteMessageBody>;
diff --git a/common/src/ws/message/print.message.ts b/common/src/ws/message/ws-message/print.message.ts
similarity index 100%
rename from common/src/ws/message/print.message.ts
rename to common/src/ws/message/ws-message/print.message.ts
diff --git a/common/src/ws/message/ws/ping.ts b/common/src/ws/message/ws/ping.ts
new file mode 100644
index 000000000..25eeafb43
--- /dev/null
+++ b/common/src/ws/message/ws/ping.ts
@@ -0,0 +1,6 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export interface PingBody {
+  time: string;
+}
+export type PingMessage = DefaultWsInMessage<"ping", "ws", PingBody>;
diff --git a/common/src/ws/message/ws/pong.ts b/common/src/ws/message/ws/pong.ts
new file mode 100644
index 000000000..badd2bb3a
--- /dev/null
+++ b/common/src/ws/message/ws/pong.ts
@@ -0,0 +1,6 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export interface PongBody {
+  time: string;
+}
+export type PongMessage = DefaultWsInMessage<"pong", "ws", PongBody>;
diff --git a/common/src/ws/message/ws/set.profile.image.ts b/common/src/ws/message/ws/set.profile.image.ts
new file mode 100644
index 000000000..67cd841df
--- /dev/null
+++ b/common/src/ws/message/ws/set.profile.image.ts
@@ -0,0 +1,6 @@
+import {DefaultWsInMessage} from "@common/ws/common";
+
+export interface SetProfileImageBody {
+  url: string;
+}
+export type SetProfileImageMessage = DefaultWsInMessage<"setProfileImage", "ws", SetProfileImageBody>;
diff --git a/common/src/ws/message/ws/set.settings.ts b/common/src/ws/message/ws/set.settings.ts
new file mode 100644
index 000000000..189277377
--- /dev/null
+++ b/common/src/ws/message/ws/set.settings.ts
@@ -0,0 +1,5 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+
+export type SetSettingBody = UserSettingsDto;
+export type SetSettingsMessage = DefaultWsInMessage<"setSettings", "ws", SetSettingBody>;
diff --git a/common/src/ws/message/ws/set.user.profile.ts b/common/src/ws/message/ws/set.user.profile.ts
new file mode 100644
index 000000000..df757827e
--- /dev/null
+++ b/common/src/ws/message/ws/set.user.profile.ts
@@ -0,0 +1,5 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+
+export type SetUserProfileBody = UserProfileDtoWoImage;
+export type SetUserProfileMessage = DefaultWsInMessage<"setUserProfile", "ws", SetUserProfileBody>;
diff --git a/common/src/ws/message/set.ws.id.ts b/common/src/ws/message/ws/set.ws.id.ts
similarity index 100%
rename from common/src/ws/message/set.ws.id.ts
rename to common/src/ws/message/ws/set.ws.id.ts
diff --git a/common/src/ws/message/ws/user.profile.changed.ts b/common/src/ws/message/ws/user.profile.changed.ts
new file mode 100644
index 000000000..46a825dd1
--- /dev/null
+++ b/common/src/ws/message/ws/user.profile.changed.ts
@@ -0,0 +1,5 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {UserDto} from "@common/model/dto/user.dto";
+
+export type UserProfileChangedBody = UserDto;
+export type UserProfileChangedMessage = DefaultWsInMessage<"userProfileChanged", "ws", UserProfileChangedBody>;

From fd656b2c7dfce4dbf5b45d2335184534da8e6ee4 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 20 May 2022 17:34:48 +0300
Subject: [PATCH 117/221] Refactoring model

---
 common/src/helpers.ts                         | 91 -------------------
 common/src/http/auth/facebook.sign.in.ts      |  2 +-
 common/src/http/auth/google.sign.in.ts        |  2 +-
 common/src/http/auth/sign.in.ts               |  6 +-
 common/src/http/auth/sign.up.ts               |  2 +-
 common/src/http/auth/validate.user.ts         |  2 +-
 common/src/http/auth/validte.email.ts         |  2 +-
 common/src/http/verify/accept.token.ts        |  2 +-
 common/src/http/verify/confirm.email.ts       |  2 +-
 .../src/http/verify/send.restore.password.ts  |  6 +-
 common/src/http/verify/verify.token.ts        |  2 +-
 common/src/model/http.base.ts                 | 24 +++++
 common/src/model/webrtc.base.ts               | 25 +++++
 common/src/model/ws.base.ts                   | 37 ++++++++
 .../destroy.call.connection.ts                |  6 +-
 .../message/peer-connection/send.rtc.data.ts  |  6 +-
 common/src/ws/message/room/add.online.user.ts |  2 +-
 .../ws/message/webrtc-transfer/accept.call.ts |  2 +-
 .../ws/message/webrtc-transfer/reply.call.ts  |  3 +-
 .../ws/message/webrtc-transfer/reply.file.ts  |  5 +-
 .../ws/message/webrtc/notify.call.active.ts   |  6 +-
 common/src/ws/message/webrtc/offer.call.ts    |  6 +-
 common/src/ws/message/webrtc/offer.file.ts    | 14 ++-
 common/src/ws/message/webrtc/offer.message.ts |  6 +-
 frontend/src/ts/classes/Fetch.ts              |  8 +-
 .../src/ts/classes/NotificationHandler.ts     | 14 +--
 frontend/src/ts/classes/Subscription.ts       |  8 +-
 frontend/src/ts/instances/routerInstance.ts   | 25 ++---
 frontend/src/ts/main.ts                       |  1 -
 .../AbstractMessageProcessor.ts               |  8 +-
 .../src/ts/message_handlers/MesageHandler.ts  | 15 ++-
 .../src/ts/message_handlers/RomHandler.ts     |  8 +-
 frontend/src/ts/message_handlers/WsHandler.ts |  4 +
 .../ts/message_handlers/WsMessageHandler.ts   |  4 +
 .../ts/message_handlers/WsMessageProcessor.ts |  2 +-
 .../message_handlers/http_modules/AuthApi.ts  |  2 +-
 .../message_handlers/http_modules/GiphyApi.ts |  4 -
 .../message_handlers/http_modules/RestApi.ts  |  5 -
 .../types/messages/inner/connect.to.remote.ts |  2 +-
 frontend/src/ts/types/messages/p2pMessages.ts |  3 +-
 frontend/src/ts/types/types.ts                | 36 ++++++--
 .../src/ts/webrtc/AbstractPeerConnection.ts   |  2 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           |  4 +
 frontend/src/ts/webrtc/call/CallHandler.ts    |  8 +-
 .../src/ts/webrtc/call/CallPeerConnection.ts  |  4 +
 frontend/src/ts/webrtc/file/FileHandler.ts    |  4 +
 .../file/FileReceiveerPeerConnection.ts       |  4 +
 .../webrtc/file/FileSenderPeerConnection.ts   |  4 +
 .../webrtc/message/MessagePeerConnection.ts   |  4 +
 .../webrtc/message/MessageTransferHandler.ts  |  1 +
 frontend/src/vue/App.vue                      |  3 +
 .../out.message/set.ws.id.transformer.ts      |  2 +-
 52 files changed, 252 insertions(+), 198 deletions(-)
 create mode 100644 common/src/model/http.base.ts
 create mode 100644 common/src/model/webrtc.base.ts
 create mode 100644 common/src/model/ws.base.ts

diff --git a/common/src/helpers.ts b/common/src/helpers.ts
index 4725dbab7..3af1370dc 100644
--- a/common/src/helpers.ts
+++ b/common/src/helpers.ts
@@ -2,105 +2,14 @@ import {ChannelDto} from "@common/model/dto/channel.dto";
 import {RoomDto} from "@common/model/dto/room.dto";
 import {MessageModelDto} from "@common/model/dto/message.model.dto";
 
-export interface CaptchaRequest {
-  captcha?: string;
-}
 
-interface TypeGeneratorForOauth1 extends SessionResponse {
-  isNewAccount: true;
-  username: string;
-}
 
-export interface ChangeUserOnlineBase {
-  online: Record<number, string[]>;
-  userId: number;
-  lastTimeOnline: number;
-  time: number;
-}
 
-export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
-  content: BrowserBase;
-  userId: number;
-}
 
-interface TypeGeneratorForOauth2 extends SessionResponse {
-  isNewAccount: false;
-}
 
-export type OauthSessionResponse =
-  TypeGeneratorForOauth1
-  | TypeGeneratorForOauth2;
 
 
-export interface SessionResponse {
-  session: string;
-}
 
 
-export interface OkResponse {
-  ok: true;
-}
 
 
-export interface ChangeUserOnlineBase {
-  online: Record<number, string[]>;
-  userId: number;
-  lastTimeOnline: number;
-  time: number;
-}
-
-
-export interface NewRoom {
-  inviterUserId: number;
-  time: number;
-}
-
-export interface RoomExistedBefore {
-  inviteeUserId: number[];
-}
-
-export interface AddRoomBase extends NewRoom, Omit<ChannelDto, "channelId">, RoomDto {
-}
-
-export interface OpponentWsId {
-  opponentWsId: string;
-}
-
-export interface WebRtcDefaultMessage {
-  connId: string;
-}
-
-export interface OfferFileContent extends BrowserBase {
-  size: number;
-  name: string;
-}
-
-export type ChangeDeviceType =
-  "i_deleted"
-  | "invited"
-  | "room_created"
-  | "someone_joined"
-  | "someone_left";
-export type ChangeOnlineType =
-  "appear_online"
-  | "gone_offline";
-
-export interface BrowserBase {
-  browser: string;
-}
-
-
-export interface ResolveCallbackId {
-  resolveCbId?: number; // If this callback id is present, resolve it
-}
-
-export type CallStatus =
-  "accepted"
-  | "not_inited"
-  | "received_offer"
-  | "sent_offer";
-
-
-export interface MessagesResponseMessage {
-  content: MessageModelDto[];
-}
diff --git a/common/src/http/auth/facebook.sign.in.ts b/common/src/http/auth/facebook.sign.in.ts
index fb09c81ef..fe084d890 100644
--- a/common/src/http/auth/facebook.sign.in.ts
+++ b/common/src/http/auth/facebook.sign.in.ts
@@ -1,4 +1,4 @@
-import type {OauthSessionResponse} from "@common/helpers";
+import {OauthSessionResponse} from "@common/model/http.base";
 
 export type FacebookSignInResponse = OauthSessionResponse;
 
diff --git a/common/src/http/auth/google.sign.in.ts b/common/src/http/auth/google.sign.in.ts
index c57b69652..b7e2a11f1 100644
--- a/common/src/http/auth/google.sign.in.ts
+++ b/common/src/http/auth/google.sign.in.ts
@@ -1,4 +1,4 @@
-import type {OauthSessionResponse} from "@common/helpers";
+import {OauthSessionResponse} from "@common/model/http.base";
 
 export type GoogleSignInResponse = OauthSessionResponse;
 
diff --git a/common/src/http/auth/sign.in.ts b/common/src/http/auth/sign.in.ts
index 1a06a24b8..fbf973f06 100644
--- a/common/src/http/auth/sign.in.ts
+++ b/common/src/http/auth/sign.in.ts
@@ -1,7 +1,7 @@
-import type {
+import {
   CaptchaRequest,
-  SessionResponse,
-} from "@common/helpers";
+  SessionResponse
+} from "@common/model/http.base";
 
 export type SignInResponse = SessionResponse;
 
diff --git a/common/src/http/auth/sign.up.ts b/common/src/http/auth/sign.up.ts
index bc122ff42..085570fa5 100644
--- a/common/src/http/auth/sign.up.ts
+++ b/common/src/http/auth/sign.up.ts
@@ -1,5 +1,5 @@
-import type {SessionResponse} from "@common/helpers";
 import type {Gender} from "@common/model/enum/gender";
+import {SessionResponse} from "@common/model/http.base";
 
 export type SignUpResponse = SessionResponse;
 
diff --git a/common/src/http/auth/validate.user.ts b/common/src/http/auth/validate.user.ts
index 9cb63685f..f87a92f10 100644
--- a/common/src/http/auth/validate.user.ts
+++ b/common/src/http/auth/validate.user.ts
@@ -1,4 +1,4 @@
-import type {OkResponse} from "@common/helpers";
+import {OkResponse} from "@common/model/http.base";
 
 export interface ValidateUserRequest {
   username: string;
diff --git a/common/src/http/auth/validte.email.ts b/common/src/http/auth/validte.email.ts
index 332df9872..75db4cc44 100644
--- a/common/src/http/auth/validte.email.ts
+++ b/common/src/http/auth/validte.email.ts
@@ -1,4 +1,4 @@
-import type {OkResponse} from "@common/helpers";
+import {OkResponse} from "@common/model/http.base";
 
 export type ValidateEmailResponse = OkResponse;
 
diff --git a/common/src/http/verify/accept.token.ts b/common/src/http/verify/accept.token.ts
index 5eb2ee48e..f734ca4a4 100644
--- a/common/src/http/verify/accept.token.ts
+++ b/common/src/http/verify/accept.token.ts
@@ -1,4 +1,4 @@
-import type {SessionResponse} from "@common/helpers";
+import {SessionResponse} from "@common/model/http.base";
 
 export type AcceptTokenResponse = SessionResponse;
 
diff --git a/common/src/http/verify/confirm.email.ts b/common/src/http/verify/confirm.email.ts
index c63edc99c..684005314 100644
--- a/common/src/http/verify/confirm.email.ts
+++ b/common/src/http/verify/confirm.email.ts
@@ -1,4 +1,4 @@
-import type {OkResponse} from "@common/helpers";
+import {OkResponse} from "@common/model/http.base";
 
 export interface ConfirmEmailRequest {
   token: string;
diff --git a/common/src/http/verify/send.restore.password.ts b/common/src/http/verify/send.restore.password.ts
index 8814c2320..19469e014 100644
--- a/common/src/http/verify/send.restore.password.ts
+++ b/common/src/http/verify/send.restore.password.ts
@@ -1,7 +1,7 @@
-import type {
+import {
   CaptchaRequest,
-  OkResponse,
-} from "@common/helpers";
+  OkResponse
+} from "@common/model/http.base";
 
 export type SendRestorePasswordResponse = OkResponse;
 
diff --git a/common/src/http/verify/verify.token.ts b/common/src/http/verify/verify.token.ts
index 09311bddb..6f4537910 100644
--- a/common/src/http/verify/verify.token.ts
+++ b/common/src/http/verify/verify.token.ts
@@ -1,4 +1,4 @@
-import type {OkResponse} from "@common/helpers";
+import {OkResponse} from "@common/model/http.base";
 
 export interface VerifyTokenRequest {
   token: string;
diff --git a/common/src/model/http.base.ts b/common/src/model/http.base.ts
new file mode 100644
index 000000000..441ab7b2a
--- /dev/null
+++ b/common/src/model/http.base.ts
@@ -0,0 +1,24 @@
+export interface CaptchaRequest {
+  captcha?: string;
+}
+
+interface TypeGeneratorForOauth1 extends SessionResponse {
+  isNewAccount: true;
+  username: string;
+}
+
+interface TypeGeneratorForOauth2 extends SessionResponse {
+  isNewAccount: false;
+}
+
+export type OauthSessionResponse =
+  TypeGeneratorForOauth1
+  | TypeGeneratorForOauth2;
+
+export interface SessionResponse {
+  session: string;
+}
+
+export interface OkResponse {
+  ok: true;
+}
diff --git a/common/src/model/webrtc.base.ts b/common/src/model/webrtc.base.ts
new file mode 100644
index 000000000..c8ed71098
--- /dev/null
+++ b/common/src/model/webrtc.base.ts
@@ -0,0 +1,25 @@
+export interface WebRtcDefaultMessage {
+  connId: string;
+}
+
+export interface OpponentWsId {
+  opponentWsId: string;
+}
+
+export interface ReplyWebRtc extends WebRtcDefaultMessage, OpponentWsId {
+  content: BrowserBase;
+  userId: number;
+}
+
+export type CallStatus =
+  "accepted"
+  | "not_inited"
+  | "received_offer"
+  | "sent_offer";
+
+
+export interface BrowserBase {
+  browser: string;
+}
+
+
diff --git a/common/src/model/ws.base.ts b/common/src/model/ws.base.ts
new file mode 100644
index 000000000..f2d61da3b
--- /dev/null
+++ b/common/src/model/ws.base.ts
@@ -0,0 +1,37 @@
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {RoomDto} from "@common/model/dto/room.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+
+export interface ChangeUserOnlineBase {
+  online: Record<number, string[]>;
+  userId: number;
+  lastTimeOnline: number;
+  time: number;
+}
+
+export interface NewRoom {
+  inviterUserId: number;
+  time: number;
+}
+
+export interface RoomExistedBefore {
+  inviteeUserId: number[];
+}
+
+export interface AddRoomBase extends NewRoom, ChannelDto, RoomDto {
+}
+
+export interface MessagesResponseMessage {
+  content: MessageModelDto[];
+}
+
+
+export type ChangeDeviceType =
+  "i_deleted"
+  | "invited"
+  | "room_created"
+  | "someone_joined"
+  | "someone_left";
+export type ChangeOnlineType =
+  "appear_online"
+  | "gone_offline";
diff --git a/common/src/ws/message/peer-connection/destroy.call.connection.ts b/common/src/ws/message/peer-connection/destroy.call.connection.ts
index 1f452ae6a..904045208 100644
--- a/common/src/ws/message/peer-connection/destroy.call.connection.ts
+++ b/common/src/ws/message/peer-connection/destroy.call.connection.ts
@@ -1,8 +1,8 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {
+import {
   OpponentWsId,
-  WebRtcDefaultMessage,
-} from "@common/legacy";
+  WebRtcDefaultMessage
+} from "@common/model/webrtc.base";
 
 
 export interface DestroyCallConnectionBody extends OpponentWsId, WebRtcDefaultMessage {
diff --git a/common/src/ws/message/peer-connection/send.rtc.data.ts b/common/src/ws/message/peer-connection/send.rtc.data.ts
index 9efa85efb..b4e5467c1 100644
--- a/common/src/ws/message/peer-connection/send.rtc.data.ts
+++ b/common/src/ws/message/peer-connection/send.rtc.data.ts
@@ -1,8 +1,8 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {
+import {
   OpponentWsId,
-  WebRtcDefaultMessage,
-} from "@common/legacy";
+  WebRtcDefaultMessage
+} from "@common/model/webrtc.base";
 
 
 export interface SendRtcDataBody extends OpponentWsId, WebRtcDefaultMessage {
diff --git a/common/src/ws/message/room/add.online.user.ts b/common/src/ws/message/room/add.online.user.ts
index 1ba88e3cf..409307b8c 100644
--- a/common/src/ws/message/room/add.online.user.ts
+++ b/common/src/ws/message/room/add.online.user.ts
@@ -1,5 +1,5 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {ChangeUserOnlineBase} from "@common/helpers";
+import type {ChangeUserOnlineBase} from "@common/model/ws.base";
 
 
 export interface AddOnlineUserBodyMessage extends ChangeUserOnlineBase {
diff --git a/common/src/ws/message/webrtc-transfer/accept.call.ts b/common/src/ws/message/webrtc-transfer/accept.call.ts
index 5269dd05e..434677a44 100644
--- a/common/src/ws/message/webrtc-transfer/accept.call.ts
+++ b/common/src/ws/message/webrtc-transfer/accept.call.ts
@@ -2,7 +2,7 @@ import {DefaultWsInMessage} from "@common/ws/common";
 import {
   OpponentWsId,
   WebRtcDefaultMessage
-} from "@common/legacy";
+} from "@common/model/webrtc.base";
 
 export interface AcceptCallBody extends OpponentWsId, WebRtcDefaultMessage {
 
diff --git a/common/src/ws/message/webrtc-transfer/reply.call.ts b/common/src/ws/message/webrtc-transfer/reply.call.ts
index 841b5abbe..711336613 100644
--- a/common/src/ws/message/webrtc-transfer/reply.call.ts
+++ b/common/src/ws/message/webrtc-transfer/reply.call.ts
@@ -1,6 +1,5 @@
 import {DefaultWsInMessage} from "@common/ws/common";
-import {ReplyWebRtc} from "@common/helpers";
-
+import {ReplyWebRtc} from "@common/model/webrtc.base";
 
 export type ReplyCallBody = ReplyWebRtc;
 
diff --git a/common/src/ws/message/webrtc-transfer/reply.file.ts b/common/src/ws/message/webrtc-transfer/reply.file.ts
index adcea911c..82e7ba1df 100644
--- a/common/src/ws/message/webrtc-transfer/reply.file.ts
+++ b/common/src/ws/message/webrtc-transfer/reply.file.ts
@@ -1,6 +1,5 @@
-import {DefaultWsInMessage} from "@common/ws/common";
-import {ReplyWebRtc} from "@common/helpers";
-
+import type {DefaultWsInMessage} from "@common/ws/common";
+import type {ReplyWebRtc} from "@common/model/webrtc.base";
 
 export type ReplyFileBody = ReplyWebRtc;
 
diff --git a/common/src/ws/message/webrtc/notify.call.active.ts b/common/src/ws/message/webrtc/notify.call.active.ts
index 379c16e2c..0bf24b7c8 100644
--- a/common/src/ws/message/webrtc/notify.call.active.ts
+++ b/common/src/ws/message/webrtc/notify.call.active.ts
@@ -1,8 +1,8 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {
+import {
   OpponentWsId,
-  WebRtcDefaultMessage,
-} from "@common/legacy";
+  WebRtcDefaultMessage
+} from "@common/model/webrtc.base";
 
 export interface NotifyCallActiveBody extends WebRtcDefaultMessage, OpponentWsId {
   roomId: number;
diff --git a/common/src/ws/message/webrtc/offer.call.ts b/common/src/ws/message/webrtc/offer.call.ts
index b8a161847..45633a0d7 100644
--- a/common/src/ws/message/webrtc/offer.call.ts
+++ b/common/src/ws/message/webrtc/offer.call.ts
@@ -1,9 +1,9 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {
+import {
   BrowserBase,
   OpponentWsId,
-  WebRtcDefaultMessage,
-} from "@common/legacy";
+  WebRtcDefaultMessage
+} from "@common/model/webrtc.base";
 
 
 export interface OfferCallBody extends OpponentWsId, WebRtcDefaultMessage {
diff --git a/common/src/ws/message/webrtc/offer.file.ts b/common/src/ws/message/webrtc/offer.file.ts
index d9b64dbb7..cb93940fc 100644
--- a/common/src/ws/message/webrtc/offer.file.ts
+++ b/common/src/ws/message/webrtc/offer.file.ts
@@ -1,9 +1,15 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {
-  OfferFileContent,
+import {
+  BrowserBase,
   OpponentWsId,
-  WebRtcDefaultMessage,
-} from "@common/legacy";
+  WebRtcDefaultMessage
+} from "@common/model/webrtc.base";
+
+
+export interface OfferFileContent extends BrowserBase {
+  size: number;
+  name: string;
+}
 
 export interface OfferFileBody extends OpponentWsId, WebRtcDefaultMessage {
   content: OfferFileContent;
diff --git a/common/src/ws/message/webrtc/offer.message.ts b/common/src/ws/message/webrtc/offer.message.ts
index fa1ae52bd..d949c57cb 100644
--- a/common/src/ws/message/webrtc/offer.message.ts
+++ b/common/src/ws/message/webrtc/offer.message.ts
@@ -1,9 +1,9 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {
+import {
   BrowserBase,
   OpponentWsId,
-  WebRtcDefaultMessage,
-} from "@common/legacy";
+  WebRtcDefaultMessage
+} from "@common/model/webrtc.base";
 
 
 export interface OfferBody extends OpponentWsId, WebRtcDefaultMessage {
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index 9c8740d45..6c5500c09 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -1,7 +1,7 @@
-import type {PostData,
-  SessionHolder,
-  UploadData} from "@/ts/types/types";
-import {XHR_API_URL} from "@/ts/utils/runtimeConsts";
+import type {
+  PostData,
+  UploadData
+} from "@/ts/types/types";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import {CONNECTION_ERROR} from "@/ts/utils/consts";
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index 23381f1ee..4533e6e27 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
@@ -16,17 +20,13 @@ import {
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {MainWindow} from "@/ts/classes/MainWindow";
 import type Subscription from "@/ts/classes/Subscription";
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
 
 
 export default class NotifierHandler extends MessageHandler {
   protected readonly logger: Logger;
 
-  protected readonly handlers: HandlerTypes<keyof Api, "*"> = {
-    internetAppear: <HandlerType<"internetAppear", "*">> this.internetAppear,
+  protected readonly handlers: HandlerTypes<keyof NotifierHandler> = {
+    internetAppear: <HandlerType<"internetAppear", InternetAppearMessage>> this.internetAppear,
   };
 
   private readonly mainWindow: MainWindow;
@@ -77,7 +77,7 @@ export default class NotifierHandler extends MessageHandler {
     this.onFocus(null);
   }
 
-  public async internetAppear(p: InternetAppearMessage) {
+  public async internetAppear() {
     if (!this.serviceWorkedTried) {
       await this.tryAgainRegisterServiceWorker();
     }
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index 6b981a2d3..a066fa936 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,11 +1,11 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {IMessageHandler} from "@common/legacy";
-import loggerFactory from "@/ts/instances/loggerFactory";
-import type {Logger} from "lines-logger";
 import {
   DefaultWsInMessage,
   HandlerName
 } from "@common/ws/common";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import {IMessageHandler} from "@common/legacy";
+import loggerFactory from "@/ts/instances/loggerFactory";
+import type {Logger} from "lines-logger";
 
 
 export default class Subscription {
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 77553dfd5..7118fac60 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -1,6 +1,13 @@
-import type {LoginMessageBody} from "@/ts/types/messages/inner/login";
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
+import type {LoginMessageBody, LoginMessage} from "@/ts/types/messages/inner/login";
 import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import type {RouterNavigateMessageBody} from "@/ts/types/messages/inner/router.navigate";
+import type {
+  RouterNavigateMessage,
+  RouterNavigateMessageBody,
+} from "@/ts/types/messages/inner/router.navigate";
 import {
   createRouter,
   createWebHashHistory,
@@ -39,10 +46,6 @@ import RoomUsersListPage from "@/vue/pages/RoomUsersListPage.vue";
 import ChannelAddRoom from "@/vue/pages/ChannelAddRoom.vue";
 import type Subscription from "@/ts/classes/Subscription";
 import type {SessionHolder} from "@/ts/types/types";
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
 
 
 export function routerFactory(sub: Subscription, sessionHolder: SessionHolder) {
@@ -199,13 +202,13 @@ export function routerFactory(sub: Subscription, sessionHolder: SessionHolder) {
   sub.subscribe("router", new class RouterProcessor extends MessageHandler {
     protected readonly logger: Logger = logger;
 
-    protected readonly handlers: HandlerTypes<keyof RouterProcessor, "router", any> = {
-      login: <HandlerType<"login", "router", LoginMessageBody>> this.login,
-      logout: <HandlerType<"logout", "router", {}>> this.logout,
-      navigate: <HandlerType<"navigate", "router", RouterNavigateMessageBody>> this.navigate,
+    protected readonly handlers: HandlerTypes<keyof RouterProcessor> = {
+      login: <HandlerType<"login", LoginMessage>> this.login,
+      logout: <HandlerType<"logout", LogoutMessage>> this.logout,
+      navigate: <HandlerType<"navigate", RouterNavigateMessage>> this.navigate,
     };
 
-    logout(a: LogoutMessage) {
+    logout() {
       router.replace("/auth/sign-in");
     }
 
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index ba1f77a6e..d1312842c 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -1,4 +1,3 @@
-import "@/assets/sass/common.sass";
 import * as constants from "@/ts/utils/consts";
 
 import * as runtimeConsts from "@/ts/utils/runtimeConsts";
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 94feb4985..0c75d420e 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -1,7 +1,3 @@
-import type {Logger} from "lines-logger";
-import loggerFactory from "@/ts/instances/loggerFactory";
-import type {MessageSupplier} from "@/ts/types/types";
-import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {
   DefaultWsInMessage,
   DefaultWsOutMessage,
@@ -9,6 +5,10 @@ import type {
   RequestWsOutMessage,
   ResponseWsInMessage,
 } from "@common/ws/common";
+import type {Logger} from "lines-logger";
+import loggerFactory from "@/ts/instances/loggerFactory";
+import type {MessageSupplier} from "@/ts/types/types";
+import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 
 export default class AbstractMessageProcessor {
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index 67947632f..aef39e09e 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,17 +1,22 @@
-import {IMessageHandler} from "@common/legacy";
+import type {
+  HandlerType,
+  HandlerTypes
+} from "@common/ws/common";
+import type {IMessageHandler} from "@common/legacy";
 import type {Logger} from "lines-logger";
 
 
 export default abstract class MessageHandler implements IMessageHandler {
   protected abstract readonly logger: Logger;
 
-  protected abstract readonly handlers: HandlerTypes<any, any>;
+  protected abstract readonly handlers: HandlerTypes<any>;
 
-  public handle(message: DefaultInMessage<string, HandlerName>) {
+  // TODO message: any
+  public handle(message: any) {
     if (!this.handlers) {
       throw Error(`${this.constructor.name} has empty handlers`);
     }
-    const handler: HandlerType<string, HandlerName> | undefined = this.handlers[message.action];
+    const handler: HandlerType<string, any> | undefined = this.handlers[message.action];
     if (handler) {
       handler.bind(this)(message);
       this.logger.debug("Notified {}.{} => message", this.constructor.name, message.action, message);
@@ -20,7 +25,7 @@ export default abstract class MessageHandler implements IMessageHandler {
     }
   }
 
-  getHandler(message: DefaultInMessage<string, HandlerName>): HandlerType<string, HandlerName> | undefined {
+  getHandler(message: any): HandlerType<string, any> | undefined {
     return this.handlers[message.action];
   }
 }
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index fdf8a67ba..7816bf432 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
@@ -62,7 +66,7 @@ import {SetStateFromWS} from "@/ts/types/dto";
 export class RoomHandler extends MessageHandler {
   protected readonly logger: Logger;
 
-  protected readonly handlers: HandlerTypes<keyof RoomHandler, "room"> = {
+  protected readonly handlers: HandlerTypes<keyof RoomHandler> = {
     deleteRoom: <HandlerType<"deleteRoom", "room">> this.deleteRoom,
     init: <HandlerType<"init", "room">> this.init,
     leaveUser: <HandlerType<"leaveUser", "room">> this.leaveUser,
@@ -163,7 +167,7 @@ export class RoomHandler extends MessageHandler {
     this.mutateRoomAddition(message, "invited");
   }
 
-  public createNewUser(message: CreateNewUsedMessage) {
+  public createNewUser(message: CreateNewUserMessage) {
     const newVar: UserModel = convertUser(message, null);
     this.store.addUser(newVar);
     message.rooms.forEach(({roomId, users}) => {
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index a46b0aae9..c245e824a 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index f44684d3d..2ce13d097 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import {
   DeleteMessage,
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index 5e1f10bbd..2b04f9416 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -1,8 +1,8 @@
+import type {ResponseWsInMessage,} from "@common/ws/common";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {ResponseWsInMessage,} from "@common/ws/common";
 import type {GrowlWsInMessage,} from "@common/ws/message/growl.message";
 
 export class WsMessageProcessor extends AbstractMessageProcessor {
diff --git a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
index 5ac897a7f..4760b9df5 100644
--- a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
@@ -1,4 +1,5 @@
 import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {GoogleSignInRequest} from "@common/http/auth/google.sign.in";
 import type {
   SignUpRequest,
   SignUpResponse,
@@ -20,7 +21,6 @@ import type {
   ValidateUserRequest,
   ValidateUserResponse,
 } from "@common/http/auth/validate.user";
-import {GoogleSignInRequest} from "@common/http/auth/google.sign.in";
 
 export default class AuthApi {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
index 46b0b7d8f..8afe5fa7f 100644
--- a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
@@ -1,10 +1,6 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {MultiResponse} from "giphy-api";
-import {
-  GIPHY_API_KEY,
-  GIPHY_URL,
-} from "@/ts/utils/consts";
 import type Fetch from "@/ts/classes/Fetch";
 
 export default class GiphyApi {
diff --git a/frontend/src/ts/message_handlers/http_modules/RestApi.ts b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
index 8ccb4ee0c..ba466aa68 100644
--- a/frontend/src/ts/message_handlers/http_modules/RestApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
@@ -1,11 +1,6 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
-import type {MultiResponse} from "giphy-api";
-import {
-  GIPHY_API_KEY,
-  GIPHY_URL,
-} from "@/ts/utils/consts";
 import type {
   OauthStatus,
   ViewUserProfileDto,
diff --git a/frontend/src/ts/types/messages/inner/connect.to.remote.ts b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
index 7743c1e65..57acac761 100644
--- a/frontend/src/ts/types/messages/inner/connect.to.remote.ts
+++ b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
@@ -1,5 +1,5 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {HandlerName} from "@common/ws/common";
+import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface ConnectToRemoteMessageBody {
   stream: MediaStream | null;
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index ed143aa83..d0f193003 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -16,7 +16,8 @@ export type P2PHandlerTypes<K extends string> = {
   [Key in K]?: P2PHandlerType<Key>
 };
 
-export interface DefaultP2pMessage<A extends string> extends DefaultMessage<A>, ResolveCallbackId {
+export interface DefaultP2pMessage<A extends string> extends DefaultMessage<A> {
+ resolveCbId?: number; // If this callback id is present, resolve it
 
 }
 
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index e56df18f9..dde50334f 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -1,6 +1,5 @@
-import {SaveFileResponse} from '@common/http/file/save.file';
-import type {
-  CallInfoModel,
+import type {SaveFileResponse} from "@common/http/file/save.file";
+import type {CallInfoModel,
   ChannelModel,
   CurrentUserInfoModel,
   CurrentUserSettingsModel,
@@ -13,9 +12,13 @@ import type {
   SendingFileTransfer,
   UploadProgressModel,
   UserModel,
-} from "@/ts/types/model";
-import {MessageStatusModel} from '@/ts/types/model';
-import type {SetStateFromStorage,} from "@/ts/types/dto";
+  MessageStatusModel} from "@/ts/types/model";
+import type {SetStateFromStorage} from "@/ts/types/dto";
+import type {
+  DefaultWsInMessage,
+  HandlerName,
+  HandlerType,
+} from "@common/ws/common";
 
 
 export type ValueFilterForKey<T extends object, U> = {
@@ -76,7 +79,7 @@ export interface SetUploadProgress {
 }
 
 export interface SetUploadXHR {
-  abortFunction: () => void;
+  abortFunction(): void;
   roomId: number;
   messageId: number;
 }
@@ -223,14 +226,14 @@ export interface IStorage {
 export interface PostData {
   url: string;
   params: any;
-  onSetAbortFunction?: (c: () => void) => void;
+  onSetAbortFunction?(c: () => void): void;
 }
 
 export interface UploadData {
   url: string;
   data: Record<string, any>;
-  onSetAbortFunction?: (e: () => void) => void;
-  onProgress?: (i: number) => void;
+  onSetAbortFunction?(e: () => void): void;
+  onProgress?(i: number): void;
 }
 
 export interface AddSendingFileTransfer {
@@ -292,6 +295,19 @@ export interface PrivateRoomsIds {
   roomUsers: Record<number, number>;
 }
 
+export interface IMessageHandler {
+  handle<H extends HandlerName>(message: DefaultWsInMessage<string, H, HandlerName>): void;
+
+  // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
+  getHandler<H extends HandlerName, A extends string>(message: DefaultWsInMessage<A, H, any>): HandlerType<any, any> | undefined;
+}
+
+export type HandlerType<K extends string, A extends DefaultWsInMessage<K, HandlerName, A["data"]>> = (a: A["data"]) => Promise<void> | void;
+
+export type HandlerTypes<K extends string> = {
+  [Key in K]?: HandlerType<Key, any>
+};
+
 export interface SetRoomsUsers {
   roomId: number;
   users: number[];
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index bcdafaf3a..64175a34f 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,3 +1,4 @@
+import type {HandlerName,} from "@common/ws/common";
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import type {SendRtcDataMessage} from "@common/legacy";
@@ -11,7 +12,6 @@ import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
-import type {HandlerName} from "@common/ws/common";
 
 
 export default abstract class AbstractPeerConnection extends MessageHandler {
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 20c9f5aec..93604c81d 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index c8f56c3c1..87327b068 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
@@ -45,10 +49,6 @@ import CallReceiverPeerConnection from "@/ts/webrtc/call/CallReceiverPeerConnect
 
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 import {stopVideo} from "@/ts/utils/htmlApi";
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
 
 
 export default class CallHandler extends FileAndCallTransfer {
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 59ef3158c..f2e1f9cd2 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 220f34d42..f37fda3e4 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index 067837db3..e22854d2c 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import type {
   SetReceivingFileStatus,
   SetReceivingFileUploaded,
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index f01dab85d..7763a1958 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import type {
   AddSendingFileTransfer,
   SetSendingFileStatus,
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 4e461d388..2426e50a5 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,3 +1,7 @@
+import type {
+  HandlerType,
+  HandlerTypes,
+} from "@common/ws/common";
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 85d1157ad..f7d0a43fb 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,3 +1,4 @@
+import type {HandlerTypes,} from "@common/ws/common";
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index a7c753e4d..b18617c82 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -39,6 +39,9 @@ export default class App extends Vue {
   }
 }
 </script>
+<style lang="sass">
+  @import "@/assets/sass/common.sass";
+</style>
 <style lang="sass" scoped>
 .body
   height: 100%
diff --git a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
index 14f9ec357..fd20c91f9 100644
--- a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
+++ b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
@@ -7,7 +7,7 @@ import {
   getRoomsOnline,
   getTransformRoomDto,
 } from "@/data/transformers/model/room.transformer";
-import type {SetWsIdWsOutMessage,} from "@common/ws/message/set.ws.id";
+import type {SetWsIdWsOutMessage} from "@common/ws/message/set.ws.id";
 
 
 export function transformSetWsId(

From efc7f727fa84a21f8ec7a6bb0fa1d5b791b4a785 Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Fri, 20 May 2022 19:04:42 +0300
Subject: [PATCH 118/221] blah

---
 .../src/ts/classes/NotificationHandler.ts     |  5 +---
 frontend/src/ts/instances/routerInstance.ts   |  5 +---
 .../AbstractMessageProcessor.ts               |  8 +-----
 .../src/ts/message_handlers/MesageHandler.ts  |  7 ++---
 .../src/ts/message_handlers/RomHandler.ts     |  5 +---
 frontend/src/ts/message_handlers/WsHandler.ts |  5 +---
 .../ts/message_handlers/WsMessageHandler.ts   |  5 +---
 .../ts/message_handlers/WsMessageProcessor.ts |  4 +--
 .../message_handlers/http_modules/AuthApi.ts  | 26 +++++--------------
 .../message_handlers/http_modules/FileApi.ts  |  5 +---
 .../http_modules/VerifyApi.ts                 | 20 +++-----------
 .../ts/types/messages/inner/pub.set.rooms.ts  |  6 ++---
 frontend/src/ts/types/types.ts                |  8 ++----
 .../src/ts/webrtc/AbstractPeerConnection.ts   |  4 +--
 frontend/src/ts/webrtc/WebRtcApi.ts           |  5 +---
 frontend/src/ts/webrtc/call/CallHandler.ts    | 12 ++-------
 .../src/ts/webrtc/call/CallPeerConnection.ts  |  5 +---
 frontend/src/ts/webrtc/file/FileHandler.ts    |  5 +---
 .../file/FileReceiveerPeerConnection.ts       |  5 +---
 .../webrtc/file/FileSenderPeerConnection.ts   |  5 +---
 .../webrtc/message/MessagePeerConnection.ts   |  5 +---
 .../webrtc/message/MessageTransferHandler.ts  |  2 +-
 22 files changed, 38 insertions(+), 119 deletions(-)

diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index 4533e6e27..66899cf7c 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 7118fac60..b3b30b2c3 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import type {LoginMessageBody, LoginMessage} from "@/ts/types/messages/inner/login";
 import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import type {
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 0c75d420e..2de921f5f 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -1,10 +1,4 @@
-import type {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage,
-} from "@common/ws/common";
+
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index aef39e09e..02bc8122c 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,8 +1,5 @@
-import type {
-  HandlerType,
-  HandlerTypes
-} from "@common/ws/common";
-import type {IMessageHandler} from "@common/legacy";
+
+
 import type {Logger} from "lines-logger";
 
 
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 7816bf432..a08ff8a86 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index c245e824a..b0e841f01 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 2ce13d097..aede01a2c 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import {
   DeleteMessage,
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index 2b04f9416..3756eed40 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -1,9 +1,9 @@
-import type {ResponseWsInMessage,} from "@common/ws/common";
+
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {GrowlWsInMessage,} from "@common/ws/message/growl.message";
+
 
 export class WsMessageProcessor extends AbstractMessageProcessor {
   private readonly sub: Subscription;
diff --git a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
index 4760b9df5..219fb53c2 100644
--- a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
@@ -1,26 +1,14 @@
-import type {GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+
 import {GoogleSignInRequest} from "@common/http/auth/google.sign.in";
-import type {
-  SignUpRequest,
-  SignUpResponse,
-} from "@common/http/auth/sign.up";
-import type {SignInRequest} from "@common/http/auth/sign.in";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
-import type {SessionResponse} from "@common/helpers";
-import type {
-  FaceBookSignInRequest,
-  FacebookSignInResponse,
-} from "@common/http/auth/facebook.sign.in";
-import type {
-  ValidateEmailResponse,
-  ValidateUserEmailRequest,
-} from "@common/http/auth/validte.email";
-import type {
-  ValidateUserRequest,
-  ValidateUserResponse,
-} from "@common/http/auth/validate.user";
+
+
+
+
 
 export default class AuthApi {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/message_handlers/http_modules/FileApi.ts b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
index 5d8d81a03..6cc5b672c 100644
--- a/frontend/src/ts/message_handlers/http_modules/FileApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
@@ -1,10 +1,7 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
-import type {
-  SaveFileRequest,
-  SaveFileResponse,
-} from "@common/http/file/save.file";
+
 
 export default class FileApi {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
index 72be1c7da..9d7b2552a 100644
--- a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
@@ -1,22 +1,10 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
-import type {
-  VerifyTokenRequest,
-  VerifyTokenResponse,
-} from "@common/http/verify/verify.token";
-import type {
-  AcceptTokenRequest,
-  AcceptTokenResponse,
-} from "@common/http/verify/accept.token";
-import type {
-  SendRestorePasswordRequest,
-  SendRestorePasswordResponse,
-} from "@common/http/verify/send.restore.password";
-import type {
-  ConfirmEmailRequest,
-  ConfirmEmailResponse,
-} from "@common/http/verify/confirm.email";
+
+
+
+
 
 export default class VerifyApi {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
index e21a69838..1e31e3955 100644
--- a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
+++ b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
@@ -1,7 +1,7 @@
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import type {RoomDto} from "@common/model/dto/room.dto";
-import type {ChannelDto} from "@common/model/dto/channel.dto";
-import type {UserDto} from "@common/model/dto/user.dto";
+
+
+
 
 
 export interface PubSetRoomsMessageBody {
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index dde50334f..7fc81feba 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -1,4 +1,4 @@
-import type {SaveFileResponse} from "@common/http/file/save.file";
+
 import type {CallInfoModel,
   ChannelModel,
   CurrentUserInfoModel,
@@ -14,11 +14,7 @@ import type {CallInfoModel,
   UserModel,
   MessageStatusModel} from "@/ts/types/model";
 import type {SetStateFromStorage} from "@/ts/types/dto";
-import type {
-  DefaultWsInMessage,
-  HandlerName,
-  HandlerType,
-} from "@common/ws/common";
+
 
 
 export type ValueFilterForKey<T extends object, U> = {
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 64175a34f..f23664e20 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,7 +1,7 @@
-import type {HandlerName,} from "@common/ws/common";
+
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import type {SendRtcDataMessage} from "@common/legacy";
+
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 93604c81d..a612031bb 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 87327b068..4b77dd0d5 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,18 +1,10 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import type {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import type {
-  AcceptCallMessage,
-  CallStatus,
-  OfferCall,
-  ReplyCallMessage,
-} from "@common/legacy";
+
 import {
   browserVersion,
   isChrome,
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index f2e1f9cd2..3d260fbf7 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index f37fda3e4..f0be58a83 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index e22854d2c..c15c0fc85 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import type {
   SetReceivingFileStatus,
   SetReceivingFileUploaded,
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 7763a1958..d3df44bff 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import type {
   AddSendingFileTransfer,
   SetSendingFileStatus,
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 2426e50a5..8347044f4 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,7 +1,4 @@
-import type {
-  HandlerType,
-  HandlerTypes,
-} from "@common/ws/common";
+
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index f7d0a43fb..3064fc995 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,4 +1,4 @@
-import type {HandlerTypes,} from "@common/ws/common";
+
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';

From e919138da3374322763653665e3557dad5723b57 Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Fri, 20 May 2022 20:52:34 +0300
Subject: [PATCH 119/221] blah2

---
 common/src/helpers.ts   |  15 ------
 frontend/src/ts/main.ts | 112 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 15 deletions(-)
 delete mode 100644 common/src/helpers.ts

diff --git a/common/src/helpers.ts b/common/src/helpers.ts
deleted file mode 100644
index 3af1370dc..000000000
--- a/common/src/helpers.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {RoomDto} from "@common/model/dto/room.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index d1312842c..864cfdf21 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -43,6 +43,118 @@ import {SessionHolderImpl} from "@/ts/classes/SessionHolderImpl";
 import {SessionHolder} from "@/ts/types/types";
 
 
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
+
 const logger: Logger = loggerFactory.getLoggerColor("main", "#007a70");
 logger.log(`Evaluating main script ${constants.GIT_HASH}`)();
 

From 8aceb5db13fe61c99bc07eca931692735e12fa3e Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Fri, 20 May 2022 21:00:20 +0300
Subject: [PATCH 120/221] blah3

---
 frontend/src/ts/classes/AudioPlayer.ts        | 112 +++++++++++++++++
 frontend/src/ts/classes/DatabaseWrapper.ts    | 112 +++++++++++++++++
 frontend/src/ts/classes/DefaultStore.ts       | 112 +++++++++++++++++
 frontend/src/ts/classes/Fetch.ts              | 112 +++++++++++++++++
 frontend/src/ts/classes/LocalStorage.ts       | 112 +++++++++++++++++
 frontend/src/ts/classes/MainWindow.ts         | 112 +++++++++++++++++
 frontend/src/ts/classes/MediaCapture.ts       | 112 +++++++++++++++++
 .../src/ts/classes/NotificationHandler.ts     | 110 ++++++++++++++++-
 frontend/src/ts/classes/SessionHolderImpl.ts  | 112 +++++++++++++++++
 frontend/src/ts/classes/Subscription.ts       | 112 +++++++++++++++++
 .../src/ts/devices/AndroidPlatformUtils.ts    | 112 +++++++++++++++++
 frontend/src/ts/devices/WebPlatformUtils.ts   | 112 +++++++++++++++++
 frontend/src/ts/devices/electron.ts           | 112 +++++++++++++++++
 frontend/src/ts/instances/loggerFactory.ts    | 112 +++++++++++++++++
 frontend/src/ts/instances/mainWindow.ts       | 112 +++++++++++++++++
 frontend/src/ts/instances/routerInstance.ts   | 110 ++++++++++++++++-
 frontend/src/ts/instances/storeInstance.ts    | 112 +++++++++++++++++
 frontend/src/ts/main.ts                       | 114 +++++++++++++++++-
 .../AbstractMessageProcessor.ts               | 110 ++++++++++++++++-
 frontend/src/ts/message_handlers/Api.ts       | 112 +++++++++++++++++
 .../src/ts/message_handlers/MesageHandler.ts  | 110 ++++++++++++++++-
 .../src/ts/message_handlers/MessageHelper.ts  | 112 +++++++++++++++++
 .../ts/message_handlers/MessageSenderProxy.ts | 112 +++++++++++++++++
 .../message_handlers/P2PMessageProcessor.ts   | 112 +++++++++++++++++
 .../src/ts/message_handlers/RomHandler.ts     | 110 ++++++++++++++++-
 frontend/src/ts/message_handlers/WsHandler.ts | 110 ++++++++++++++++-
 .../ts/message_handlers/WsMessageHandler.ts   | 110 ++++++++++++++++-
 .../ts/message_handlers/WsMessageProcessor.ts | 110 ++++++++++++++++-
 .../message_handlers/http_modules/AuthApi.ts  | 110 ++++++++++++++++-
 .../message_handlers/http_modules/FileApi.ts  | 112 +++++++++++++++++
 .../message_handlers/http_modules/GiphyApi.ts | 112 +++++++++++++++++
 .../ts/message_handlers/http_modules/JsApi.ts | 112 +++++++++++++++++
 .../message_handlers/http_modules/RestApi.ts  | 112 +++++++++++++++++
 .../http_modules/VerifyApi.ts                 | 112 +++++++++++++++++
 frontend/src/ts/sw.ts                         | 112 +++++++++++++++++
 frontend/src/ts/types/converters.ts           | 112 +++++++++++++++++
 frontend/src/ts/types/db.ts                   | 112 +++++++++++++++++
 frontend/src/ts/types/dto.ts                  | 112 +++++++++++++++++
 frontend/src/ts/types/env.d.ts                | 112 +++++++++++++++++
 frontend/src/ts/types/messages/helper.ts      | 112 +++++++++++++++++
 .../messages/inner/change.p2p.room.info.ts    | 112 +++++++++++++++++
 .../ts/types/messages/inner/change.stream.ts  | 112 +++++++++++++++++
 .../messages/inner/change.user.online.info.ts | 112 +++++++++++++++++
 .../messages/inner/check.transfer.destroy.ts  | 112 +++++++++++++++++
 .../types/messages/inner/connect.to.remote.ts | 112 +++++++++++++++++
 .../messages/inner/destroy.peer.connection.ts | 112 +++++++++++++++++
 .../types/messages/inner/internet.appear.ts   | 112 +++++++++++++++++
 frontend/src/ts/types/messages/inner/login.ts | 112 +++++++++++++++++
 .../src/ts/types/messages/inner/logout.ts     | 112 +++++++++++++++++
 .../ts/types/messages/inner/pub.set.rooms.ts  | 112 +++++++++++++++++
 .../types/messages/inner/router.navigate.ts   | 112 +++++++++++++++++
 .../inner/send.set.messages.status.ts         | 112 +++++++++++++++++
 .../src/ts/types/messages/inner/sync.p2p.ts   | 112 +++++++++++++++++
 frontend/src/ts/types/messages/p2pDto.ts      | 112 +++++++++++++++++
 frontend/src/ts/types/messages/p2pMessages.ts | 110 ++++++++++++++++-
 frontend/src/ts/types/model.ts                | 112 +++++++++++++++++
 frontend/src/ts/types/types.ts                | 110 ++++++++++++++++-
 frontend/src/ts/utils/addToHomeScreen.ts      | 112 +++++++++++++++++
 frontend/src/ts/utils/audio.ts                | 112 +++++++++++++++++
 frontend/src/ts/utils/audioprocc.ts           | 112 +++++++++++++++++
 frontend/src/ts/utils/directives.ts           | 112 +++++++++++++++++
 frontend/src/ts/utils/flags.ts                | 112 +++++++++++++++++
 frontend/src/ts/utils/htmlApi.ts              | 112 +++++++++++++++++
 frontend/src/ts/utils/mixins.ts               | 112 +++++++++++++++++
 frontend/src/ts/utils/pureFunctions.ts        | 112 +++++++++++++++++
 frontend/src/ts/utils/runtimeConsts.ts        | 112 +++++++++++++++++
 .../src/ts/webrtc/AbstractPeerConnection.ts   | 110 ++++++++++++++++-
 frontend/src/ts/webrtc/BaseTransferHandler.ts | 112 +++++++++++++++++
 frontend/src/ts/webrtc/FileAndCallTransfer.ts | 112 +++++++++++++++++
 frontend/src/ts/webrtc/WebRtcApi.ts           | 110 ++++++++++++++++-
 frontend/src/ts/webrtc/call/CallHandler.ts    | 110 ++++++++++++++++-
 .../src/ts/webrtc/call/CallPeerConnection.ts  | 110 ++++++++++++++++-
 .../webrtc/call/CallReceiverPeerConnection.ts | 112 +++++++++++++++++
 .../webrtc/call/CallSenderPeerConnection.ts   | 112 +++++++++++++++++
 frontend/src/ts/webrtc/file/FileHandler.ts    | 110 ++++++++++++++++-
 .../src/ts/webrtc/file/FilePeerConnection.ts  | 112 +++++++++++++++++
 .../file/FileReceiveerPeerConnection.ts       | 110 ++++++++++++++++-
 .../webrtc/file/FileSenderPeerConnection.ts   | 110 ++++++++++++++++-
 .../webrtc/message/MessagePeerConnection.ts   | 110 ++++++++++++++++-
 .../message/MessageReceiverPeerConnection.ts  | 112 +++++++++++++++++
 .../message/MessageSenderPeerConnection.ts    | 112 +++++++++++++++++
 .../webrtc/message/MessageTransferHandler.ts  | 110 ++++++++++++++++-
 82 files changed, 9125 insertions(+), 21 deletions(-)

diff --git a/frontend/src/ts/classes/AudioPlayer.ts b/frontend/src/ts/classes/AudioPlayer.ts
index a4a248bf8..aa06b01c5 100644
--- a/frontend/src/ts/classes/AudioPlayer.ts
+++ b/frontend/src/ts/classes/AudioPlayer.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {MainWindow} from "@/ts/classes/MainWindow";
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 8add51f33..c28730c14 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {ImageType} from '@common/model/enum/image.type';
 import type {
   IStorage,
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index be565c1a9..b50923ee0 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
 import Vuex from "vuex";
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index 6c5500c09..e9ce12c96 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {
   PostData,
   UploadData
diff --git a/frontend/src/ts/classes/LocalStorage.ts b/frontend/src/ts/classes/LocalStorage.ts
index 533235f7f..1be85c1d9 100644
--- a/frontend/src/ts/classes/LocalStorage.ts
+++ b/frontend/src/ts/classes/LocalStorage.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {
   IStorage,
diff --git a/frontend/src/ts/classes/MainWindow.ts b/frontend/src/ts/classes/MainWindow.ts
index 7de26872d..fb1e817e6 100644
--- a/frontend/src/ts/classes/MainWindow.ts
+++ b/frontend/src/ts/classes/MainWindow.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/classes/MediaCapture.ts b/frontend/src/ts/classes/MediaCapture.ts
index 94dd1a6ea..5d3a204e9 100644
--- a/frontend/src/ts/classes/MediaCapture.ts
+++ b/frontend/src/ts/classes/MediaCapture.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {stopVideo} from "@/ts/utils/htmlApi";
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index 66899cf7c..cce0e64f4 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/classes/SessionHolderImpl.ts b/frontend/src/ts/classes/SessionHolderImpl.ts
index 3c7e27618..ecfaaa744 100644
--- a/frontend/src/ts/classes/SessionHolderImpl.ts
+++ b/frontend/src/ts/classes/SessionHolderImpl.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {SessionHolder} from "@/ts/types/types";
 
 export class SessionHolderImpl implements SessionHolder {
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index a066fa936..db26743cd 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {
   DefaultWsInMessage,
   HandlerName
diff --git a/frontend/src/ts/devices/AndroidPlatformUtils.ts b/frontend/src/ts/devices/AndroidPlatformUtils.ts
index 9d1e208a3..9d49dc05c 100644
--- a/frontend/src/ts/devices/AndroidPlatformUtils.ts
+++ b/frontend/src/ts/devices/AndroidPlatformUtils.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {IS_ANDROID} from "@/ts/utils/consts";
 import type {
   permissions_type,
diff --git a/frontend/src/ts/devices/WebPlatformUtils.ts b/frontend/src/ts/devices/WebPlatformUtils.ts
index 62de3b69a..8ca292487 100644
--- a/frontend/src/ts/devices/WebPlatformUtils.ts
+++ b/frontend/src/ts/devices/WebPlatformUtils.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {
   permissions_type,
   PlatformUtil,
diff --git a/frontend/src/ts/devices/electron.ts b/frontend/src/ts/devices/electron.ts
index 6d6918e3c..55b02fa4a 100644
--- a/frontend/src/ts/devices/electron.ts
+++ b/frontend/src/ts/devices/electron.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {
   app,
   BrowserWindow,
diff --git a/frontend/src/ts/instances/loggerFactory.ts b/frontend/src/ts/instances/loggerFactory.ts
index 354c7d693..a638a4e44 100644
--- a/frontend/src/ts/instances/loggerFactory.ts
+++ b/frontend/src/ts/instances/loggerFactory.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {LogLevel} from "lines-logger";
 import {LoggerFactory} from "lines-logger";
 import {
diff --git a/frontend/src/ts/instances/mainWindow.ts b/frontend/src/ts/instances/mainWindow.ts
index 092f53461..2cf2c6350 100644
--- a/frontend/src/ts/instances/mainWindow.ts
+++ b/frontend/src/ts/instances/mainWindow.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {MainWindow} from "@/ts/classes/MainWindow";
 import {store} from "@/ts/instances/storeInstance";
 
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index b3b30b2c3..b12e79ff0 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {LoginMessageBody, LoginMessage} from "@/ts/types/messages/inner/login";
 import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import type {
diff --git a/frontend/src/ts/instances/storeInstance.ts b/frontend/src/ts/instances/storeInstance.ts
index d172916f2..b2935fd0a 100644
--- a/frontend/src/ts/instances/storeInstance.ts
+++ b/frontend/src/ts/instances/storeInstance.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {VueBase} from "vue-class-component";
 import type {VuexModule} from "vuex-module-decorators";
 import {getModule} from "vuex-module-decorators";
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index 864cfdf21..c667ccd8f 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import * as constants from "@/ts/utils/consts";
 
 import * as runtimeConsts from "@/ts/utils/runtimeConsts";
@@ -154,7 +266,7 @@ import {
 import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 
 
-
+$1
 const logger: Logger = loggerFactory.getLoggerColor("main", "#007a70");
 logger.log(`Evaluating main script ${constants.GIT_HASH}`)();
 
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 2de921f5f..17596cf29 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index c0c210123..4270df977 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import Fetch from "@/ts/classes/Fetch";
 import AuthApi from "@/ts/message_handlers/http_modules/AuthApi";
 import type {SessionHolder} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index 02bc8122c..71f360b5e 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 
 import type {Logger} from "lines-logger";
 
diff --git a/frontend/src/ts/message_handlers/MessageHelper.ts b/frontend/src/ts/message_handlers/MessageHelper.ts
index 4ad3f245f..93b79ce2e 100644
--- a/frontend/src/ts/message_handlers/MessageHelper.ts
+++ b/frontend/src/ts/message_handlers/MessageHelper.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import faviconUrl from "@/assets/img/favicon.ico";
 import {incoming} from "@/ts/utils/audio";
 import type {
diff --git a/frontend/src/ts/message_handlers/MessageSenderProxy.ts b/frontend/src/ts/message_handlers/MessageSenderProxy.ts
index dbf54818a..21a46b161 100644
--- a/frontend/src/ts/message_handlers/MessageSenderProxy.ts
+++ b/frontend/src/ts/message_handlers/MessageSenderProxy.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import type {MessageSender} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
index 5e887c989..728f05adc 100644
--- a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type {DefaultP2pMessage} from "@/ts/types/messages/p2pMessages";
 
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index a08ff8a86..569218b8e 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index b0e841f01..9e08a1967 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index aede01a2c..7d15b2338 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import {
   DeleteMessage,
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index 3756eed40..68b577407 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
index 219fb53c2..408e51968 100644
--- a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {GoogleSignInRequest} from "@common/http/auth/google.sign.in";
 
 
diff --git a/frontend/src/ts/message_handlers/http_modules/FileApi.ts b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
index 6cc5b672c..b316d90bf 100644
--- a/frontend/src/ts/message_handlers/http_modules/FileApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
diff --git a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
index 8afe5fa7f..c0ca6ca0e 100644
--- a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {MultiResponse} from "giphy-api";
diff --git a/frontend/src/ts/message_handlers/http_modules/JsApi.ts b/frontend/src/ts/message_handlers/http_modules/JsApi.ts
index 3d9c8f330..32a693f48 100644
--- a/frontend/src/ts/message_handlers/http_modules/JsApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/JsApi.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 
diff --git a/frontend/src/ts/message_handlers/http_modules/RestApi.ts b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
index ba466aa68..c384d294d 100644
--- a/frontend/src/ts/message_handlers/http_modules/RestApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
diff --git a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
index 9d7b2552a..48c8e90f3 100644
--- a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
diff --git a/frontend/src/ts/sw.ts b/frontend/src/ts/sw.ts
index 06784ba83..afc3f3cfb 100644
--- a/frontend/src/ts/sw.ts
+++ b/frontend/src/ts/sw.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {Logger} from "@/ts/utils/removeme";
 import {LoggerFactory} from "@/ts/utils/removeme";
 
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index 4831586ce..e42f43248 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
 import {ChannelDto} from '@common/model/dto/channel.dto';
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index 639196495..7cbb62996 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {Gender} from '@common/model/enum/gender';
 import type {LogLevel} from "lines-logger";
 import {MessageStatusInner} from '@/ts/types/model';
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 2d0b31865..4275b5cc8 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {UserProfileDto} from '@common/model/dto/user.profile.dto';
 import type {
   ChannelsDictModel,
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index 2325eed94..823761bdd 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type Api from "@/ts/message_handlers/Api";
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/types/messages/helper.ts b/frontend/src/ts/types/messages/helper.ts
index cdd6c756e..887dc0432 100644
--- a/frontend/src/ts/types/messages/helper.ts
+++ b/frontend/src/ts/types/messages/helper.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {
   DefaultWsInMessage,
   HandlerName
diff --git a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
index bc50d7dcf..208881ccc 100644
--- a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {ChangeDeviceType} from "@common/legacy";
 
diff --git a/frontend/src/ts/types/messages/inner/change.stream.ts b/frontend/src/ts/types/messages/inner/change.stream.ts
index a3d56e529..23b9ac498 100644
--- a/frontend/src/ts/types/messages/inner/change.stream.ts
+++ b/frontend/src/ts/types/messages/inner/change.stream.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface ChangeStreamMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/change.user.online.info.ts b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
index 7a441008f..6dbef25d4 100644
--- a/frontend/src/ts/types/messages/inner/change.user.online.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {ChangeOnlineType} from "@common/legacy";
 
diff --git a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
index 9edb0ab8d..9f512ce05 100644
--- a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
+++ b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface CheckTransferDestroyMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/connect.to.remote.ts b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
index 57acac761..3707fa78a 100644
--- a/frontend/src/ts/types/messages/inner/connect.to.remote.ts
+++ b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {HandlerName} from "@common/ws/common";
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
diff --git a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
index af7da4ef9..8114f1a50 100644
--- a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
+++ b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type DestroyPeerConnectionMessage = DefaultInnerSystemMessage<"destroy", "peerConnection:*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/internet.appear.ts b/frontend/src/ts/types/messages/inner/internet.appear.ts
index e7b57dd79..73b306b0c 100644
--- a/frontend/src/ts/types/messages/inner/internet.appear.ts
+++ b/frontend/src/ts/types/messages/inner/internet.appear.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type InternetAppearMessage = DefaultInnerSystemMessage<"internetAppear", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/login.ts b/frontend/src/ts/types/messages/inner/login.ts
index 0231d4554..18dd7a68b 100644
--- a/frontend/src/ts/types/messages/inner/login.ts
+++ b/frontend/src/ts/types/messages/inner/login.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface LoginMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/logout.ts b/frontend/src/ts/types/messages/inner/logout.ts
index ad6faf651..42aa5f2e2 100644
--- a/frontend/src/ts/types/messages/inner/logout.ts
+++ b/frontend/src/ts/types/messages/inner/logout.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type LogoutMessage = DefaultInnerSystemMessage<"logout", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
index 1e31e3955..695e66e14 100644
--- a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
+++ b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 
diff --git a/frontend/src/ts/types/messages/inner/router.navigate.ts b/frontend/src/ts/types/messages/inner/router.navigate.ts
index ab807e7e5..5274fcceb 100644
--- a/frontend/src/ts/types/messages/inner/router.navigate.ts
+++ b/frontend/src/ts/types/messages/inner/router.navigate.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface RouterNavigateMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
index 8b4598354..def567f48 100644
--- a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
+++ b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {MessageStatusModel} from "@/ts/types/model";
 
diff --git a/frontend/src/ts/types/messages/inner/sync.p2p.ts b/frontend/src/ts/types/messages/inner/sync.p2p.ts
index fb83fc330..8bd399534 100644
--- a/frontend/src/ts/types/messages/inner/sync.p2p.ts
+++ b/frontend/src/ts/types/messages/inner/sync.p2p.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface SyncP2PMessageBody {
diff --git a/frontend/src/ts/types/messages/p2pDto.ts b/frontend/src/ts/types/messages/p2pDto.ts
index 861933c41..d02cbf158 100644
--- a/frontend/src/ts/types/messages/p2pDto.ts
+++ b/frontend/src/ts/types/messages/p2pDto.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {MessageStatusModel} from "@/ts/types/model";
 
 export interface MessageP2pDto {
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index d0f193003..567ec7b76 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -3,7 +3,115 @@
  * So if we create a structure on one PC (on frontend) and handle on another (on frontend as well)
  * this file should do it
  */
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {
   MessageP2pDto,
   MessagesInfo,
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 98e95808f..e8ccd4c5d 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {ImageType} from '@common/model/enum/image.type';
 import {Gender} from '@common/model/enum/gender';
 import {MessageStatus} from '@common/model/enum/message.status';
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 7fc81feba..d022b4c64 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {CallInfoModel,
   ChannelModel,
   CurrentUserInfoModel,
diff --git a/frontend/src/ts/utils/addToHomeScreen.ts b/frontend/src/ts/utils/addToHomeScreen.ts
index 32cf3072c..b98bb86ff 100644
--- a/frontend/src/ts/utils/addToHomeScreen.ts
+++ b/frontend/src/ts/utils/addToHomeScreen.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import {isChrome} from "@/ts/utils/runtimeConsts";
 
diff --git a/frontend/src/ts/utils/audio.ts b/frontend/src/ts/utils/audio.ts
index de44b989d..fbd9df17f 100644
--- a/frontend/src/ts/utils/audio.ts
+++ b/frontend/src/ts/utils/audio.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import ChatCall from "@/assets/sounds/Call.mp3";
 import ChatIncoming from "@/assets/sounds/ChatIncoming.wav";
 import ChatLogin from "@/assets/sounds/ChatLogin.wav";
diff --git a/frontend/src/ts/utils/audioprocc.ts b/frontend/src/ts/utils/audioprocc.ts
index 1ddf088f5..14e9d69ae 100644
--- a/frontend/src/ts/utils/audioprocc.ts
+++ b/frontend/src/ts/utils/audioprocc.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {JsAudioAnalyzer} from "@/ts/types/types";
 import {extractError} from "@/ts/utils/pureFunctions";
 import {IS_DEBUG} from "@/ts/utils/consts";
diff --git a/frontend/src/ts/utils/directives.ts b/frontend/src/ts/utils/directives.ts
index 56c796139..85e5d831b 100644
--- a/frontend/src/ts/utils/directives.ts
+++ b/frontend/src/ts/utils/directives.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {IS_ANDROID} from "@/ts/utils/consts";
 import {isMobile} from "@/ts/utils/runtimeConsts";
 
diff --git a/frontend/src/ts/utils/flags.ts b/frontend/src/ts/utils/flags.ts
index 631056e96..6d4149bd6 100644
--- a/frontend/src/ts/utils/flags.ts
+++ b/frontend/src/ts/utils/flags.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import _ad from "@/assets/flags/ad.png";
 import _ae from "@/assets/flags/ae.png";
 import _af from "@/assets/flags/af.png";
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index 0826c830d..a7d7c4b9c 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {ImageType} from '@common/model/enum/image.type';
 import {
   IS_DEBUG,
diff --git a/frontend/src/ts/utils/mixins.ts b/frontend/src/ts/utils/mixins.ts
index 41fff0e97..872906b54 100644
--- a/frontend/src/ts/utils/mixins.ts
+++ b/frontend/src/ts/utils/mixins.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {VueBase} from "vue-class-component";
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index e0f55d080..9da849a94 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {MessageStatus} from '@common/model/enum/message.status';
 import type {
   FileModel,
diff --git a/frontend/src/ts/utils/runtimeConsts.ts b/frontend/src/ts/utils/runtimeConsts.ts
index 053918f45..0964fef1e 100644
--- a/frontend/src/ts/utils/runtimeConsts.ts
+++ b/frontend/src/ts/utils/runtimeConsts.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import mobile from "is-mobile";
 import {
   BACKEND_ADDRESS,
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index f23664e20..aab5d47a0 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,7 +1,115 @@
 
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/BaseTransferHandler.ts b/frontend/src/ts/webrtc/BaseTransferHandler.ts
index 77d16fe8a..35227ab57 100644
--- a/frontend/src/ts/webrtc/BaseTransferHandler.ts
+++ b/frontend/src/ts/webrtc/BaseTransferHandler.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/FileAndCallTransfer.ts b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
index b368952a9..c46cc9b32 100644
--- a/frontend/src/ts/webrtc/FileAndCallTransfer.ts
+++ b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
 import Subscription from "@/ts/classes/Subscription";
 
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index a612031bb..c895b058f 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 4b77dd0d5..c598ff76a 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 3d260fbf7..ddcf77e1c 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
diff --git a/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts b/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
index e91241277..4658838d4 100644
--- a/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
 export default class CallReceiverPeerConnection extends CallPeerConnection {
diff --git a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
index f032c73c6..3ab4ede3a 100644
--- a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index f0be58a83..43243d53b 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/file/FilePeerConnection.ts b/frontend/src/ts/webrtc/file/FilePeerConnection.ts
index e90cac153..0145bcc64 100644
--- a/frontend/src/ts/webrtc/file/FilePeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FilePeerConnection.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 
 export default abstract class FilePeerConnection extends AbstractPeerConnection {
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index c15c0fc85..73dee81b0 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {
   SetReceivingFileStatus,
   SetReceivingFileUploaded,
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index d3df44bff..925e6dea9 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {
   AddSendingFileTransfer,
   SetSendingFileStatus,
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 8347044f4..928706ae8 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';
diff --git a/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts b/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
index 0e6ac1725..373e96571 100644
--- a/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import MessagePeerConnection from "@/ts/webrtc/message/MessagePeerConnection";
 
 
diff --git a/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts b/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
index 9399e6ca5..3e2316746 100644
--- a/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
@@ -1,3 +1,115 @@
+
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
 import MessagePeerConnection from "@/ts/webrtc/message/MessagePeerConnection";
 
 export default class MessageSenderPeerConnection extends MessagePeerConnection {
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 3064fc995..bbd11dbdb 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,4 +1,112 @@
-
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import {MessageStatus} from '@common/model/enum/message.status';

From 06368715a0a25ef39543dd4c33560db3c34ea89f Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Fri, 20 May 2022 21:02:34 +0300
Subject: [PATCH 121/221] blah4

---
 frontend/src/ts/classes/AudioPlayer.ts        | 112 --------
 frontend/src/ts/classes/DatabaseWrapper.ts    | 164 ++----------
 frontend/src/ts/classes/DefaultStore.ts       | 240 +++++-------------
 frontend/src/ts/classes/Fetch.ts              | 117 +--------
 frontend/src/ts/classes/LocalStorage.ts       | 130 +---------
 frontend/src/ts/classes/MainWindow.ts         | 112 --------
 frontend/src/ts/classes/MediaCapture.ts       | 117 +--------
 .../src/ts/classes/NotificationHandler.ts     | 109 --------
 frontend/src/ts/classes/SessionHolderImpl.ts  | 112 --------
 frontend/src/ts/classes/Subscription.ts       | 117 +--------
 .../src/ts/devices/AndroidPlatformUtils.ts    | 117 +--------
 frontend/src/ts/devices/WebPlatformUtils.ts   | 117 +--------
 frontend/src/ts/devices/electron.ts           | 123 +--------
 frontend/src/ts/instances/loggerFactory.ts    | 117 +--------
 frontend/src/ts/instances/mainWindow.ts       | 112 --------
 frontend/src/ts/instances/routerInstance.ts   | 126 +--------
 frontend/src/ts/instances/storeInstance.ts    | 112 --------
 frontend/src/ts/main.ts                       | 235 +----------------
 .../AbstractMessageProcessor.ts               | 102 --------
 frontend/src/ts/message_handlers/Api.ts       | 117 +--------
 .../src/ts/message_handlers/MesageHandler.ts  | 110 --------
 .../src/ts/message_handlers/MessageHelper.ts  | 117 +--------
 .../ts/message_handlers/MessageSenderProxy.ts | 112 --------
 .../message_handlers/P2PMessageProcessor.ts   | 112 --------
 .../src/ts/message_handlers/RomHandler.ts     | 142 ++---------
 frontend/src/ts/message_handlers/WsHandler.ts | 166 ++----------
 .../ts/message_handlers/WsMessageHandler.ts   | 141 +---------
 .../ts/message_handlers/WsMessageProcessor.ts | 111 +-------
 .../message_handlers/http_modules/AuthApi.ts  | 110 +-------
 .../message_handlers/http_modules/FileApi.ts  | 109 --------
 .../message_handlers/http_modules/GiphyApi.ts | 112 --------
 .../ts/message_handlers/http_modules/JsApi.ts | 112 --------
 .../message_handlers/http_modules/RestApi.ts  | 117 +--------
 .../http_modules/VerifyApi.ts                 | 109 --------
 frontend/src/ts/sw.ts                         | 112 --------
 frontend/src/ts/types/converters.ts           | 137 +---------
 frontend/src/ts/types/db.ts                   | 112 --------
 frontend/src/ts/types/dto.ts                  | 126 +--------
 frontend/src/ts/types/env.d.ts                | 122 +--------
 frontend/src/ts/types/extensions.d.ts         |   8 +-
 frontend/src/ts/types/messages/helper.ts      | 117 +--------
 .../messages/inner/change.p2p.room.info.ts    | 111 +-------
 .../ts/types/messages/inner/change.stream.ts  | 112 --------
 .../messages/inner/change.user.online.info.ts | 111 +-------
 .../messages/inner/check.transfer.destroy.ts  | 112 --------
 .../types/messages/inner/connect.to.remote.ts | 112 --------
 .../messages/inner/destroy.peer.connection.ts | 112 --------
 .../types/messages/inner/internet.appear.ts   | 112 --------
 frontend/src/ts/types/messages/inner/login.ts | 112 --------
 .../src/ts/types/messages/inner/logout.ts     | 112 --------
 .../ts/types/messages/inner/pub.set.rooms.ts  | 112 +-------
 .../types/messages/inner/router.navigate.ts   | 112 --------
 .../inner/send.set.messages.status.ts         | 112 --------
 .../src/ts/types/messages/inner/sync.p2p.ts   | 112 --------
 frontend/src/ts/types/messages/p2pDto.ts      | 112 --------
 frontend/src/ts/types/messages/p2pMessages.ts | 113 +--------
 frontend/src/ts/types/model.ts                | 112 --------
 frontend/src/ts/types/types.ts                | 142 ++---------
 frontend/src/ts/utils/addToHomeScreen.ts      | 112 --------
 frontend/src/ts/utils/audio.ts                | 112 --------
 frontend/src/ts/utils/audioprocc.ts           | 112 --------
 frontend/src/ts/utils/directives.ts           | 112 --------
 frontend/src/ts/utils/flags.ts                | 112 --------
 frontend/src/ts/utils/htmlApi.ts              | 131 +---------
 frontend/src/ts/utils/mixins.ts               | 112 --------
 frontend/src/ts/utils/pureFunctions.ts        | 117 +--------
 frontend/src/ts/utils/runtimeConsts.ts        | 119 +--------
 .../src/ts/webrtc/AbstractPeerConnection.ts   | 112 +-------
 frontend/src/ts/webrtc/BaseTransferHandler.ts | 112 --------
 frontend/src/ts/webrtc/FileAndCallTransfer.ts | 112 --------
 frontend/src/ts/webrtc/WebRtcApi.ts           | 118 +--------
 frontend/src/ts/webrtc/call/CallHandler.ts    | 139 +---------
 .../src/ts/webrtc/call/CallPeerConnection.ts  | 132 +---------
 .../webrtc/call/CallReceiverPeerConnection.ts | 112 --------
 .../webrtc/call/CallSenderPeerConnection.ts   | 112 --------
 frontend/src/ts/webrtc/file/FileHandler.ts    | 110 +-------
 .../src/ts/webrtc/file/FilePeerConnection.ts  | 112 --------
 .../file/FileReceiveerPeerConnection.ts       | 119 +--------
 .../webrtc/file/FileSenderPeerConnection.ts   | 127 +--------
 .../webrtc/message/MessagePeerConnection.ts   | 124 +--------
 .../message/MessageReceiverPeerConnection.ts  | 112 --------
 .../message/MessageSenderPeerConnection.ts    | 112 --------
 .../webrtc/message/MessageTransferHandler.ts  | 114 +--------
 frontend/src/vue/App.vue                      |   6 +-
 frontend/src/vue/auth/ApplyResetPassword.vue  |   5 +-
 frontend/src/vue/auth/AuthPage.vue            |  10 +-
 frontend/src/vue/auth/CaptchaComponent.vue    |  13 +-
 frontend/src/vue/auth/FacebookAuth.vue        |   6 +-
 frontend/src/vue/auth/GoogleAuth.vue          |   6 +-
 frontend/src/vue/auth/RegisterFieldSet.vue    |   6 +-
 frontend/src/vue/auth/ResetPassword.vue       |   6 +-
 frontend/src/vue/auth/SignIn.vue              |   6 +-
 frontend/src/vue/auth/SignUp.vue              |   7 +-
 frontend/src/vue/auth/SocialAuthSignUp.vue    |  10 +-
 .../src/vue/chat/call/CallContainerIcons.vue  |   7 +-
 frontend/src/vue/chat/call/ChatCall.vue       |  13 +-
 frontend/src/vue/chat/call/ChatRemotePeer.vue |   8 +-
 frontend/src/vue/chat/call/IncomingCall.vue   |  11 +-
 .../vue/chat/call/InputDevicesSettings.vue    |   6 +-
 .../src/vue/chat/chatbox/ChatBackIcon.vue     |   5 +-
 frontend/src/vue/chat/chatbox/ChatBox.vue     |  13 +-
 frontend/src/vue/chat/chatbox/ChatBoxes.vue   |   6 +-
 .../src/vue/chat/chatbox/ChatIsOnlineIcon.vue |   5 +-
 frontend/src/vue/chat/chatbox/ChatNavBar.vue  |  13 +-
 .../src/vue/chat/chatbox/ChatPopupMenu.vue    |   5 +-
 .../vue/chat/chatbox/ChatShowUserTyping.vue   |   6 +-
 .../src/vue/chat/chatbox/SearchMessages.vue   |   8 +-
 .../src/vue/chat/chatbox/UserImageIcon.vue    |   6 +-
 .../src/vue/chat/chatbox/VideoContainer.vue   |   9 +-
 frontend/src/vue/chat/chatbox/VideoObject.vue |   8 +-
 .../chat/message/ChatChangeNameMessage.vue    |   6 +-
 .../vue/chat/message/ChatMessageHeader.vue    |   6 +-
 .../vue/chat/message/ChatMessageToolTip.vue   |  11 +-
 .../vue/chat/message/ChatMessageWrapper.vue   |   6 +-
 .../vue/chat/message/ChatReceivingFile.vue    |  11 +-
 .../src/vue/chat/message/ChatSendingFile.vue  |   6 +-
 .../chat/message/ChatSendingFileTransfer.vue  |  11 +-
 .../vue/chat/message/ChatSendingMessage.vue   |  14 +-
 .../src/vue/chat/message/ChatTextMessage.vue  |  12 +-
 frontend/src/vue/chat/message/ChatThread.vue  |   8 +-
 .../chat/message/ChatUserActionMessage.vue    |   6 +-
 .../vue/chat/message/ReceivingFileInfo.vue    |  11 +-
 frontend/src/vue/chat/right/ChannelTable.vue  |   6 +-
 .../chat/right/ChatRightCollapsedSection.vue  |   7 +-
 .../src/vue/chat/right/ChatRightSection.vue   |   5 +-
 .../src/vue/chat/right/PrivateRoomRow.vue     |   6 +-
 .../vue/chat/right/RoomDirectUsersTable.vue   |   5 +-
 frontend/src/vue/chat/right/RoomRightIcon.vue |   6 +-
 .../src/vue/chat/right/RoomRowWrapper.vue     |   6 +-
 frontend/src/vue/chat/right/UserFlagRow.vue   |   6 +-
 frontend/src/vue/chat/right/UserNavInfo.vue   |   6 +-
 frontend/src/vue/chat/right/UserRow.vue       |  11 +-
 .../src/vue/chat/textarea/ChatAttachments.vue |   8 +-
 .../src/vue/chat/textarea/ChatTagging.vue     |  13 +-
 .../src/vue/chat/textarea/ChatTextArea.vue    |  30 +--
 .../src/vue/chat/textarea/GiphySearch.vue     |  13 +-
 .../src/vue/chat/textarea/MediaRecorder.vue   |  12 +-
 frontend/src/vue/chat/textarea/Painter.vue    |   6 +-
 .../src/vue/chat/textarea/SmileyHolder.vue    |  13 +-
 frontend/src/vue/pages/ChannelAddRoom.vue     |   5 +-
 frontend/src/vue/pages/ChannelSettings.vue    |  20 +-
 frontend/src/vue/pages/ChannelsPage.vue       |   6 +-
 frontend/src/vue/pages/ConfirmMail.vue        |   5 +-
 frontend/src/vue/pages/CreateChannel.vue      |   5 +-
 frontend/src/vue/pages/CreatePrivateRoom.vue  |   5 +-
 frontend/src/vue/pages/EmailChanged.vue       |   5 +-
 frontend/src/vue/pages/MainPage.vue           |  10 +-
 frontend/src/vue/pages/PainterPage.vue        |   6 +-
 frontend/src/vue/pages/RoomSettings.vue       |  20 +-
 frontend/src/vue/pages/RoomUsersListPage.vue  |  16 +-
 frontend/src/vue/pages/UserProfile.vue        |  10 +-
 .../src/vue/pages/UserProfileChangeEmail.vue  |  10 +-
 .../vue/pages/UserProfileChangePassword.vue   |  10 +-
 frontend/src/vue/pages/UserProfileImage.vue   |  12 +-
 frontend/src/vue/pages/UserProfileInfo.vue    |  10 +-
 .../vue/pages/UserProfileOauthSettings.vue    |   5 +-
 .../src/vue/pages/UserProfileSettings.vue     |  21 +-
 frontend/src/vue/pages/ViewProfilePage.vue    |  10 +-
 frontend/src/vue/parts/CreateRoom.vue         |  16 +-
 frontend/src/vue/parts/Growls.vue             |   6 +-
 frontend/src/vue/parts/ParentChannel.vue      |   7 +-
 frontend/src/vue/parts/PickUser.vue           |   6 +-
 frontend/src/vue/ui/AppCheckbox.vue           |   8 +-
 frontend/src/vue/ui/AppGrowl.vue              |   6 +-
 frontend/src/vue/ui/AppImageCropper.vue       |  13 +-
 frontend/src/vue/ui/AppInputDate.vue          |   7 +-
 frontend/src/vue/ui/AppInputRange.vue         |   7 +-
 frontend/src/vue/ui/AppLoadingImage.vue       |   6 +-
 frontend/src/vue/ui/AppMenuBar.vue            |  10 +-
 frontend/src/vue/ui/AppNavWrapper.vue         |   5 +-
 frontend/src/vue/ui/AppProgressBar.vue        |   6 +-
 frontend/src/vue/ui/AppSeparator.vue          |   6 +-
 frontend/src/vue/ui/AppSubmit.vue             |   6 +-
 frontend/src/vue/ui/AppSuspense.vue           |   5 +-
 frontend/src/vue/ui/AppTab.vue                |   5 +-
 175 files changed, 381 insertions(+), 10285 deletions(-)

diff --git a/frontend/src/ts/classes/AudioPlayer.ts b/frontend/src/ts/classes/AudioPlayer.ts
index aa06b01c5..a4a248bf8 100644
--- a/frontend/src/ts/classes/AudioPlayer.ts
+++ b/frontend/src/ts/classes/AudioPlayer.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {MainWindow} from "@/ts/classes/MainWindow";
diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index c28730c14..7ddd25d55 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -1,152 +1,32 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
 import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {ImageType} from '@common/model/enum/image.type';
-import type {
-  IStorage,
-  SetFileIdsForMessage,
-  SetRoomsUsers,
-} from "@/ts/types/types";
+import type {IStorage, SetFileIdsForMessage, SetRoomsUsers,} from "@/ts/types/types";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {
-  ChannelModel,
-  ChannelsDictModel,
-  CurrentUserInfoModel,
-  CurrentUserSettingsModel,
-  FileModel,
-  MessageModel,
-  MessageStatusModel,
-  RoomDictModel,
-  RoomModel,
-  RoomSettingsModel,
-  UserModel,
+    ChannelModel,
+    ChannelsDictModel,
+    CurrentUserInfoModel,
+    CurrentUserSettingsModel,
+    FileModel,
+    MessageModel,
+    MessageStatusModel,
+    RoomDictModel,
+    RoomModel,
+    RoomSettingsModel,
+    UserModel,
 } from "@/ts/types/model";
 import {MessageStatusInner} from "@/ts/types/model";
-import {
-  convertToBoolean,
-  getChannelDict,
-  getRoomsBaseDict,
-} from "@/ts/types/converters";
+import {convertToBoolean, getChannelDict, getRoomsBaseDict,} from "@/ts/types/converters";
 import type {
-  ChannelDB,
-  FileDB,
-  MessageDB,
-  ProfileDB,
-  RoomDB,
-  RoomUsersDB,
-  SettingsDB,
-  TagDB,
-  UserDB,
+    ChannelDB,
+    FileDB,
+    MessageDB,
+    ProfileDB,
+    RoomDB,
+    RoomUsersDB,
+    SettingsDB,
+    TagDB,
+    UserDB,
 } from "@/ts/types/db";
 import type {SetStateFromStorage} from "@/ts/types/dto";
 import type {MainWindow} from "@/ts/classes/MainWindow";
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index b50923ee0..a77c0dad9 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -1,198 +1,74 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
 import Vuex from "vuex";
 
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {
-  ChannelsDictModel,
-  ChannelsDictUIModel,
-  ChannelUIModel,
-  CurrentUserInfoModel,
-  IncomingCallModel,
-  Location,
-  MessageStatusModel,
-  PastingTextAreaElement,
-  RoomDictModel,
-  SendingFileTransfer,
-  UserDictModel,
+    ChannelsDictModel,
+    ChannelsDictUIModel,
+    ChannelUIModel,
+    CurrentUserInfoModel,
+    IncomingCallModel,
+    Location,
+    MessageStatusModel,
+    PastingTextAreaElement,
+    RoomDictModel,
+    SendingFileTransfer,
+    UserDictModel,
 } from "@/ts/types/model";
 import {
-  ChannelModel,
-  CurrentUserInfoWoImage,
-  CurrentUserSettingsModel,
-  EditingMessage,
-  GrowlModel,
-  GrowlType,
-  MessageModel,
-  MessageStatusInner,
-  ReceivingFile,
-  RoomModel,
-  RoomSettingsModel,
-  SendingFile,
-  UserModel,
+    ChannelModel,
+    CurrentUserInfoWoImage,
+    CurrentUserSettingsModel,
+    EditingMessage,
+    GrowlModel,
+    GrowlType,
+    MessageModel,
+    MessageStatusInner,
+    ReceivingFile,
+    RoomModel,
+    RoomSettingsModel,
+    SendingFile,
+    UserModel,
 } from "@/ts/types/model";
 import type {PrivateRoomsIds} from "@/ts/types/types";
 import {
-  AddMessagesDTO,
-  AddSendingFileTransfer,
-  BooleanIdentifier,
-  IStorage,
-  LiveConnectionLocation,
-  MarkMessageAsRead,
-  MediaIdentifier,
-  MessagesLocation,
-  NumberIdentifier,
-  RemoveMessageProgress,
-  RoomLogEntry,
-  RoomMessageIds,
-  RoomMessagesIds,
-  SetCallOpponent,
-  SetDevices,
-  SetFileIdsForMessage,
-  SetMessageProgress,
-  SetMessageProgressError,
-  SetOpponentAnchor,
-  SetOpponentVoice,
-  SetReceivingFileStatus,
-  SetReceivingFileUploaded,
-  SetRoomsUsers,
-  SetSearchStateTo,
-  SetSearchTextTo,
-  SetSendingFileStatus,
-  SetSendingFileUploaded,
-  SetUploadProgress,
-  SetUploadXHR,
-  ShareIdentifier,
-  StringIdentifier,
+    AddMessagesDTO,
+    AddSendingFileTransfer,
+    BooleanIdentifier,
+    IStorage,
+    LiveConnectionLocation,
+    MarkMessageAsRead,
+    MediaIdentifier,
+    MessagesLocation,
+    NumberIdentifier,
+    RemoveMessageProgress,
+    RoomLogEntry,
+    RoomMessageIds,
+    RoomMessagesIds,
+    SetCallOpponent,
+    SetDevices,
+    SetFileIdsForMessage,
+    SetMessageProgress,
+    SetMessageProgressError,
+    SetOpponentAnchor,
+    SetOpponentVoice,
+    SetReceivingFileStatus,
+    SetReceivingFileUploaded,
+    SetRoomsUsers,
+    SetSearchStateTo,
+    SetSearchTextTo,
+    SetSendingFileStatus,
+    SetSendingFileUploaded,
+    SetUploadProgress,
+    SetUploadXHR,
+    ShareIdentifier,
+    StringIdentifier,
 } from "@/ts/types/types";
-import {
-  SetStateFromStorage,
-  SetStateFromWS,
-} from "@/ts/types/dto";
+import {SetStateFromStorage, SetStateFromWS,} from "@/ts/types/dto";
 import {encodeHTML} from "@/ts/utils/htmlApi";
-import {
-  ACTIVE_ROOM_ID_LS_NAME,
-  ALL_ROOM_ID,
-  SHOW_I_TYPING_INTERVAL,
-} from "@/ts/utils/consts";
-import {
-  Action,
-  Module,
-  Mutation,
-  VuexModule,
-} from "vuex-module-decorators";
+import {ACTIVE_ROOM_ID_LS_NAME, ALL_ROOM_ID, SHOW_I_TYPING_INTERVAL,} from "@/ts/utils/consts";
+import {Action, Module, Mutation, VuexModule,} from "vuex-module-decorators";
 
 
 const logger = loggerFactory.getLogger("store");
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index e9ce12c96..81f32c89c 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -1,119 +1,4 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import type {
-  PostData,
-  UploadData
-} from "@/ts/types/types";
+import type {PostData, UploadData} from "@/ts/types/types";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import {CONNECTION_ERROR} from "@/ts/utils/consts";
diff --git a/frontend/src/ts/classes/LocalStorage.ts b/frontend/src/ts/classes/LocalStorage.ts
index 1be85c1d9..0099a025d 100644
--- a/frontend/src/ts/classes/LocalStorage.ts
+++ b/frontend/src/ts/classes/LocalStorage.ts
@@ -1,128 +1,12 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import loggerFactory from "@/ts/instances/loggerFactory";
+import type {IStorage, SetFileIdsForMessage, SetRoomsUsers,} from "@/ts/types/types";
 import type {
-  IStorage,
-  SetFileIdsForMessage,
-  SetRoomsUsers,
-} from "@/ts/types/types";
-import type {
-  ChannelModel,
-  CurrentUserInfoModel,
-  CurrentUserSettingsModel,
-  MessageModel,
-  RoomSettingsModel,
-  UserModel,
+    ChannelModel,
+    CurrentUserInfoModel,
+    CurrentUserSettingsModel,
+    MessageModel,
+    RoomSettingsModel,
+    UserModel,
 } from "@/ts/types/model";
 import {MessageStatusModel} from '@/ts/types/model';
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/classes/MainWindow.ts b/frontend/src/ts/classes/MainWindow.ts
index fb1e817e6..7de26872d 100644
--- a/frontend/src/ts/classes/MainWindow.ts
+++ b/frontend/src/ts/classes/MainWindow.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/classes/MediaCapture.ts b/frontend/src/ts/classes/MediaCapture.ts
index 5d3a204e9..ce605949c 100644
--- a/frontend/src/ts/classes/MediaCapture.ts
+++ b/frontend/src/ts/classes/MediaCapture.ts
@@ -1,122 +1,7 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {stopVideo} from "@/ts/utils/htmlApi";
-import type {
-  permissions_type,
-  PlatformUtil,
-} from "@/ts/types/model";
+import type {permissions_type, PlatformUtil,} from "@/ts/types/model";
 
 export default class MediaCapture {
   private readonly isRecordingVideo: boolean;
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index cce0e64f4..d86abea92 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -1,112 +1,3 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/classes/SessionHolderImpl.ts b/frontend/src/ts/classes/SessionHolderImpl.ts
index ecfaaa744..3c7e27618 100644
--- a/frontend/src/ts/classes/SessionHolderImpl.ts
+++ b/frontend/src/ts/classes/SessionHolderImpl.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {SessionHolder} from "@/ts/types/types";
 
 export class SessionHolderImpl implements SessionHolder {
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index db26743cd..e6528e3d4 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,119 +1,4 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {
-  DefaultWsInMessage,
-  HandlerName
-} from "@common/ws/common";
+import {DefaultWsInMessage, HandlerName} from "@common/ws/common";
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {IMessageHandler} from "@common/legacy";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/devices/AndroidPlatformUtils.ts b/frontend/src/ts/devices/AndroidPlatformUtils.ts
index 9d49dc05c..f126b3113 100644
--- a/frontend/src/ts/devices/AndroidPlatformUtils.ts
+++ b/frontend/src/ts/devices/AndroidPlatformUtils.ts
@@ -1,120 +1,5 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {IS_ANDROID} from "@/ts/utils/consts";
-import type {
-  permissions_type,
-  PlatformUtil,
-} from "@/ts/types/model";
+import type {permissions_type, PlatformUtil,} from "@/ts/types/model";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 
diff --git a/frontend/src/ts/devices/WebPlatformUtils.ts b/frontend/src/ts/devices/WebPlatformUtils.ts
index 8ca292487..a506c321e 100644
--- a/frontend/src/ts/devices/WebPlatformUtils.ts
+++ b/frontend/src/ts/devices/WebPlatformUtils.ts
@@ -1,119 +1,4 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import type {
-  permissions_type,
-  PlatformUtil,
-} from "@/ts/types/model";
+import type {permissions_type, PlatformUtil,} from "@/ts/types/model";
 
 export class WebPlatformUtils implements PlatformUtil {
   public async askPermissions(...askedPermissions: permissions_type): Promise<void> {
diff --git a/frontend/src/ts/devices/electron.ts b/frontend/src/ts/devices/electron.ts
index 55b02fa4a..0c24a778f 100644
--- a/frontend/src/ts/devices/electron.ts
+++ b/frontend/src/ts/devices/electron.ts
@@ -1,125 +1,6 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {
-  app,
-  BrowserWindow,
-} from "electron";
+import {app, BrowserWindow,} from "electron";
 import * as constants from "@/ts/utils/consts";
-import {
-  ELECTRON_IGNORE_SSL,
-  ELECTRON_MAIN_FILE,
-  IS_DEBUG
-} from "@/ts/utils/consts";
+import {ELECTRON_IGNORE_SSL, ELECTRON_MAIN_FILE, IS_DEBUG} from "@/ts/utils/consts";
 
 let mainWindow: BrowserWindow | null;
 
diff --git a/frontend/src/ts/instances/loggerFactory.ts b/frontend/src/ts/instances/loggerFactory.ts
index a638a4e44..8729ad0b7 100644
--- a/frontend/src/ts/instances/loggerFactory.ts
+++ b/frontend/src/ts/instances/loggerFactory.ts
@@ -1,120 +1,5 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {LogLevel} from "lines-logger";
 import {LoggerFactory} from "lines-logger";
-import {
-  IS_DEBUG,
-  LOG_LEVEL_LS,
-} from "@/ts/utils/consts";
+import {IS_DEBUG, LOG_LEVEL_LS,} from "@/ts/utils/consts";
 
 export default new LoggerFactory(localStorage.getItem(LOG_LEVEL_LS) as LogLevel || (IS_DEBUG ? "trace" : "error"));
diff --git a/frontend/src/ts/instances/mainWindow.ts b/frontend/src/ts/instances/mainWindow.ts
index 2cf2c6350..092f53461 100644
--- a/frontend/src/ts/instances/mainWindow.ts
+++ b/frontend/src/ts/instances/mainWindow.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {MainWindow} from "@/ts/classes/MainWindow";
 import {store} from "@/ts/instances/storeInstance";
 
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index b12e79ff0..d605e29f2 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -1,122 +1,7 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-import type {LoginMessageBody, LoginMessage} from "@/ts/types/messages/inner/login";
+import type {LoginMessage, LoginMessageBody} from "@/ts/types/messages/inner/login";
 import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import type {
-  RouterNavigateMessage,
-  RouterNavigateMessageBody,
-} from "@/ts/types/messages/inner/router.navigate";
-import {
-  createRouter,
-  createWebHashHistory,
-} from "vue-router";
+import type {RouterNavigateMessage, RouterNavigateMessageBody,} from "@/ts/types/messages/inner/router.navigate";
+import {createRouter, createWebHashHistory,} from "vue-router";
 import {store} from "@/ts/instances/storeInstance";
 import MainPage from "@/vue/pages/MainPage.vue";
 import ChannelsPage from "@/vue/pages/ChannelsPage.vue";
@@ -133,10 +18,7 @@ import CreatePrivateRoom from "@/vue/pages/CreatePrivateRoom.vue";
 import ViewProfilePage from "@/vue/pages/ViewProfilePage.vue";
 import RoomSettings from "@/vue/pages/RoomSettings.vue";
 import ApplyResetPassword from "@/vue/auth/ApplyResetPassword.vue";
-import {
-  ACTIVE_ROOM_ID_LS_NAME,
-  ALL_ROOM_ID,
-} from "@/ts/utils/consts";
+import {ACTIVE_ROOM_ID_LS_NAME, ALL_ROOM_ID,} from "@/ts/utils/consts";
 import ConfirmMail from "@/vue/pages/ConfirmMail.vue";
 import UserProfileChangeEmail from "@/vue/pages/UserProfileChangeEmail.vue";
 import CreateChannel from "@/vue/pages/CreateChannel.vue";
diff --git a/frontend/src/ts/instances/storeInstance.ts b/frontend/src/ts/instances/storeInstance.ts
index b2935fd0a..d172916f2 100644
--- a/frontend/src/ts/instances/storeInstance.ts
+++ b/frontend/src/ts/instances/storeInstance.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {VueBase} from "vue-class-component";
 import type {VuexModule} from "vuex-module-decorators";
 import {getModule} from "vuex-module-decorators";
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index c667ccd8f..f40bcb03c 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -1,124 +1,7 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import * as constants from "@/ts/utils/consts";
 
 import * as runtimeConsts from "@/ts/utils/runtimeConsts";
-import {
-  browserVersion,
-  isChrome,
-  isMobile,
-  WS_API_URL
-} from "@/ts/utils/runtimeConsts";
+import {browserVersion, isChrome, isMobile, WS_API_URL} from "@/ts/utils/runtimeConsts";
 // Should be after initStore
 import App from "@/vue/App.vue";
 import {createApp} from "vue";
@@ -145,128 +28,14 @@ import {RoomHandler} from "@/ts/message_handlers/RomHandler";
 import {mainWindow} from "@/ts/instances/mainWindow";
 import {SmileysApi} from "@/ts/utils/smileys";
 import {loggerMixin} from "@/ts/utils/mixins";
-import {
-  switchDirective,
-  validityDirective,
-} from "@/ts/utils/directives";
+import {switchDirective, validityDirective,} from "@/ts/utils/directives";
 import Subscription from "@/ts/classes/Subscription";
 import type {Router} from "vue-router";
 import {SessionHolderImpl} from "@/ts/classes/SessionHolderImpl";
 import {SessionHolder} from "@/ts/types/types";
 
 
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
 
-$1
 const logger: Logger = loggerFactory.getLoggerColor("main", "#007a70");
 logger.log(`Evaluating main script ${constants.GIT_HASH}`)();
 
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 17596cf29..52928a832 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -1,104 +1,3 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
 import {
   DefaultWsInMessage,
   DefaultWsOutMessage,
@@ -106,7 +5,6 @@ import {
   RequestWsOutMessage,
   ResponseWsInMessage
 } from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {MessageSupplier} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index 4270df977..b67f361bc 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import Fetch from "@/ts/classes/Fetch";
 import AuthApi from "@/ts/message_handlers/http_modules/AuthApi";
 import type {SessionHolder} from "@/ts/types/types";
@@ -119,10 +7,7 @@ import FileApi from "@/ts/message_handlers/http_modules/FileApi";
 import RestApi from "@/ts/message_handlers/http_modules/RestApi";
 import JsApi from "@/ts/message_handlers/http_modules/JsApi";
 import GiphyApi from "@/ts/message_handlers/http_modules/GiphyApi";
-import {
-  GIPHY_API_KEY,
-  GIPHY_URL,
-} from "@/ts/utils/consts";
+import {GIPHY_API_KEY, GIPHY_URL,} from "@/ts/utils/consts";
 
 export default class Api {
   public readonly authApi: AuthApi;
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
index 71f360b5e..f086e5885 100644
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ b/frontend/src/ts/message_handlers/MesageHandler.ts
@@ -1,113 +1,3 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
 import type {Logger} from "lines-logger";
 
 
diff --git a/frontend/src/ts/message_handlers/MessageHelper.ts b/frontend/src/ts/message_handlers/MessageHelper.ts
index 93b79ce2e..fd3770cad 100644
--- a/frontend/src/ts/message_handlers/MessageHelper.ts
+++ b/frontend/src/ts/message_handlers/MessageHelper.ts
@@ -1,121 +1,6 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import faviconUrl from "@/assets/img/favicon.ico";
 import {incoming} from "@/ts/utils/audio";
-import type {
-  FileModel,
-  MessageModel,
-} from "@/ts/types/model";
+import type {FileModel, MessageModel,} from "@/ts/types/model";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {AudioPlayer} from "@/ts/classes/AudioPlayer";
diff --git a/frontend/src/ts/message_handlers/MessageSenderProxy.ts b/frontend/src/ts/message_handlers/MessageSenderProxy.ts
index 21a46b161..dbf54818a 100644
--- a/frontend/src/ts/message_handlers/MessageSenderProxy.ts
+++ b/frontend/src/ts/message_handlers/MessageSenderProxy.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import type {MessageSender} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
index 728f05adc..5e887c989 100644
--- a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type {DefaultP2pMessage} from "@/ts/types/messages/p2pMessages";
 
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 569218b8e..b51c18c8c 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,112 +1,18 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
 import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {RoomDto} from "@common/model/dto/room.dto";
+import {AddRoomBase, ChangeDeviceType} from "@common/model/ws.base";
+import {AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomMessage} from "@common/ws/message/room/add.room";
+import {DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {ShowITypeWsInMessage} from "@common/ws/message/room/show.i.type";
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
@@ -118,7 +24,6 @@ import {
   AddRoomBase,
   AddRoomMessage,
   ChangeDeviceType,
-  CreateNewUsedMessage,
   DeleteChannelMessage,
   DeleteRoomMessage,
   InviteUserMessage,
@@ -127,14 +32,9 @@ import {
   SaveChannelSettingsMessage,
   SaveRoomSettingsMessage
 } from "@common/legacy";
-import {ChannelDto} from '@common/model/dto/channel.dto';
-import {RoomDto} from '@common/model/dto/room.dto';
 import {ShowITypeWsInMessage} from '@common/ws/message/show.i.type';
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
-import type {
-  RoomLogEntry,
-  SetRoomsUsers,
-} from "@/ts/types/types";
+import type {RoomLogEntry, SetRoomsUsers,} from "@/ts/types/types";
 
 import type {
   ChannelModel,
@@ -145,12 +45,7 @@ import type {
   UserDictModel,
   UserModel,
 } from "@/ts/types/model";
-import {
-  convertUser,
-  getChannelDict,
-  getRoom,
-  getRoomsBaseDict,
-} from "@/ts/types/converters";
+import {convertUser, getChannelDict, getRoom, getRoomsBaseDict,} from "@/ts/types/converters";
 
 import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import type {Logger} from "lines-logger";
@@ -159,10 +54,7 @@ import type Api from "@/ts/message_handlers/Api";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {AudioPlayer} from "@/ts/classes/AudioPlayer";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import {
-  login,
-  logout,
-} from "@/ts/utils/audio";
+import {login, logout,} from "@/ts/utils/audio";
 import type Subscription from "@/ts/classes/Subscription";
 
 import {SetStateFromWS} from "@/ts/types/dto";
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 9e08a1967..8ed03790d 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,112 +1,28 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
 import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
+import {RoomNoUsersDto} from "@common/model/dto/room.dto";
 import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
 import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {MessagesResponseMessage} from "@common/model/ws.base";
+import {AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddRoomMessage} from "@common/ws/message/room/add.room";
+import {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {ShowITypeWsOutMessage} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {PingMessage} from "@common/ws/message/ws/ping";
+import {PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {PrintMessageWsInMessage, PrintMessageWsOutMessage} from "@common/ws/message/ws-message/print.message";
+import {GetCountryCodeWsInMessage, GetCountryCodeWsOutMessage} from "@common/ws/message/get.country.code";
+import {SetMessageStatusWsOutMessage} from "@common/ws/message/set.message.status";
+import {SyncHistoryWsInMessage, SyncHistoryWsOutMessage} from "@common/ws/message/sync.history";
+import {DefaultWsOutMessage} from "@common/ws/common";
+import {WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
@@ -121,24 +37,8 @@ import {
   UserProfileChangedMessage,
   WebRtcSetConnectionIdMessage
 } from "@common/legacy";
-import {MessageStatus} from '@common/model/enum/message.status';
-import {GiphyDto} from '@common/model/dto/giphy.dto';
-import {UserProfileDto} from '@common/model/dto/user.profile.dto';
-import {UserSettingsDto} from '@common/model/dto/user.settings.dto';
-import {
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutMessage
-} from '@common/ws/message/sync.history';
 import {ShowITypeWsOutMessage} from '@common/ws/message/show.i.type';
-import {SetMessageStatusWsOutMessage} from '@common/ws/message/set.message.status';
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutMessage
-} from '@common/ws/message/print.message';
-import {
-  GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutMessage
-} from '@common/ws/message/get.country.code';
+import {PrintMessageWsInMessage, PrintMessageWsOutMessage} from '@common/ws/message/print.message';
 import {
   CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT,
   CONNECTION_RETRY_TIME,
@@ -146,26 +46,12 @@ import {
   IS_DEBUG,
   LOG_LEVEL_LS,
 } from "@/ts/utils/consts";
-import type {
-  Logger,
-  LogLevel,
-} from "lines-logger";
+import type {Logger, LogLevel,} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
-import type {
-  CurrentUserInfoWoImage,
-  CurrentUserSettingsModel,
-  Location,
-} from "@/ts/types/model";
-import type {
-  MessageSupplier,
-  SessionHolder,
-} from "@/ts/types/types";
-import {
-  convertLocation,
-  currentUserInfoDtoToModel,
-  userSettingsDtoToModel,
-} from "@/ts/types/converters";
+import type {CurrentUserInfoWoImage, CurrentUserSettingsModel, Location,} from "@/ts/types/model";
+import type {MessageSupplier, SessionHolder,} from "@/ts/types/types";
+import {convertLocation, currentUserInfoDtoToModel, userSettingsDtoToModel,} from "@/ts/types/converters";
 
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 7d15b2338..6512c249f 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -1,128 +1,17 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
 import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
 import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
 import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
 import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {MessagesResponseMessage} from "@common/model/ws.base";
+import {DeleteMessage} from "@common/ws/message/ws-message/delete.message";
+import {PrintMessageWsInMessage} from "@common/ws/message/ws-message/print.message";
+import {SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
+import {SyncHistoryWsInMessage} from "@common/ws/message/sync.history";
+import {HandlerName} from "@common/ws/common";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {
-  DeleteMessage,
-  MessagesResponseMessage
-} from "@common/legacy";
-import {ImageType} from '@common/model/enum/image.type';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {GiphyDto} from '@common/model/dto/giphy.dto';
-import {MessageModelDto} from '@common/model/dto/message.model.dto';
-import {SyncHistoryWsInMessage} from '@common/ws/message/sync.history';
-import {SetMessageStatusWsInMessage} from '@common/ws/message/set.message.status';
+import {DeleteMessage, MessagesResponseMessage} from "@common/legacy";
 import {PrintMessageWsInMessage} from '@common/ws/message/print.message';
-import {
-  SaveFileRequest,
-  SaveFileResponse
-} from '@common/http/file/save.file';
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Api from "@/ts/message_handlers/Api";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
@@ -134,11 +23,7 @@ import type {
   SetMessageProgressError,
   SetUploadProgress,
 } from "@/ts/types/types";
-import type {
-  FileModel,
-  MessageModel,
-  RoomModel,
-} from "@/ts/types/model";
+import type {FileModel, MessageModel, RoomModel,} from "@/ts/types/model";
 import {MessageStatusInner} from "@/ts/types/model";
 import type {Logger} from "lines-logger";
 
@@ -149,15 +34,9 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import {savedFiles} from "@/ts/utils/htmlApi";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
-import {
-  LAST_SYNCED,
-  MESSAGES_PER_SEARCH,
-} from "@/ts/utils/consts";
+import {LAST_SYNCED, MESSAGES_PER_SEARCH,} from "@/ts/utils/consts";
 import {convertMessageModelDtoToModel} from "@/ts/types/converters";
-import {
-  checkIfIdIsMissing,
-  getMissingIds,
-} from "@/ts/utils/pureFunctions";
+import {checkIfIdIsMissing, getMissingIds,} from "@/ts/utils/pureFunctions";
 import type Subscription from "@/ts/classes/Subscription";
 
 
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index 68b577407..1114602fa 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -1,112 +1,5 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {ResponseWsInMessage} from "@common/ws/common";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
diff --git a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
index 408e51968..8e67e3fa5 100644
--- a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
@@ -1,113 +1,10 @@
 import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
 import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignInRequest} from "@common/http/auth/sign.in";
 import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
 import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
 import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-import {GoogleSignInRequest} from "@common/http/auth/google.sign.in";
+import {SessionResponse} from "@common/model/http.base";
 
 
 import loggerFactory from "@/ts/instances/loggerFactory";
@@ -115,9 +12,6 @@ import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
 
 
-
-
-
 export default class AuthApi {
   protected readonly logger: Logger;
 
diff --git a/frontend/src/ts/message_handlers/http_modules/FileApi.ts b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
index b316d90bf..deaa09136 100644
--- a/frontend/src/ts/message_handlers/http_modules/FileApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
@@ -1,113 +1,4 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
 import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 
 
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
index c0ca6ca0e..8afe5fa7f 100644
--- a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {MultiResponse} from "giphy-api";
diff --git a/frontend/src/ts/message_handlers/http_modules/JsApi.ts b/frontend/src/ts/message_handlers/http_modules/JsApi.ts
index 32a693f48..3d9c8f330 100644
--- a/frontend/src/ts/message_handlers/http_modules/JsApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/JsApi.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 
diff --git a/frontend/src/ts/message_handlers/http_modules/RestApi.ts b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
index c384d294d..c870fc42f 100644
--- a/frontend/src/ts/message_handlers/http_modules/RestApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
@@ -1,122 +1,7 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
-import type {
-  OauthStatus,
-  ViewUserProfileDto,
-} from "@/ts/types/dto";
+import type {OauthStatus, ViewUserProfileDto,} from "@/ts/types/dto";
 
 export default class RestApi {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
index 48c8e90f3..0e85b197c 100644
--- a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
@@ -1,113 +1,7 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
 import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
 import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
 import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
 import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 
 
 import loggerFactory from "@/ts/instances/loggerFactory";
@@ -115,9 +9,6 @@ import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
 
 
-
-
-
 export default class VerifyApi {
   protected readonly logger: Logger;
 
diff --git a/frontend/src/ts/sw.ts b/frontend/src/ts/sw.ts
index afc3f3cfb..06784ba83 100644
--- a/frontend/src/ts/sw.ts
+++ b/frontend/src/ts/sw.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {Logger} from "@/ts/utils/removeme";
 import {LoggerFactory} from "@/ts/utils/removeme";
 
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index e42f43248..e59e2a0d9 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -1,143 +1,28 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
 import {ChannelDto} from "@common/model/dto/channel.dto";
 import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
 import {LocationDto} from "@common/model/dto/location.dto";
 import {MessageModelDto} from "@common/model/dto/message.model.dto";
 import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
 import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
 import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
-import {ChannelDto} from '@common/model/dto/channel.dto';
-import {FileModelDto} from '@common/model/dto/file.model.dto';
-import {LocationDto} from '@common/model/dto/location.dto';
-import {MessageModelDto} from '@common/model/dto/message.model.dto';
-import {
-  RoomDto,
-  RoomNoUsersDto
-} from '@common/model/dto/room.dto';
-import {UserDto} from '@common/model/dto/user.dto';
-import {UserSettingsDto} from '@common/model/dto/user.settings.dto';
 import type {
-  ChannelModel,
-  CurrentUserInfoModel,
-  CurrentUserInfoWoImage,
-  CurrentUserSettingsModel,
-  FileModel,
-  Location,
-  MessageModel,
-  RoomModel,
-  RoomSettingsModel,
-  UserModel,
+    ChannelModel,
+    CurrentUserInfoModel,
+    CurrentUserInfoWoImage,
+    CurrentUserSettingsModel,
+    FileModel,
+    Location,
+    MessageModel,
+    RoomModel,
+    RoomSettingsModel,
+    UserModel,
 } from "@/ts/types/model";
 
 import type {BooleanDB,} from "@/ts/types/db";
 import type {MessageP2pDto} from "@/ts/types/messages/p2pDto";
-import {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
 
 
 export function currentUserInfoDtoToModel(userInfo: UserProfileDtoWoImage): CurrentUserInfoWoImage {
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index 7cbb62996..a9ec66196 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,116 +1,4 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {Gender} from '@common/model/enum/gender';
 import type {LogLevel} from "lines-logger";
 import {MessageStatusInner} from '@/ts/types/model';
 
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 4275b5cc8..8650bb420 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -1,123 +1,11 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {UserProfileDto} from '@common/model/dto/user.profile.dto';
+import {UserProfileDto} from "@common/model/dto/user.profile.dto";
 import type {
-  ChannelsDictModel,
-  CurrentUserInfoModel,
-  CurrentUserSettingsModel,
-  MessageStatusModel,
-  RoomDictModel,
-  UserModel,
+    ChannelsDictModel,
+    CurrentUserInfoModel,
+    CurrentUserSettingsModel,
+    MessageStatusModel,
+    RoomDictModel,
+    UserModel,
 } from "@/ts/types/model";
 
 
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index 823761bdd..58d9a0c3c 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -1,128 +1,10 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type Api from "@/ts/message_handlers/Api";
 import type {Logger} from "lines-logger";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {
-  GoogleCaptcha,
-  PlatformUtil,
-} from "@/ts/types/model";
+import type {GoogleCaptcha, PlatformUtil,} from "@/ts/types/model";
 import type WsMessageHandler from "@/ts/message_handlers/WsMessageHandler";
-import type {
-  IStorage,
-  JsAudioAnalyzer,
-} from "@/ts/types/types";
+import type {IStorage, JsAudioAnalyzer,} from "@/ts/types/types";
 import type WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import type Subscription from "@/ts/classes/Subscription";
 import type {Router} from "vue-router";
diff --git a/frontend/src/ts/types/extensions.d.ts b/frontend/src/ts/types/extensions.d.ts
index 6872e14ee..04d35f46d 100644
--- a/frontend/src/ts/types/extensions.d.ts
+++ b/frontend/src/ts/types/extensions.d.ts
@@ -63,15 +63,15 @@ declare module "*.json" {
 
 
 declare module "*.vue" {
-  import type {DefineComponent} from "vue";
+    import type {DefineComponent} from "vue";
 
-  const component: DefineComponent<{}, {}, any>;
+    const component: DefineComponent<{}, {}, any>;
   export default component;
 }
 
 declare module "*.vue.ts" {
-  import type {DefineComponent} from "vue";
+    import type {DefineComponent} from "vue";
 
-  const component: DefineComponent<{}, {}, any>;
+    const component: DefineComponent<{}, {}, any>;
   export default component;
 }
diff --git a/frontend/src/ts/types/messages/helper.ts b/frontend/src/ts/types/messages/helper.ts
index 887dc0432..abb1a0a61 100644
--- a/frontend/src/ts/types/messages/helper.ts
+++ b/frontend/src/ts/types/messages/helper.ts
@@ -1,119 +1,4 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {
-  DefaultWsInMessage,
-  HandlerName
-} from "@common/ws/common";
+import {DefaultWsInMessage, HandlerName} from "@common/ws/common";
 
 export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName, D> extends DefaultWsInMessage<A, H, D> {
   // If true, no errors should be present on handeling this message by sucrcription if nothing was notified
diff --git a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
index 208881ccc..187598f9d 100644
--- a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
@@ -1,113 +1,4 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {ChangeDeviceType} from "@common/model/ws.base";
 
 
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
diff --git a/frontend/src/ts/types/messages/inner/change.stream.ts b/frontend/src/ts/types/messages/inner/change.stream.ts
index 23b9ac498..a3d56e529 100644
--- a/frontend/src/ts/types/messages/inner/change.stream.ts
+++ b/frontend/src/ts/types/messages/inner/change.stream.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface ChangeStreamMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/change.user.online.info.ts b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
index 6dbef25d4..8599780e5 100644
--- a/frontend/src/ts/types/messages/inner/change.user.online.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
@@ -1,113 +1,4 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {ChangeOnlineType} from "@common/model/ws.base";
 
 
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
diff --git a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
index 9f512ce05..9edb0ab8d 100644
--- a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
+++ b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface CheckTransferDestroyMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/connect.to.remote.ts b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
index 3707fa78a..57acac761 100644
--- a/frontend/src/ts/types/messages/inner/connect.to.remote.ts
+++ b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {HandlerName} from "@common/ws/common";
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
diff --git a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
index 8114f1a50..af7da4ef9 100644
--- a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
+++ b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type DestroyPeerConnectionMessage = DefaultInnerSystemMessage<"destroy", "peerConnection:*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/internet.appear.ts b/frontend/src/ts/types/messages/inner/internet.appear.ts
index 73b306b0c..e7b57dd79 100644
--- a/frontend/src/ts/types/messages/inner/internet.appear.ts
+++ b/frontend/src/ts/types/messages/inner/internet.appear.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type InternetAppearMessage = DefaultInnerSystemMessage<"internetAppear", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/login.ts b/frontend/src/ts/types/messages/inner/login.ts
index 18dd7a68b..0231d4554 100644
--- a/frontend/src/ts/types/messages/inner/login.ts
+++ b/frontend/src/ts/types/messages/inner/login.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface LoginMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/logout.ts b/frontend/src/ts/types/messages/inner/logout.ts
index 42aa5f2e2..ad6faf651 100644
--- a/frontend/src/ts/types/messages/inner/logout.ts
+++ b/frontend/src/ts/types/messages/inner/logout.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type LogoutMessage = DefaultInnerSystemMessage<"logout", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
index 695e66e14..bf28b20f7 100644
--- a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
+++ b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
@@ -1,121 +1,11 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
 import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {RoomDto} from "@common/model/dto/room.dto";
 import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 
 
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 
-
-
-
 export interface PubSetRoomsMessageBody {
   rooms: RoomDto[];
   channels: ChannelDto[];
diff --git a/frontend/src/ts/types/messages/inner/router.navigate.ts b/frontend/src/ts/types/messages/inner/router.navigate.ts
index 5274fcceb..ab807e7e5 100644
--- a/frontend/src/ts/types/messages/inner/router.navigate.ts
+++ b/frontend/src/ts/types/messages/inner/router.navigate.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface RouterNavigateMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
index def567f48..8b4598354 100644
--- a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
+++ b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 import {MessageStatusModel} from "@/ts/types/model";
 
diff --git a/frontend/src/ts/types/messages/inner/sync.p2p.ts b/frontend/src/ts/types/messages/inner/sync.p2p.ts
index 8bd399534..fb83fc330 100644
--- a/frontend/src/ts/types/messages/inner/sync.p2p.ts
+++ b/frontend/src/ts/types/messages/inner/sync.p2p.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface SyncP2PMessageBody {
diff --git a/frontend/src/ts/types/messages/p2pDto.ts b/frontend/src/ts/types/messages/p2pDto.ts
index d02cbf158..861933c41 100644
--- a/frontend/src/ts/types/messages/p2pDto.ts
+++ b/frontend/src/ts/types/messages/p2pDto.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {MessageStatusModel} from "@/ts/types/model";
 
 export interface MessageP2pDto {
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index 567ec7b76..a2873de7b 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -3,119 +3,8 @@
  * So if we create a structure on one PC (on frontend) and handle on another (on frontend as well)
  * this file should do it
  */
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-import type {
-  MessageP2pDto,
-  MessagesInfo,
-} from "@/ts/types/messages/p2pDto";
+import type {MessageP2pDto, MessagesInfo,} from "@/ts/types/messages/p2pDto";
 
 
 export type P2PHandlerType<A extends string> = (a: DefaultP2pMessage<A>) => Promise<void> | void;
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index e8ccd4c5d..58fdd2f04 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,118 +1,6 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 import {Gender} from "@common/model/enum/gender";
 import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {ImageType} from '@common/model/enum/image.type';
-import {Gender} from '@common/model/enum/gender';
-import {MessageStatus} from '@common/model/enum/message.status';
 import type {LogLevel} from "lines-logger";
 
 
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index d022b4c64..84e04e56c 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -1,130 +1,24 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-import type {CallInfoModel,
-  ChannelModel,
-  CurrentUserInfoModel,
-  CurrentUserSettingsModel,
-  FileModel,
-  FileTransferStatus,
-  MessageModel,
-  RoomLog,
-  RoomModel,
-  RoomSettingsModel,
-  SendingFileTransfer,
-  UploadProgressModel,
-  UserModel,
-  MessageStatusModel} from "@/ts/types/model";
+import {SaveFileResponse} from "@common/http/file/save.file";
+import {DefaultWsInMessage, HandlerName} from "@common/ws/common";
+import type {
+    CallInfoModel,
+    ChannelModel,
+    CurrentUserInfoModel,
+    CurrentUserSettingsModel,
+    FileModel,
+    FileTransferStatus,
+    MessageModel,
+    MessageStatusModel,
+    RoomLog,
+    RoomModel,
+    RoomSettingsModel,
+    SendingFileTransfer,
+    UploadProgressModel,
+    UserModel
+} from "@/ts/types/model";
 import type {SetStateFromStorage} from "@/ts/types/dto";
 
 
-
 export type ValueFilterForKey<T extends object, U> = {
   [K in keyof T]: U extends T[K] ? K : never;
 }[keyof T];
diff --git a/frontend/src/ts/utils/addToHomeScreen.ts b/frontend/src/ts/utils/addToHomeScreen.ts
index b98bb86ff..32cf3072c 100644
--- a/frontend/src/ts/utils/addToHomeScreen.ts
+++ b/frontend/src/ts/utils/addToHomeScreen.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import loggerFactory from "@/ts/instances/loggerFactory";
 import {isChrome} from "@/ts/utils/runtimeConsts";
 
diff --git a/frontend/src/ts/utils/audio.ts b/frontend/src/ts/utils/audio.ts
index fbd9df17f..de44b989d 100644
--- a/frontend/src/ts/utils/audio.ts
+++ b/frontend/src/ts/utils/audio.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import ChatCall from "@/assets/sounds/Call.mp3";
 import ChatIncoming from "@/assets/sounds/ChatIncoming.wav";
 import ChatLogin from "@/assets/sounds/ChatLogin.wav";
diff --git a/frontend/src/ts/utils/audioprocc.ts b/frontend/src/ts/utils/audioprocc.ts
index 14e9d69ae..1ddf088f5 100644
--- a/frontend/src/ts/utils/audioprocc.ts
+++ b/frontend/src/ts/utils/audioprocc.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {JsAudioAnalyzer} from "@/ts/types/types";
 import {extractError} from "@/ts/utils/pureFunctions";
 import {IS_DEBUG} from "@/ts/utils/consts";
diff --git a/frontend/src/ts/utils/directives.ts b/frontend/src/ts/utils/directives.ts
index 85e5d831b..56c796139 100644
--- a/frontend/src/ts/utils/directives.ts
+++ b/frontend/src/ts/utils/directives.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {IS_ANDROID} from "@/ts/utils/consts";
 import {isMobile} from "@/ts/utils/runtimeConsts";
 
diff --git a/frontend/src/ts/utils/flags.ts b/frontend/src/ts/utils/flags.ts
index 6d4149bd6..631056e96 100644
--- a/frontend/src/ts/utils/flags.ts
+++ b/frontend/src/ts/utils/flags.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import _ad from "@/assets/flags/ad.png";
 import _ae from "@/assets/flags/ae.png";
 import _af from "@/assets/flags/af.png";
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index a7d7c4b9c..c09b1305d 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -1,129 +1,7 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
 import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {ImageType} from '@common/model/enum/image.type';
-import {
-  IS_DEBUG,
-  PASTED_GIPHY_CLASS,
-  PASTED_IMG_CLASS,
-  USERNAME_REGEX,
-} from "@/ts/utils/consts";
+import {IS_DEBUG, PASTED_GIPHY_CLASS, PASTED_IMG_CLASS, USERNAME_REGEX,} from "@/ts/utils/consts";
 import type {MessageDataEncode} from "@/ts/types/types";
-import type {
-  CurrentUserSettingsModel,
-  FileModel,
-  MessageModel,
-  UserModel,
-} from "@/ts/types/model";
+import type {CurrentUserSettingsModel, FileModel, MessageModel, UserModel,} from "@/ts/types/model";
 import recordIcon from "@/assets/img/audio.svg";
 import fileIcon from "@/assets/img/file.svg";
 import {getFlag} from "@/ts/utils/flags";
@@ -131,10 +9,7 @@ import videoIcon from "@/assets/img/icon-play-red.svg";
 import type {SmileysApi} from "@/ts/utils/smileys";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
-import {
-  MEDIA_API_URL,
-  webpSupported,
-} from "@/ts/utils/runtimeConsts";
+import {MEDIA_API_URL, webpSupported,} from "@/ts/utils/runtimeConsts";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GIFObject} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/utils/mixins.ts b/frontend/src/ts/utils/mixins.ts
index 872906b54..41fff0e97 100644
--- a/frontend/src/ts/utils/mixins.ts
+++ b/frontend/src/ts/utils/mixins.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {VueBase} from "vue-class-component";
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index 9da849a94..086ddcf70 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -1,120 +1,5 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {MessageStatus} from '@common/model/enum/message.status';
-import type {
-  FileModel,
-  MessageModel,
-} from "@/ts/types/model";
+import type {FileModel, MessageModel,} from "@/ts/types/model";
 import {MessageStatusInner} from '@/ts/types/model';
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {MessageSender} from "@/ts/types/types";
diff --git a/frontend/src/ts/utils/runtimeConsts.ts b/frontend/src/ts/utils/runtimeConsts.ts
index 0964fef1e..0c8c8005b 100644
--- a/frontend/src/ts/utils/runtimeConsts.ts
+++ b/frontend/src/ts/utils/runtimeConsts.ts
@@ -1,122 +1,5 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import mobile from "is-mobile";
-import {
-  BACKEND_ADDRESS,
-  IS_SSL,
-  PUBLIC_PATH,
-  WEBRTC_CONFIG,
-} from "@/ts/utils/consts";
+import {BACKEND_ADDRESS, IS_SSL, PUBLIC_PATH, WEBRTC_CONFIG,} from "@/ts/utils/consts";
 
 export const isMobile: boolean = mobile.isMobile();
 
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index aab5d47a0..5e582df26 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,115 +1,7 @@
-
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {HandlerName} from "@common/ws/common";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/BaseTransferHandler.ts b/frontend/src/ts/webrtc/BaseTransferHandler.ts
index 35227ab57..77d16fe8a 100644
--- a/frontend/src/ts/webrtc/BaseTransferHandler.ts
+++ b/frontend/src/ts/webrtc/BaseTransferHandler.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/FileAndCallTransfer.ts b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
index c46cc9b32..b368952a9 100644
--- a/frontend/src/ts/webrtc/FileAndCallTransfer.ts
+++ b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
 import Subscription from "@/ts/classes/Subscription";
 
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index c895b058f..db5d940d7 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,112 +1,7 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {HandlerName} from "@common/ws/common";
 import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
 import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
@@ -127,10 +22,7 @@ import FileHandler from "@/ts/webrtc/file/FileHandler";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import {MAX_ACCEPT_FILE_SIZE_WO_FS_API} from "@/ts/utils/consts";
-import {
-  requestFileSystem,
-  resolveMediaUrl,
-} from "@/ts/utils/htmlApi";
+import {requestFileSystem, resolveMediaUrl,} from "@/ts/utils/htmlApi";
 import FileReceiverPeerConnection from "@/ts/webrtc/file/FileReceiveerPeerConnection";
 import Subscription from "@/ts/classes/Subscription";
 import CallHandler from "@/ts/webrtc/call/CallHandler";
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index c598ff76a..96df18f7c 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,128 +1,15 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {CallStatus} from "@common/model/webrtc.base";
+import {AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
 import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import type {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
 
-import {
-  browserVersion,
-  isChrome,
-  isMobile,
-} from "@/ts/utils/runtimeConsts";
+import {browserVersion, isChrome, isMobile,} from "@/ts/utils/runtimeConsts";
 import Subscription from "@/ts/classes/Subscription";
-import type {
-  CallsInfoModel,
-  IncomingCallModel,
-} from "@/ts/types/model";
+import type {CallsInfoModel, IncomingCallModel,} from "@/ts/types/model";
 import type {
   BooleanIdentifier,
   JsAudioAnalyzer,
@@ -131,19 +18,9 @@ import type {
   SetDevices,
 } from "@/ts/types/types";
 import {VideoType} from "@/ts/types/types";
-import {
-  CHROME_EXTENSION_ID,
-  CHROME_EXTENSION_URL,
-} from "@/ts/utils/consts";
-import {
-  extractError,
-  getChromeVersion,
-} from "@/ts/utils/pureFunctions";
-import {
-  createMicrophoneLevelVoice,
-  getAverageAudioLevel,
-  removeAudioProcesssor,
-} from "@/ts/utils/audioprocc";
+import {CHROME_EXTENSION_ID, CHROME_EXTENSION_URL,} from "@/ts/utils/consts";
+import {extractError, getChromeVersion,} from "@/ts/utils/pureFunctions";
+import {createMicrophoneLevelVoice, getAverageAudioLevel, removeAudioProcesssor,} from "@/ts/utils/audioprocc";
 import CallSenderPeerConnection from "@/ts/webrtc/call/CallSenderPeerConnection";
 import CallReceiverPeerConnection from "@/ts/webrtc/call/CallReceiverPeerConnection";
 
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index ddcf77e1c..0b8610b7e 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,139 +1,15 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import {DestroyCallConnection} from "@common/legacy";
-import {
-  createMicrophoneLevelVoice,
-  getAverageAudioLevel,
-  removeAudioProcesssor,
-} from "@/ts/utils/audioprocc";
+import {createMicrophoneLevelVoice, getAverageAudioLevel, removeAudioProcesssor,} from "@/ts/utils/audioprocc";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
-import type {
-  JsAudioAnalyzer,
-  SetCallOpponent,
-  SetOpponentAnchor,
-  SetOpponentVoice,
-} from "@/ts/types/types";
+import type {JsAudioAnalyzer, SetCallOpponent, SetOpponentAnchor, SetOpponentVoice,} from "@/ts/types/types";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
-import {
-  getStreamLog,
-  getTrackLog,
-} from "@/ts/utils/pureFunctions";
-import type {
-  CallInfoModel,
-  RoomModel,
-} from "@/ts/types/model";
+import {getStreamLog, getTrackLog,} from "@/ts/utils/pureFunctions";
+import type {CallInfoModel, RoomModel,} from "@/ts/types/model";
 import {stopVideo} from "@/ts/utils/htmlApi";
 import type Subscription from "@/ts/classes/Subscription";
 
diff --git a/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts b/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
index 4658838d4..e91241277 100644
--- a/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallReceiverPeerConnection.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
 export default class CallReceiverPeerConnection extends CallPeerConnection {
diff --git a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
index 3ab4ede3a..f032c73c6 100644
--- a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 43243d53b..7d3eba581 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,112 +1,4 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/file/FilePeerConnection.ts b/frontend/src/ts/webrtc/file/FilePeerConnection.ts
index 0145bcc64..e90cac153 100644
--- a/frontend/src/ts/webrtc/file/FilePeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FilePeerConnection.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 
 export default abstract class FilePeerConnection extends AbstractPeerConnection {
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index 73dee81b0..b2a23764e 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,125 +1,12 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {DestroyFileConnectionMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
 import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-import type {
-  SetReceivingFileStatus,
-  SetReceivingFileUploaded,
-} from "@/ts/types/types";
+import type {SetReceivingFileStatus, SetReceivingFileUploaded,} from "@/ts/types/types";
 import type {ReceivingFile} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import {requestFileSystem} from "@/ts/utils/htmlApi";
-import {
-  MAX_ACCEPT_FILE_SIZE_WO_FS_API,
-  MAX_BUFFER_SIZE,
-} from "@/ts/utils/consts";
+import {MAX_ACCEPT_FILE_SIZE_WO_FS_API, MAX_BUFFER_SIZE,} from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 925e6dea9..eaf280d6f 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,128 +1,11 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-import type {
-  AddSendingFileTransfer,
-  SetSendingFileStatus,
-  SetSendingFileUploaded,
-} from "@/ts/types/types";
+import {DestroyFileConnectionMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import type {AddSendingFileTransfer, SetSendingFileStatus, SetSendingFileUploaded,} from "@/ts/types/types";
 import type {SendingFileTransfer} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
-import {
-  bytesToSize,
-  getDay,
-} from "@/ts/utils/pureFunctions";
-import {
-  READ_CHUNK_SIZE,
-  SEND_CHUNK_SIZE,
-} from "@/ts/utils/consts";
+import {bytesToSize, getDay,} from "@/ts/utils/pureFunctions";
+import {READ_CHUNK_SIZE, SEND_CHUNK_SIZE,} from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 928706ae8..5bd122fbb 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,115 +1,6 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {MessageStatus} from '@common/model/enum/message.status';
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
@@ -129,19 +20,10 @@ import type {
   SendNewP2PMessage,
   SetMessageStatusRequest,
 } from "@/ts/types/messages/p2pMessages";
-import type {
-  MessageModel,
-  RoomModel,
-} from "@/ts/types/model";
+import type {MessageModel, RoomModel,} from "@/ts/types/model";
 import {MessageStatusInner} from '@/ts/types/model';
-import type {
-  MessageP2pDto,
-  MessagesInfo,
-} from "@/ts/types/messages/p2pDto";
-import {
-  messageModelToP2p,
-  p2pMessageToModel,
-} from "@/ts/types/converters";
+import type {MessageP2pDto, MessagesInfo,} from "@/ts/types/messages/p2pDto";
+import {messageModelToP2p, p2pMessageToModel,} from "@/ts/types/converters";
 
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts b/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
index 373e96571..0e6ac1725 100644
--- a/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessageReceiverPeerConnection.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import MessagePeerConnection from "@/ts/webrtc/message/MessagePeerConnection";
 
 
diff --git a/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts b/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
index 3e2316746..9399e6ca5 100644
--- a/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessageSenderPeerConnection.ts
@@ -1,115 +1,3 @@
-
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
 import MessagePeerConnection from "@/ts/webrtc/message/MessagePeerConnection";
 
 export default class MessageSenderPeerConnection extends MessagePeerConnection {
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index bbd11dbdb..0c3fe3b79 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,120 +1,8 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
-import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
 import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
-import {MessageStatus} from '@common/model/enum/message.status';
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
-import type {
-  MessageSender,
-  UserIdConn,
-} from "@/ts/types/types";
+import type {MessageSender, UserIdConn,} from "@/ts/types/types";
 import type {RoomModel} from "@/ts/types/model";
 import MessageSenderPeerConnection from "@/ts/webrtc/message/MessageSenderPeerConnection";
 import MessageReceiverPeerConnection from "@/ts/webrtc/message/MessageReceiverPeerConnection";
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index b18617c82..1506b0e61 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -6,11 +6,7 @@
 </template>
 
 <script lang='ts'>
-import {
-  Component,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Vue, Watch,} from "vue-property-decorator";
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import Growls from "@/vue/parts/Growls.vue";
diff --git a/frontend/src/vue/auth/ApplyResetPassword.vue b/frontend/src/vue/auth/ApplyResetPassword.vue
index 45106d171..db8ffff4e 100644
--- a/frontend/src/vue/auth/ApplyResetPassword.vue
+++ b/frontend/src/vue/auth/ApplyResetPassword.vue
@@ -41,10 +41,7 @@
 </template>
 <script lang="ts">
 
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {LoginMessage} from '@/ts/types/messages/innerMessages';
diff --git a/frontend/src/vue/auth/AuthPage.vue b/frontend/src/vue/auth/AuthPage.vue
index 1a3fa1e8b..4071b3b75 100644
--- a/frontend/src/vue/auth/AuthPage.vue
+++ b/frontend/src/vue/auth/AuthPage.vue
@@ -14,14 +14,8 @@
 </template>
 
 <script lang='ts'>
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
+import {Component, Vue,} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
 import {AUTO_REGISTRATION} from "@/ts/utils/consts";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 
diff --git a/frontend/src/vue/auth/CaptchaComponent.vue b/frontend/src/vue/auth/CaptchaComponent.vue
index 07ad964ba..2d028b27f 100644
--- a/frontend/src/vue/auth/CaptchaComponent.vue
+++ b/frontend/src/vue/auth/CaptchaComponent.vue
@@ -23,17 +23,8 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
-import {
-  CAPTCHA_IFRAME,
-  RECAPTCHA_PUBLIC_KEY,
-} from "@/ts/utils/consts";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {CAPTCHA_IFRAME, RECAPTCHA_PUBLIC_KEY,} from "@/ts/utils/consts";
 import type {GoogleCaptcha} from "@/ts/types/model";
 import {ref} from "vue";
 
diff --git a/frontend/src/vue/auth/FacebookAuth.vue b/frontend/src/vue/auth/FacebookAuth.vue
index 61d497fa4..51e8128b6 100644
--- a/frontend/src/vue/auth/FacebookAuth.vue
+++ b/frontend/src/vue/auth/FacebookAuth.vue
@@ -12,11 +12,7 @@
 
 <script lang="ts">
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {FACEBOOK_APP_ID} from "@/ts/utils/consts";
 
diff --git a/frontend/src/vue/auth/GoogleAuth.vue b/frontend/src/vue/auth/GoogleAuth.vue
index 69432bb8c..a9c1a0e9f 100644
--- a/frontend/src/vue/auth/GoogleAuth.vue
+++ b/frontend/src/vue/auth/GoogleAuth.vue
@@ -11,11 +11,7 @@
 </template>
 <script lang="ts">
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {GOOGLE_OAUTH_2_CLIENT_ID} from "@/ts/utils/consts";
 
diff --git a/frontend/src/vue/auth/RegisterFieldSet.vue b/frontend/src/vue/auth/RegisterFieldSet.vue
index 7802c21c6..3baae36c9 100644
--- a/frontend/src/vue/auth/RegisterFieldSet.vue
+++ b/frontend/src/vue/auth/RegisterFieldSet.vue
@@ -11,11 +11,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {IconColor} from "@/ts/types/types";
 
 @Component({name: "FieldSet"})
diff --git a/frontend/src/vue/auth/ResetPassword.vue b/frontend/src/vue/auth/ResetPassword.vue
index 533282e95..27c9ec580 100644
--- a/frontend/src/vue/auth/ResetPassword.vue
+++ b/frontend/src/vue/auth/ResetPassword.vue
@@ -27,11 +27,7 @@
 </template>
 
 <script lang='ts'>
-import {
-  Component,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Ref, Vue,} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import CaptchaComponent from "@/vue/auth/CaptchaComponent.vue";
diff --git a/frontend/src/vue/auth/SignIn.vue b/frontend/src/vue/auth/SignIn.vue
index 4434e117f..eaca32c72 100644
--- a/frontend/src/vue/auth/SignIn.vue
+++ b/frontend/src/vue/auth/SignIn.vue
@@ -47,11 +47,7 @@
 </template>
 
 <script lang='ts'>
-import {
-  Component,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Ref, Vue,} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index 8627e9d16..3936ce065 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -118,12 +118,7 @@
 
 <script lang='ts'>
 
-import {
-  Component,
-  Prop,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Prop, Vue, Watch,} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import RegisterFieldSet from "@/vue/auth/RegisterFieldSet.vue";
diff --git a/frontend/src/vue/auth/SocialAuthSignUp.vue b/frontend/src/vue/auth/SocialAuthSignUp.vue
index bd1957a1d..37f6b042d 100644
--- a/frontend/src/vue/auth/SocialAuthSignUp.vue
+++ b/frontend/src/vue/auth/SocialAuthSignUp.vue
@@ -6,17 +6,11 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import FacebookAuth from "@/vue/auth/FacebookAuth.vue";
 import GoogleAuth from "@/vue/auth/GoogleAuth.vue";
-import {
-  FACEBOOK_APP_ID,
-  GOOGLE_OAUTH_2_CLIENT_ID,
-} from "@/ts/utils/consts";
+import {FACEBOOK_APP_ID, GOOGLE_OAUTH_2_CLIENT_ID,} from "@/ts/utils/consts";
 import {OauthSessionResponse} from "@common/helpers";
 
 
diff --git a/frontend/src/vue/chat/call/CallContainerIcons.vue b/frontend/src/vue/chat/call/CallContainerIcons.vue
index a112f6373..0fea4b561 100644
--- a/frontend/src/vue/chat/call/CallContainerIcons.vue
+++ b/frontend/src/vue/chat/call/CallContainerIcons.vue
@@ -60,12 +60,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
 import {CallsInfoModel} from "@/ts/types/model";
 
 @Component({name: "CallContainerIcons"})
diff --git a/frontend/src/vue/chat/call/ChatCall.vue b/frontend/src/vue/chat/call/ChatCall.vue
index e7a81c6a3..0fbdc9356 100644
--- a/frontend/src/vue/chat/call/ChatCall.vue
+++ b/frontend/src/vue/chat/call/ChatCall.vue
@@ -45,18 +45,9 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
 import {CallsInfoModel} from "@/ts/types/model";
-import type {
-  BooleanIdentifier,
-  ShareIdentifier,
-} from "@/ts/types/types";
+import type {BooleanIdentifier, ShareIdentifier,} from "@/ts/types/types";
 import {VideoType} from "@/ts/types/types";
 
 import ChatRemotePeer from "@/vue/chat/call/ChatRemotePeer.vue";
diff --git a/frontend/src/vue/chat/call/ChatRemotePeer.vue b/frontend/src/vue/chat/call/ChatRemotePeer.vue
index b912f8109..32684ebef 100644
--- a/frontend/src/vue/chat/call/ChatRemotePeer.vue
+++ b/frontend/src/vue/chat/call/ChatRemotePeer.vue
@@ -19,13 +19,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
 import {CallInfoModel} from "@/ts/types/model";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import VideoObject from "@/vue/chat/chatbox/VideoObject.vue";
diff --git a/frontend/src/vue/chat/call/IncomingCall.vue b/frontend/src/vue/chat/call/IncomingCall.vue
index f6bfea4c3..2db79f8d9 100644
--- a/frontend/src/vue/chat/call/IncomingCall.vue
+++ b/frontend/src/vue/chat/call/IncomingCall.vue
@@ -41,16 +41,9 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
-import {
-  IncomingCallModel,
-  RoomDictModel,
-} from "@/ts/types/model";
+import {IncomingCallModel, RoomDictModel,} from "@/ts/types/model";
 
 
 @Component({name: "IncomingCall"})
diff --git a/frontend/src/vue/chat/call/InputDevicesSettings.vue b/frontend/src/vue/chat/call/InputDevicesSettings.vue
index 6a5f166a6..3e3012860 100644
--- a/frontend/src/vue/chat/call/InputDevicesSettings.vue
+++ b/frontend/src/vue/chat/call/InputDevicesSettings.vue
@@ -70,11 +70,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {CallsInfoModel} from "@/ts/types/model";
 import type {StringIdentifier} from "@/ts/types/types";
 import {State} from "@/ts/instances/storeInstance";
diff --git a/frontend/src/vue/chat/chatbox/ChatBackIcon.vue b/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
index 1a552baf6..d00762071 100644
--- a/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
@@ -2,10 +2,7 @@
   <router-link :to="link" class="icon-left"/>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import {ALL_ROOM_ID} from "@common/consts";
 
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 63d46d768..a3fe24375 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -94,17 +94,8 @@
 </template>
 <script lang="ts">
 
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
 import ChatTextMessage from "@/vue/chat/message/ChatTextMessage.vue";
 import SearchMessages from "@/vue/chat/chatbox/SearchMessages.vue";
 import {RoomModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/chat/chatbox/ChatBoxes.vue b/frontend/src/vue/chat/chatbox/ChatBoxes.vue
index c57dd9098..4ef2988bd 100644
--- a/frontend/src/vue/chat/chatbox/ChatBoxes.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBoxes.vue
@@ -19,11 +19,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Vue, Watch,} from "vue-property-decorator";
 import ChatBox from "@/vue/chat/chatbox/ChatBox.vue";
 import {State} from "@/ts/instances/storeInstance";
 import {ALL_ROOM_ID} from "@common/consts";
diff --git a/frontend/src/vue/chat/chatbox/ChatIsOnlineIcon.vue b/frontend/src/vue/chat/chatbox/ChatIsOnlineIcon.vue
index 2bff046c8..062a50397 100644
--- a/frontend/src/vue/chat/chatbox/ChatIsOnlineIcon.vue
+++ b/frontend/src/vue/chat/chatbox/ChatIsOnlineIcon.vue
@@ -6,10 +6,7 @@
   >●</span>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 
 @Component({name: "ChatIsOnlineIcon"})
diff --git a/frontend/src/vue/chat/chatbox/ChatNavBar.vue b/frontend/src/vue/chat/chatbox/ChatNavBar.vue
index c477ae189..d927323c8 100644
--- a/frontend/src/vue/chat/chatbox/ChatNavBar.vue
+++ b/frontend/src/vue/chat/chatbox/ChatNavBar.vue
@@ -28,20 +28,11 @@
   </app-nav-wrapper>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
 import AppNavWrapper from "@/vue/ui/AppNavWrapper.vue";
 import {State} from "@/ts/instances/storeInstance";
 import type {UserModel} from "@/ts/types/model";
-import {
-  ChannelsDictUIModel,
-  RoomModel,
-  UserDictModel,
-} from "@/ts/types/model";
+import {ChannelsDictUIModel, RoomModel, UserDictModel,} from "@/ts/types/model";
 import ChatIsOnlineIcon from "@/vue/chat/chatbox/ChatIsOnlineIcon.vue";
 import {PrivateRoomsIds} from "@/ts/types/types";
 import UserNavInfo from "@/vue/chat/right/UserNavInfo.vue";
diff --git a/frontend/src/vue/chat/chatbox/ChatPopupMenu.vue b/frontend/src/vue/chat/chatbox/ChatPopupMenu.vue
index 8c0bc69f8..0780f8579 100644
--- a/frontend/src/vue/chat/chatbox/ChatPopupMenu.vue
+++ b/frontend/src/vue/chat/chatbox/ChatPopupMenu.vue
@@ -29,10 +29,7 @@
   </app-modal>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import {RoomModel} from "@/ts/types/model";
 import AppModal from "@/vue/ui/AppModal.vue";
diff --git a/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue b/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
index 55eac1997..472c53723 100644
--- a/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
+++ b/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
@@ -6,11 +6,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 
diff --git a/frontend/src/vue/chat/chatbox/SearchMessages.vue b/frontend/src/vue/chat/chatbox/SearchMessages.vue
index 754585ce1..2427a02de 100644
--- a/frontend/src/vue/chat/chatbox/SearchMessages.vue
+++ b/frontend/src/vue/chat/chatbox/SearchMessages.vue
@@ -25,13 +25,7 @@
 </template>
 <script lang="ts">
 import debounce from "lodash.debounce";
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
 import {RoomModel} from "@/ts/types/model";
 
 const START_TYPING = "Start typing and messages will appear";
diff --git a/frontend/src/vue/chat/chatbox/UserImageIcon.vue b/frontend/src/vue/chat/chatbox/UserImageIcon.vue
index 3187658dd..952d64a5b 100644
--- a/frontend/src/vue/chat/chatbox/UserImageIcon.vue
+++ b/frontend/src/vue/chat/chatbox/UserImageIcon.vue
@@ -13,11 +13,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {UserModel} from "@/ts/types/model";
 import {resolveMediaUrl} from "@/ts/utils/htmlApi";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/vue/chat/chatbox/VideoContainer.vue b/frontend/src/vue/chat/chatbox/VideoContainer.vue
index 4c340869e..535b531df 100644
--- a/frontend/src/vue/chat/chatbox/VideoContainer.vue
+++ b/frontend/src/vue/chat/chatbox/VideoContainer.vue
@@ -61,14 +61,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Emit, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import {CallsInfoModel} from "@/ts/types/model";
 import VideoObject from "@/vue/chat/chatbox/VideoObject.vue";
diff --git a/frontend/src/vue/chat/chatbox/VideoObject.vue b/frontend/src/vue/chat/chatbox/VideoObject.vue
index c2cc0e264..af4ccf453 100644
--- a/frontend/src/vue/chat/chatbox/VideoObject.vue
+++ b/frontend/src/vue/chat/chatbox/VideoObject.vue
@@ -7,13 +7,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
 import {getStreamLog} from "@/ts/utils/pureFunctions";
 
 @Component({name: "VideoObject"})
diff --git a/frontend/src/vue/chat/message/ChatChangeNameMessage.vue b/frontend/src/vue/chat/message/ChatChangeNameMessage.vue
index 86663822e..a19defe55 100644
--- a/frontend/src/vue/chat/message/ChatChangeNameMessage.vue
+++ b/frontend/src/vue/chat/message/ChatChangeNameMessage.vue
@@ -10,11 +10,7 @@
   </chat-message-wrapper>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import ChatMessageWrapper from "@/vue/chat/message/ChatMessageWrapper.vue";
 
 @Component({
diff --git a/frontend/src/vue/chat/message/ChatMessageHeader.vue b/frontend/src/vue/chat/message/ChatMessageHeader.vue
index 15e2b5c8e..4881e2a59 100644
--- a/frontend/src/vue/chat/message/ChatMessageHeader.vue
+++ b/frontend/src/vue/chat/message/ChatMessageHeader.vue
@@ -5,11 +5,7 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {UserDictModel} from "@/ts/types/model";
 
 import UserImageIcon from "@/vue/chat/chatbox/UserImageIcon.vue";
diff --git a/frontend/src/vue/chat/message/ChatMessageToolTip.vue b/frontend/src/vue/chat/message/ChatMessageToolTip.vue
index 270e9f4eb..fc1df8336 100644
--- a/frontend/src/vue/chat/message/ChatMessageToolTip.vue
+++ b/frontend/src/vue/chat/message/ChatMessageToolTip.vue
@@ -25,18 +25,11 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import type {EditingMessage} from "@/ts/types/model";
 import {MessageModel} from "@/ts/types/model";
-import {
-  editMessageWs,
-  showAllowEditing,
-} from "@/ts/utils/pureFunctions";
+import {editMessageWs, showAllowEditing,} from "@/ts/utils/pureFunctions";
 
 @Component({name: "ChatMessageToolTip"})
 export default class ChatMessageToolTip extends Vue {
diff --git a/frontend/src/vue/chat/message/ChatMessageWrapper.vue b/frontend/src/vue/chat/message/ChatMessageWrapper.vue
index efadd3923..d1621cf22 100644
--- a/frontend/src/vue/chat/message/ChatMessageWrapper.vue
+++ b/frontend/src/vue/chat/message/ChatMessageWrapper.vue
@@ -6,11 +6,7 @@
   </p>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {timeToString} from "@/ts/utils/htmlApi";
 
 @Component({name: "ChatMessageWrapper"})
diff --git a/frontend/src/vue/chat/message/ChatReceivingFile.vue b/frontend/src/vue/chat/message/ChatReceivingFile.vue
index 4672c6370..ec79901ea 100644
--- a/frontend/src/vue/chat/message/ChatReceivingFile.vue
+++ b/frontend/src/vue/chat/message/ChatReceivingFile.vue
@@ -35,16 +35,9 @@
   </chat-message-wrapper>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
-import {
-  FileTransferStatus,
-  ReceivingFile,
-} from "@/ts/types/model";
+import {FileTransferStatus, ReceivingFile,} from "@/ts/types/model";
 import AppProgressBar from "@/vue/ui/AppProgressBar.vue";
 import ChatMessageHeader from "@/vue/chat/message/ChatMessageHeader.vue";
 import ReceivingFileInfo from "@/vue/chat/message/ReceivingFileInfo.vue";
diff --git a/frontend/src/vue/chat/message/ChatSendingFile.vue b/frontend/src/vue/chat/message/ChatSendingFile.vue
index 514c4abcd..353ed2bbc 100644
--- a/frontend/src/vue/chat/message/ChatSendingFile.vue
+++ b/frontend/src/vue/chat/message/ChatSendingFile.vue
@@ -28,11 +28,7 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {SendingFile} from "@/ts/types/model";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 import AppProgressBar from "@/vue/ui/AppProgressBar.vue";
diff --git a/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue b/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
index df070a41e..b2bcca188 100644
--- a/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
+++ b/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
@@ -21,17 +21,10 @@
 <script lang="ts">
 
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import AppProgressBar from "@/vue/ui/AppProgressBar.vue";
 import type {UserModel} from "@/ts/types/model";
-import {
-  FileTransferStatus,
-  SendingFileTransfer,
-} from "@/ts/types/model";
+import {FileTransferStatus, SendingFileTransfer,} from "@/ts/types/model";
 
 
 const fileStatusDict: Record<FileTransferStatus, string> = {
diff --git a/frontend/src/vue/chat/message/ChatSendingMessage.vue b/frontend/src/vue/chat/message/ChatSendingMessage.vue
index 40d2e7ed7..ff8ab48ef 100644
--- a/frontend/src/vue/chat/message/ChatSendingMessage.vue
+++ b/frontend/src/vue/chat/message/ChatSendingMessage.vue
@@ -41,23 +41,13 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue,} from "vue-property-decorator";
 import ChatTextMessage from "@/vue/chat/message/ChatTextMessage.vue";
 import AppProgressBar from "@/vue/ui/AppProgressBar.vue";
 
 import type {SetMessageProgressError} from "@/ts/types/types";
 import type {EditingMessage} from "@/ts/types/model";
-import {
-  CurrentUserInfoModel,
-  MessageModel,
-  MessageStatusInner,
-  RoomDictModel,
-} from "@/ts/types/model";
+import {CurrentUserInfoModel, MessageModel, MessageStatusInner, RoomDictModel,} from "@/ts/types/model";
 import ChatMessageToolTip from "@/vue/chat/message/ChatMessageToolTip.vue";
 import ChatTextArea from "@/vue/chat/textarea/ChatTextArea.vue";
 
diff --git a/frontend/src/vue/chat/message/ChatTextMessage.vue b/frontend/src/vue/chat/message/ChatTextMessage.vue
index cfe5c9fbc..31ab60c9e 100644
--- a/frontend/src/vue/chat/message/ChatTextMessage.vue
+++ b/frontend/src/vue/chat/message/ChatTextMessage.vue
@@ -15,16 +15,8 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
-import {
-  CurrentUserSettingsModel,
-  MessageModel,
-} from "@/ts/types/model";
+import {Component, Prop, Ref, Vue,} from "vue-property-decorator";
+import {CurrentUserSettingsModel, MessageModel,} from "@/ts/types/model";
 import {
   encodeHTML,
   encodeMessageInited,
diff --git a/frontend/src/vue/chat/message/ChatThread.vue b/frontend/src/vue/chat/message/ChatThread.vue
index 2b2fa1084..1c028aced 100644
--- a/frontend/src/vue/chat/message/ChatThread.vue
+++ b/frontend/src/vue/chat/message/ChatThread.vue
@@ -35,13 +35,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
 import {MessageModel} from "@/ts/types/model";
 import ChatSendingMessage from "@/vue/chat/message/ChatSendingMessage.vue";
 import ChatTextArea from "@/vue/chat/textarea/ChatTextArea.vue";
diff --git a/frontend/src/vue/chat/message/ChatUserActionMessage.vue b/frontend/src/vue/chat/message/ChatUserActionMessage.vue
index 348998cc0..d865154a0 100644
--- a/frontend/src/vue/chat/message/ChatUserActionMessage.vue
+++ b/frontend/src/vue/chat/message/ChatUserActionMessage.vue
@@ -9,11 +9,7 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
 import ChatMessageWrapper from "@/vue/chat/message/ChatMessageWrapper.vue";
 
diff --git a/frontend/src/vue/chat/message/ReceivingFileInfo.vue b/frontend/src/vue/chat/message/ReceivingFileInfo.vue
index 6f9968d7f..6df3458ae 100644
--- a/frontend/src/vue/chat/message/ReceivingFileInfo.vue
+++ b/frontend/src/vue/chat/message/ReceivingFileInfo.vue
@@ -42,16 +42,9 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
-import {
-  FileTransferStatus,
-  ReceivingFile,
-} from "@/ts/types/model";
+import {FileTransferStatus, ReceivingFile,} from "@/ts/types/model";
 
 @Component({name: "ReceivingFileInfo"})
 export default class ReceivingFileInfo extends Vue {
diff --git a/frontend/src/vue/chat/right/ChannelTable.vue b/frontend/src/vue/chat/right/ChannelTable.vue
index 78bff94f6..0a1d21866 100644
--- a/frontend/src/vue/chat/right/ChannelTable.vue
+++ b/frontend/src/vue/chat/right/ChannelTable.vue
@@ -20,11 +20,7 @@
   </chat-right-collapsed-section>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import {ChannelUIModel} from "@/ts/types/model";
 import ChatRightCollapsedSection from "@/vue/chat/right/ChatRightCollapsedSection.vue";
diff --git a/frontend/src/vue/chat/right/ChatRightCollapsedSection.vue b/frontend/src/vue/chat/right/ChatRightCollapsedSection.vue
index e62e869e1..eaf5510d3 100644
--- a/frontend/src/vue/chat/right/ChatRightCollapsedSection.vue
+++ b/frontend/src/vue/chat/right/ChatRightCollapsedSection.vue
@@ -15,12 +15,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
 
 @Component({name: "ChatRightCollapsedSection"})
 export default class ChatRightCollapsedSection extends Vue {
diff --git a/frontend/src/vue/chat/right/ChatRightSection.vue b/frontend/src/vue/chat/right/ChatRightSection.vue
index 1ede458a9..c18a43195 100644
--- a/frontend/src/vue/chat/right/ChatRightSection.vue
+++ b/frontend/src/vue/chat/right/ChatRightSection.vue
@@ -9,10 +9,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import RoomDirectUsersTable from "@/vue/chat/right/RoomDirectUsersTable.vue";
 import ChannelTable from "@/vue/chat/right/ChannelTable.vue";
 import type {ChannelUIModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/chat/right/PrivateRoomRow.vue b/frontend/src/vue/chat/right/PrivateRoomRow.vue
index 48d2c8c97..39d7a9276 100644
--- a/frontend/src/vue/chat/right/PrivateRoomRow.vue
+++ b/frontend/src/vue/chat/right/PrivateRoomRow.vue
@@ -5,11 +5,7 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
 import {RoomModel} from "@/ts/types/model";
 import {PrivateRoomsIds} from "@/ts/types/types";
diff --git a/frontend/src/vue/chat/right/RoomDirectUsersTable.vue b/frontend/src/vue/chat/right/RoomDirectUsersTable.vue
index 1f05a4983..ae8272621 100644
--- a/frontend/src/vue/chat/right/RoomDirectUsersTable.vue
+++ b/frontend/src/vue/chat/right/RoomDirectUsersTable.vue
@@ -13,10 +13,7 @@
   </chat-right-collapsed-section>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import PrivateRoomRow from "@/vue/chat/right/PrivateRoomRow.vue";
 import {State} from "@/ts/instances/storeInstance";
 import type {RoomModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/chat/right/RoomRightIcon.vue b/frontend/src/vue/chat/right/RoomRightIcon.vue
index 7b93cba03..f2deab830 100644
--- a/frontend/src/vue/chat/right/RoomRightIcon.vue
+++ b/frontend/src/vue/chat/right/RoomRightIcon.vue
@@ -26,11 +26,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import type {MessageModel} from "@/ts/types/model";
 import {RoomModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/chat/right/RoomRowWrapper.vue b/frontend/src/vue/chat/right/RoomRowWrapper.vue
index d60378e40..bd8b85ba7 100644
--- a/frontend/src/vue/chat/right/RoomRowWrapper.vue
+++ b/frontend/src/vue/chat/right/RoomRowWrapper.vue
@@ -7,11 +7,7 @@
   </li>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import RoomRightIcon from "@/vue/chat/right/RoomRightIcon.vue";
 import {RoomModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
diff --git a/frontend/src/vue/chat/right/UserFlagRow.vue b/frontend/src/vue/chat/right/UserFlagRow.vue
index af77e338c..b1251888d 100644
--- a/frontend/src/vue/chat/right/UserFlagRow.vue
+++ b/frontend/src/vue/chat/right/UserFlagRow.vue
@@ -8,11 +8,7 @@
   </user-row>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import UserRow from "@/vue/chat/right/UserRow.vue";
 import {UserModel} from "@/ts/types/model";
 import {FLAGS} from "@/ts/utils/consts";
diff --git a/frontend/src/vue/chat/right/UserNavInfo.vue b/frontend/src/vue/chat/right/UserNavInfo.vue
index e52f23a78..a23232e3c 100644
--- a/frontend/src/vue/chat/right/UserNavInfo.vue
+++ b/frontend/src/vue/chat/right/UserNavInfo.vue
@@ -9,11 +9,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import UserImageIcon from "@/vue/chat/chatbox/UserImageIcon.vue";
 import {UserModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/chat/right/UserRow.vue b/frontend/src/vue/chat/right/UserRow.vue
index 59c20c483..cac8c982a 100644
--- a/frontend/src/vue/chat/right/UserRow.vue
+++ b/frontend/src/vue/chat/right/UserRow.vue
@@ -11,15 +11,8 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
-import {
-  RoomModel,
-  UserModel,
-} from "@/ts/types/model";
+import {Component, Prop, Vue,} from "vue-property-decorator";
+import {RoomModel, UserModel,} from "@/ts/types/model";
 import UserImageIcon from "@/vue/chat/chatbox/UserImageIcon.vue";
 
 
diff --git a/frontend/src/vue/chat/textarea/ChatAttachments.vue b/frontend/src/vue/chat/textarea/ChatAttachments.vue
index fca8b5229..fd9e75310 100644
--- a/frontend/src/vue/chat/textarea/ChatAttachments.vue
+++ b/frontend/src/vue/chat/textarea/ChatAttachments.vue
@@ -69,13 +69,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Emit, Prop, Ref, Vue,} from "vue-property-decorator";
 import {buildQueryParams} from "@/ts/utils/pureFunctions";
 
 @Component({name: "ChatAttachments"})
diff --git a/frontend/src/vue/chat/textarea/ChatTagging.vue b/frontend/src/vue/chat/textarea/ChatTagging.vue
index 31bc080ce..5244e12de 100644
--- a/frontend/src/vue/chat/textarea/ChatTagging.vue
+++ b/frontend/src/vue/chat/textarea/ChatTagging.vue
@@ -13,17 +13,8 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
-import {
-  UserDictModel,
-  UserModel,
-} from "@/ts/types/model";
+import {Component, Emit, Prop, Vue, Watch,} from "vue-property-decorator";
+import {UserDictModel, UserModel,} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 
 @Component({name: "ChatTagging"})
diff --git a/frontend/src/vue/chat/textarea/ChatTextArea.vue b/frontend/src/vue/chat/textarea/ChatTextArea.vue
index 77a02c97d..03a4cce96 100644
--- a/frontend/src/vue/chat/textarea/ChatTextArea.vue
+++ b/frontend/src/vue/chat/textarea/ChatTextArea.vue
@@ -56,13 +56,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
 import {
   createTag,
   encodeHTML,
@@ -81,12 +75,7 @@ import {
   savedFiles,
   timeToString,
 } from "@/ts/utils/htmlApi";
-import type {
-  EditingMessage,
-  MessageModel,
-  PastingTextAreaElement,
-  UserModel,
-} from "@/ts/types/model";
+import type {EditingMessage, MessageModel, PastingTextAreaElement, UserModel,} from "@/ts/types/model";
 import {
   CurrentUserInfoModel,
   CurrentUserSettingsModel,
@@ -96,22 +85,13 @@ import {
 } from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 
-import type {
-  MessageDataEncode,
-  MessageSender,
-} from "@/ts/types/types";
-import {
-  editMessageWs,
-  showAllowEditing,
-} from "@/ts/utils/pureFunctions";
+import type {MessageDataEncode, MessageSender,} from "@/ts/types/types";
+import {editMessageWs, showAllowEditing,} from "@/ts/utils/pureFunctions";
 import MediaRecorder from "@/vue/chat/textarea/MediaRecorder.vue";
 import ChatAttachments from "@/vue/chat/textarea/ChatAttachments.vue";
 import SmileyHolder from "@/vue/chat/textarea/SmileyHolder.vue";
 import {isMobile} from "@/ts/utils/runtimeConsts";
-import {
-  SHOW_I_TYPING_INTERVAL,
-  USERNAME_REGEX,
-} from "@/ts/utils/consts";
+import {SHOW_I_TYPING_INTERVAL, USERNAME_REGEX,} from "@/ts/utils/consts";
 import ChatTagging from "@/vue/chat/textarea/ChatTagging.vue";
 import {Throttle} from "@/ts/classes/Throttle";
 import GiphySearch from "@/vue/chat/textarea/GiphySearch.vue";
diff --git a/frontend/src/vue/chat/textarea/GiphySearch.vue b/frontend/src/vue/chat/textarea/GiphySearch.vue
index 6967471ba..1ba1b185c 100644
--- a/frontend/src/vue/chat/textarea/GiphySearch.vue
+++ b/frontend/src/vue/chat/textarea/GiphySearch.vue
@@ -42,22 +42,13 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Emit, Ref, Vue, Watch,} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppSuspense from "@/vue/ui/AppSuspense.vue";
 import {webpSupported} from "@/ts/utils/runtimeConsts";
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import type {
-  GIFObject,
-  MultiResponse,
-} from "giphy-api";
+import type {GIFObject, MultiResponse,} from "giphy-api";
 import AppLoadingImage from "@/vue/ui/AppLoadingImage.vue";
 import {LOAD_GIPHIES_PER_REQUEST} from "@/ts/utils/consts";
 
diff --git a/frontend/src/vue/chat/textarea/MediaRecorder.vue b/frontend/src/vue/chat/textarea/MediaRecorder.vue
index 7c09cfba1..70f19a6bb 100644
--- a/frontend/src/vue/chat/textarea/MediaRecorder.vue
+++ b/frontend/src/vue/chat/textarea/MediaRecorder.vue
@@ -20,18 +20,10 @@
 </template>
 <script lang="ts">
 
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue,} from "vue-property-decorator";
 import MediaCapture from "@/ts/classes/MediaCapture";
 
-import {
-  isChrome,
-  isMobile,
-} from "@/ts/utils/runtimeConsts";
+import {isChrome, isMobile,} from "@/ts/utils/runtimeConsts";
 
 
 @Component({name: "MediaRecorder"})
diff --git a/frontend/src/vue/chat/textarea/Painter.vue b/frontend/src/vue/chat/textarea/Painter.vue
index d6297e918..7756e7f62 100644
--- a/frontend/src/vue/chat/textarea/Painter.vue
+++ b/frontend/src/vue/chat/textarea/Painter.vue
@@ -3,11 +3,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Ref, Vue,} from "vue-property-decorator";
 
 import loggerFactory from "@/ts/instances/loggerFactory";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
diff --git a/frontend/src/vue/chat/textarea/SmileyHolder.vue b/frontend/src/vue/chat/textarea/SmileyHolder.vue
index 681642c8c..6d886ad17 100644
--- a/frontend/src/vue/chat/textarea/SmileyHolder.vue
+++ b/frontend/src/vue/chat/textarea/SmileyHolder.vue
@@ -56,17 +56,8 @@
   <div v-else/>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
-import type {
-  Smile,
-  SmileVariation,
-  SmileysStructure,
-} from "@/ts/utils/smileys";
+import {Component, Emit, Vue, Watch,} from "vue-property-decorator";
+import type {Smile, SmileVariation, SmileysStructure,} from "@/ts/utils/smileys";
 
 @Component({name: "SmileyHolder"})
 export default class SmileyHolder extends Vue {
diff --git a/frontend/src/vue/pages/ChannelAddRoom.vue b/frontend/src/vue/pages/ChannelAddRoom.vue
index e111d47fe..a4bbb0150 100644
--- a/frontend/src/vue/pages/ChannelAddRoom.vue
+++ b/frontend/src/vue/pages/ChannelAddRoom.vue
@@ -6,10 +6,7 @@
   />
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import CreateRoom from "@/vue/parts/CreateRoom.vue";
 import {State} from "@/ts/instances/storeInstance";
 import type {ChannelUIModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/pages/ChannelSettings.vue b/frontend/src/vue/pages/ChannelSettings.vue
index 52877f76b..849ff2d42 100644
--- a/frontend/src/vue/pages/ChannelSettings.vue
+++ b/frontend/src/vue/pages/ChannelSettings.vue
@@ -101,22 +101,10 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
-import type {
-  ChannelUIModel,
-  UserModel,
-} from "@/ts/types/model";
-import {
-  ChannelsDictUIModel,
-  CurrentUserInfoModel,
-} from "@/ts/types/model";
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
+import {Component, Vue,} from "vue-property-decorator";
+import type {ChannelUIModel, UserModel,} from "@/ts/types/model";
+import {ChannelsDictUIModel, CurrentUserInfoModel,} from "@/ts/types/model";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import type {RouterNavigateMessage} from "@/ts/types/messages/innerMessages";
diff --git a/frontend/src/vue/pages/ChannelsPage.vue b/frontend/src/vue/pages/ChannelsPage.vue
index a2fd6e9d8..d3791e1f1 100644
--- a/frontend/src/vue/pages/ChannelsPage.vue
+++ b/frontend/src/vue/pages/ChannelsPage.vue
@@ -18,11 +18,7 @@
 </template>
 
 <script lang='ts'>
-import {
-  Component,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Vue, Watch,} from "vue-property-decorator";
 
 import ChatRightSection from "@/vue/chat/right/ChatRightSection.vue";
 // Import NavEditMessage from '@/vue/chat/NavEditMessage.vue';
diff --git a/frontend/src/vue/pages/ConfirmMail.vue b/frontend/src/vue/pages/ConfirmMail.vue
index 5100c424f..02f6ee89d 100644
--- a/frontend/src/vue/pages/ConfirmMail.vue
+++ b/frontend/src/vue/pages/ConfirmMail.vue
@@ -23,10 +23,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 
 @Component({name: "ConfirmMail"})
diff --git a/frontend/src/vue/pages/CreateChannel.vue b/frontend/src/vue/pages/CreateChannel.vue
index 4be065f6f..001c6f7ee 100644
--- a/frontend/src/vue/pages/CreateChannel.vue
+++ b/frontend/src/vue/pages/CreateChannel.vue
@@ -32,10 +32,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import PickUser from "@/vue/parts/PickUser.vue";
diff --git a/frontend/src/vue/pages/CreatePrivateRoom.vue b/frontend/src/vue/pages/CreatePrivateRoom.vue
index b0fa25b3e..ed21f8782 100644
--- a/frontend/src/vue/pages/CreatePrivateRoom.vue
+++ b/frontend/src/vue/pages/CreatePrivateRoom.vue
@@ -5,10 +5,7 @@
   />
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import CreateRoom from "@/vue/parts/CreateRoom.vue";
 import {State} from "@/ts/instances/storeInstance";
 import {PrivateRoomsIds} from "@/ts/types/types";
diff --git a/frontend/src/vue/pages/EmailChanged.vue b/frontend/src/vue/pages/EmailChanged.vue
index d3180ce0c..dd14d9d6c 100644
--- a/frontend/src/vue/pages/EmailChanged.vue
+++ b/frontend/src/vue/pages/EmailChanged.vue
@@ -11,10 +11,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 
 @Component({name: "ConfirmMail"})
diff --git a/frontend/src/vue/pages/MainPage.vue b/frontend/src/vue/pages/MainPage.vue
index 181e548b4..83751ebf9 100644
--- a/frontend/src/vue/pages/MainPage.vue
+++ b/frontend/src/vue/pages/MainPage.vue
@@ -19,14 +19,8 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
-import {
-  CurrentUserInfoModel,
-  IncomingCallModel,
-} from "@/ts/types/model";
+import {Component, Vue,} from "vue-property-decorator";
+import {CurrentUserInfoModel, IncomingCallModel,} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import IncomingCall from "@/vue/chat/call/IncomingCall.vue";
 import AppNavWrapper from "@/vue/ui/AppNavWrapper.vue";
diff --git a/frontend/src/vue/pages/PainterPage.vue b/frontend/src/vue/pages/PainterPage.vue
index 404696a86..06a14da5c 100644
--- a/frontend/src/vue/pages/PainterPage.vue
+++ b/frontend/src/vue/pages/PainterPage.vue
@@ -4,11 +4,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Ref, Vue,} from "vue-property-decorator";
 import Painter from "@/vue/chat/textarea/Painter.vue";
 
 
diff --git a/frontend/src/vue/pages/RoomSettings.vue b/frontend/src/vue/pages/RoomSettings.vue
index c5e890799..7f48ab30f 100644
--- a/frontend/src/vue/pages/RoomSettings.vue
+++ b/frontend/src/vue/pages/RoomSettings.vue
@@ -115,25 +115,13 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {Component, Vue,} from "vue-property-decorator";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
-import type {
-  RoomModel,
-  UserModel,
-} from "@/ts/types/model";
-import {
-  RoomDictModel,
-  UserDictModel,
-} from "@/ts/types/model";
+import type {RoomModel, UserModel,} from "@/ts/types/model";
+import {RoomDictModel, UserDictModel,} from "@/ts/types/model";
 import ParentChannel from "@/vue/parts/ParentChannel.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import {PrivateRoomsIds} from "@/ts/types/types";
diff --git a/frontend/src/vue/pages/RoomUsersListPage.vue b/frontend/src/vue/pages/RoomUsersListPage.vue
index e20718c90..d059abc41 100644
--- a/frontend/src/vue/pages/RoomUsersListPage.vue
+++ b/frontend/src/vue/pages/RoomUsersListPage.vue
@@ -29,19 +29,9 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
-import {
-  ChannelsDictUIModel,
-  RoomDictModel,
-  UserDictModel,
-} from "@/ts/types/model";
+import {Component, Vue,} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {ChannelsDictUIModel, RoomDictModel, UserDictModel,} from "@/ts/types/model";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import UserFlagRow from "@/vue/chat/right/UserFlagRow.vue";
diff --git a/frontend/src/vue/pages/UserProfile.vue b/frontend/src/vue/pages/UserProfile.vue
index 4f4a08761..d01da8539 100644
--- a/frontend/src/vue/pages/UserProfile.vue
+++ b/frontend/src/vue/pages/UserProfile.vue
@@ -31,14 +31,8 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  FACEBOOK_APP_ID,
-  GOOGLE_OAUTH_2_CLIENT_ID,
-} from "@/ts/utils/consts";
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {FACEBOOK_APP_ID, GOOGLE_OAUTH_2_CLIENT_ID,} from "@/ts/utils/consts";
+import {Component, Vue,} from "vue-property-decorator";
 import AppTab from "@/vue/ui/AppTab.vue";
 
 @Component({
diff --git a/frontend/src/vue/pages/UserProfileChangeEmail.vue b/frontend/src/vue/pages/UserProfileChangeEmail.vue
index 81a4f0e07..a3ffdd647 100644
--- a/frontend/src/vue/pages/UserProfileChangeEmail.vue
+++ b/frontend/src/vue/pages/UserProfileChangeEmail.vue
@@ -45,14 +45,8 @@
   </form>
 </template>
 <script lang="ts">
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {Component, Vue,} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/pages/UserProfileChangePassword.vue b/frontend/src/vue/pages/UserProfileChangePassword.vue
index ffeea7414..60b67212b 100644
--- a/frontend/src/vue/pages/UserProfileChangePassword.vue
+++ b/frontend/src/vue/pages/UserProfileChangePassword.vue
@@ -69,14 +69,8 @@
   </form>
 </template>
 <script lang="ts">
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {Component, Vue,} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/pages/UserProfileImage.vue b/frontend/src/vue/pages/UserProfileImage.vue
index 3fafec9e2..07197a8a2 100644
--- a/frontend/src/vue/pages/UserProfileImage.vue
+++ b/frontend/src/vue/pages/UserProfileImage.vue
@@ -10,16 +10,8 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {Component, Ref, Vue, Watch,} from "vue-property-decorator";
 import {resolveMediaUrl} from "@/ts/utils/htmlApi";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppImageCropper from "@/vue/ui/AppImageCropper.vue";
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index efed3c358..aa5ea3e4b 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -112,14 +112,8 @@
   </form>
 </template>
 <script lang="ts">
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {Component, Vue,} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/pages/UserProfileOauthSettings.vue b/frontend/src/vue/pages/UserProfileOauthSettings.vue
index 88d160adb..c0d0fdbcd 100644
--- a/frontend/src/vue/pages/UserProfileOauthSettings.vue
+++ b/frontend/src/vue/pages/UserProfileOauthSettings.vue
@@ -18,10 +18,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 import type {OauthStatus} from "@/ts/types/dto";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import FacebookAuth from "@/vue/auth/FacebookAuth.vue";
diff --git a/frontend/src/vue/pages/UserProfileSettings.vue b/frontend/src/vue/pages/UserProfileSettings.vue
index a1959ef7d..7b2f025ca 100644
--- a/frontend/src/vue/pages/UserProfileSettings.vue
+++ b/frontend/src/vue/pages/UserProfileSettings.vue
@@ -114,29 +114,16 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
+import {Component, Vue, Watch,} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {userSettingsDtoToModel} from "@/ts/types/converters";
 import type {LogLevel} from "lines-logger";
 import {logLevels} from "lines-logger";
-import {
-  LAST_SYNCED,
-  SERVICE_WORKER_VERSION_LS_NAME,
-} from "@/ts/utils/consts";
-import {
-  addToHomeScreen,
-  canBeInstalled,
-} from "@/ts/utils/addToHomeScreen";
+import {LAST_SYNCED, SERVICE_WORKER_VERSION_LS_NAME,} from "@/ts/utils/consts";
+import {addToHomeScreen, canBeInstalled,} from "@/ts/utils/addToHomeScreen";
 
 
 @Component({
diff --git a/frontend/src/vue/pages/ViewProfilePage.vue b/frontend/src/vue/pages/ViewProfilePage.vue
index 0200f1a01..7325cab1a 100644
--- a/frontend/src/vue/pages/ViewProfilePage.vue
+++ b/frontend/src/vue/pages/ViewProfilePage.vue
@@ -57,14 +57,8 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
+import {Component, Vue,} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
 import {resolveMediaUrl} from "@/ts/utils/htmlApi";
 import type {UserModel} from "@/ts/types/model";
 import type {ViewUserProfileDto} from "@/ts/types/dto";
diff --git a/frontend/src/vue/parts/CreateRoom.vue b/frontend/src/vue/parts/CreateRoom.vue
index 3a2de0c9a..c844cecd4 100644
--- a/frontend/src/vue/parts/CreateRoom.vue
+++ b/frontend/src/vue/parts/CreateRoom.vue
@@ -61,22 +61,12 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  ApplyGrowlErr,
-  State,
-} from "@/ts/instances/storeInstance";
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
-import {
-  ChannelsDictUIModel,
-  CurrentUserInfoModel,
-} from "@/ts/types/model";
+import {ChannelsDictUIModel, CurrentUserInfoModel,} from "@/ts/types/model";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
 import {PrivateRoomsIds} from "@/ts/types/types";
 import ParentChannel from "@/vue/parts/ParentChannel.vue";
diff --git a/frontend/src/vue/parts/Growls.vue b/frontend/src/vue/parts/Growls.vue
index 7d665897f..e9558627f 100644
--- a/frontend/src/vue/parts/Growls.vue
+++ b/frontend/src/vue/parts/Growls.vue
@@ -8,11 +8,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Vue, Watch,} from "vue-property-decorator";
 import type {GrowlModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import AppGrowl from "@/vue/ui/AppGrowl.vue";
diff --git a/frontend/src/vue/parts/ParentChannel.vue b/frontend/src/vue/parts/ParentChannel.vue
index c21163aaa..436f1becb 100644
--- a/frontend/src/vue/parts/ParentChannel.vue
+++ b/frontend/src/vue/parts/ParentChannel.vue
@@ -13,12 +13,7 @@
   </select>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import type {ChannelUIModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/parts/PickUser.vue b/frontend/src/vue/parts/PickUser.vue
index 09e9ef403..205ad7391 100644
--- a/frontend/src/vue/parts/PickUser.vue
+++ b/frontend/src/vue/parts/PickUser.vue
@@ -30,11 +30,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import UserRow from "@/vue/chat/right/UserRow.vue";
diff --git a/frontend/src/vue/ui/AppCheckbox.vue b/frontend/src/vue/ui/AppCheckbox.vue
index a4c27f57f..dad8279ef 100644
--- a/frontend/src/vue/ui/AppCheckbox.vue
+++ b/frontend/src/vue/ui/AppCheckbox.vue
@@ -11,13 +11,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Emit, Prop, Ref, Vue,} from "vue-property-decorator";
 
 
 let uniqueId = 1;
diff --git a/frontend/src/vue/ui/AppGrowl.vue b/frontend/src/vue/ui/AppGrowl.vue
index d39c53b35..0e6f2a540 100644
--- a/frontend/src/vue/ui/AppGrowl.vue
+++ b/frontend/src/vue/ui/AppGrowl.vue
@@ -12,11 +12,7 @@
 </template>
 
 <script lang='ts'>
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {GrowlModel} from "@/ts/types/model";
 
 @Component({name: "AppGrowl"})
diff --git a/frontend/src/vue/ui/AppImageCropper.vue b/frontend/src/vue/ui/AppImageCropper.vue
index 66c0c2283..33518c98a 100644
--- a/frontend/src/vue/ui/AppImageCropper.vue
+++ b/frontend/src/vue/ui/AppImageCropper.vue
@@ -66,19 +66,10 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-  Watch,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
 import VueCropper, {VueCropperMethods} from "vue-cropperjs";
 import {isMobile} from "@/ts/utils/runtimeConsts";
-import {
-  canvasContext,
-  stopVideo,
-} from "@/ts/utils/htmlApi";
+import {canvasContext, stopVideo,} from "@/ts/utils/htmlApi";
 
 
 @Component({
diff --git a/frontend/src/vue/ui/AppInputDate.vue b/frontend/src/vue/ui/AppInputDate.vue
index 27a75be9e..e891f36de 100644
--- a/frontend/src/vue/ui/AppInputDate.vue
+++ b/frontend/src/vue/ui/AppInputDate.vue
@@ -7,12 +7,7 @@
   />
 </template>
 <script lang="ts">
-import {
-  Component,
-  Emit,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
 
 
 @Component({
diff --git a/frontend/src/vue/ui/AppInputRange.vue b/frontend/src/vue/ui/AppInputRange.vue
index 818e30e6c..e20601903 100644
--- a/frontend/src/vue/ui/AppInputRange.vue
+++ b/frontend/src/vue/ui/AppInputRange.vue
@@ -8,12 +8,7 @@
   />
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Ref,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue,} from "vue-property-decorator";
 
 let uniqueId = 1;
 
diff --git a/frontend/src/vue/ui/AppLoadingImage.vue b/frontend/src/vue/ui/AppLoadingImage.vue
index 72931343f..29342d207 100644
--- a/frontend/src/vue/ui/AppLoadingImage.vue
+++ b/frontend/src/vue/ui/AppLoadingImage.vue
@@ -6,11 +6,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 
 @Component({
   name: "AppLoadingImage",
diff --git a/frontend/src/vue/ui/AppMenuBar.vue b/frontend/src/vue/ui/AppMenuBar.vue
index 1a82b4420..4ee6cb171 100644
--- a/frontend/src/vue/ui/AppMenuBar.vue
+++ b/frontend/src/vue/ui/AppMenuBar.vue
@@ -45,14 +45,8 @@
   </app-modal>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
-import {
-  GITHUB_LINK,
-  ISSUES,
-} from "@/ts/utils/consts";
+import {Component, Vue,} from "vue-property-decorator";
+import {GITHUB_LINK, ISSUES,} from "@/ts/utils/consts";
 import {State} from "@/ts/instances/storeInstance";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 import AppModal from "@/vue/ui/AppModal.vue";
diff --git a/frontend/src/vue/ui/AppNavWrapper.vue b/frontend/src/vue/ui/AppNavWrapper.vue
index fe9df64e2..8bcb799fb 100644
--- a/frontend/src/vue/ui/AppNavWrapper.vue
+++ b/frontend/src/vue/ui/AppNavWrapper.vue
@@ -4,10 +4,7 @@
   </nav>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 
 @Component({name: "AppNavWrapper"})
 export default class AppNavWrapper extends Vue {
diff --git a/frontend/src/vue/ui/AppProgressBar.vue b/frontend/src/vue/ui/AppProgressBar.vue
index 79e39decd..b02b17782 100644
--- a/frontend/src/vue/ui/AppProgressBar.vue
+++ b/frontend/src/vue/ui/AppProgressBar.vue
@@ -12,11 +12,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 import {UploadProgressModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/ui/AppSeparator.vue b/frontend/src/vue/ui/AppSeparator.vue
index 0cf2bd844..5e0124daf 100644
--- a/frontend/src/vue/ui/AppSeparator.vue
+++ b/frontend/src/vue/ui/AppSeparator.vue
@@ -6,11 +6,7 @@
   </fieldset>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 
 @Component({name: "AppSeparator"})
 export default class AppSeparator extends Vue {
diff --git a/frontend/src/vue/ui/AppSubmit.vue b/frontend/src/vue/ui/AppSubmit.vue
index 07de40720..3c5e49c9e 100644
--- a/frontend/src/vue/ui/AppSubmit.vue
+++ b/frontend/src/vue/ui/AppSubmit.vue
@@ -13,11 +13,7 @@
 </template>
 
 <script lang='ts'>
-import {
-  Component,
-  Prop,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Prop, Vue,} from "vue-property-decorator";
 
 @Component({name: "AppSubmit"})
 export default class AppSubmit extends Vue {
diff --git a/frontend/src/vue/ui/AppSuspense.vue b/frontend/src/vue/ui/AppSuspense.vue
index 593d4fc8f..dc5ef310a 100644
--- a/frontend/src/vue/ui/AppSuspense.vue
+++ b/frontend/src/vue/ui/AppSuspense.vue
@@ -13,10 +13,7 @@
 </template>
 
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 
 @Component({
   name: "AppSuspense",
diff --git a/frontend/src/vue/ui/AppTab.vue b/frontend/src/vue/ui/AppTab.vue
index 25868f41b..495f8711d 100644
--- a/frontend/src/vue/ui/AppTab.vue
+++ b/frontend/src/vue/ui/AppTab.vue
@@ -4,10 +4,7 @@
   </div>
 </template>
 <script lang="ts">
-import {
-  Component,
-  Vue,
-} from "vue-property-decorator";
+import {Component, Vue,} from "vue-property-decorator";
 
 @Component({name: "AppTab"})
 export default class AppTab extends Vue {

From 7b050c151817c357c8f3c475888f3cd6c8ee7581 Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Fri, 20 May 2022 21:18:27 +0300
Subject: [PATCH 122/221] blah6

---
 frontend/src/ts/classes/DatabaseWrapper.ts    |  48 +++----
 frontend/src/ts/classes/DefaultStore.ts       | 120 +++++++++---------
 frontend/src/ts/classes/Fetch.ts              |   3 +-
 frontend/src/ts/classes/LocalStorage.ts       |  18 ++-
 frontend/src/ts/classes/MediaCapture.ts       |   2 +-
 frontend/src/ts/classes/Subscription.ts       |   6 +-
 .../src/ts/devices/AndroidPlatformUtils.ts    |   2 +-
 frontend/src/ts/devices/WebPlatformUtils.ts   |   2 +-
 frontend/src/ts/devices/electron.ts           |   2 +-
 frontend/src/ts/instances/loggerFactory.ts    |   2 +-
 frontend/src/ts/instances/routerInstance.ts   |   6 +-
 frontend/src/ts/main.ts                       |   5 +-
 .../AbstractMessageProcessor.ts               |   6 +-
 frontend/src/ts/message_handlers/Api.ts       |   2 +-
 .../src/ts/message_handlers/MessageHelper.ts  |   2 +-
 .../src/ts/message_handlers/RomHandler.ts     |  54 ++++----
 frontend/src/ts/message_handlers/WsHandler.ts |  70 +++++-----
 .../ts/message_handlers/WsMessageHandler.ts   |  32 ++---
 .../ts/message_handlers/WsMessageProcessor.ts |  26 ++--
 .../message_handlers/http_modules/AuthApi.ts  |  14 +-
 .../message_handlers/http_modules/FileApi.ts  |   2 +-
 .../message_handlers/http_modules/GiphyApi.ts |   6 +-
 .../message_handlers/http_modules/RestApi.ts  |   2 +-
 .../http_modules/VerifyApi.ts                 |  10 +-
 frontend/src/ts/types/converters.ts           |  40 +++---
 frontend/src/ts/types/db.ts                   |   4 +-
 frontend/src/ts/types/dto.ts                  |  14 +-
 frontend/src/ts/types/env.d.ts                |   4 +-
 frontend/src/ts/types/extensions.d.ts         |   8 +-
 frontend/src/ts/types/messages/helper.ts      |   2 +-
 .../messages/inner/change.p2p.room.info.ts    |   8 +-
 .../ts/types/messages/inner/change.stream.ts  |   4 +-
 .../messages/inner/change.user.online.info.ts |   6 +-
 .../messages/inner/check.transfer.destroy.ts  |   2 +-
 .../types/messages/inner/connect.to.remote.ts |   4 +-
 .../messages/inner/destroy.peer.connection.ts |   2 +-
 .../types/messages/inner/internet.appear.ts   |   2 +-
 frontend/src/ts/types/messages/inner/login.ts |   2 +-
 .../src/ts/types/messages/inner/logout.ts     |   2 +-
 .../ts/types/messages/inner/pub.set.rooms.ts  |   8 +-
 .../types/messages/inner/router.navigate.ts   |   2 +-
 .../inner/send.set.messages.status.ts         |   4 +-
 .../src/ts/types/messages/inner/sync.p2p.ts   |   4 +-
 frontend/src/ts/types/messages/p2pMessages.ts |   6 +-
 frontend/src/ts/types/model.ts                |   6 +-
 frontend/src/ts/types/types.ts                |  32 ++---
 frontend/src/ts/utils/htmlApi.ts              |   6 +-
 frontend/src/ts/utils/pureFunctions.ts        |   4 +-
 frontend/src/ts/utils/runtimeConsts.ts        |   2 +-
 .../src/ts/webrtc/AbstractPeerConnection.ts   |   6 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           |  22 ++--
 frontend/src/ts/webrtc/call/CallHandler.ts    |  16 +--
 .../src/ts/webrtc/call/CallPeerConnection.ts  |  16 +--
 .../webrtc/call/CallSenderPeerConnection.ts   |   2 +-
 frontend/src/ts/webrtc/file/FileHandler.ts    |   2 +-
 .../file/FileReceiveerPeerConnection.ts       |   8 +-
 .../webrtc/file/FileSenderPeerConnection.ts   |  10 +-
 .../webrtc/message/MessagePeerConnection.ts   |  12 +-
 .../webrtc/message/MessageTransferHandler.ts  |   6 +-
 frontend/src/vue/App.vue                      |   8 +-
 frontend/src/vue/auth/ApplyResetPassword.vue  |  11 +-
 frontend/src/vue/auth/AuthPage.vue            |   6 +-
 frontend/src/vue/auth/CaptchaComponent.vue    |   4 +-
 frontend/src/vue/auth/FacebookAuth.vue        |   2 +-
 frontend/src/vue/auth/GoogleAuth.vue          |   2 +-
 frontend/src/vue/auth/RegisterFieldSet.vue    |   2 +-
 frontend/src/vue/auth/ResetPassword.vue       |  19 +--
 frontend/src/vue/auth/SignIn.vue              |  15 ++-
 frontend/src/vue/auth/SignUp.vue              |   7 +-
 frontend/src/vue/auth/SocialAuthSignUp.vue    |   9 +-
 .../src/vue/chat/call/CallContainerIcons.vue  |   2 +-
 frontend/src/vue/chat/call/ChatCall.vue       |   4 +-
 frontend/src/vue/chat/call/ChatRemotePeer.vue |   2 +-
 frontend/src/vue/chat/call/IncomingCall.vue   |   4 +-
 .../vue/chat/call/InputDevicesSettings.vue    |   2 +-
 .../src/vue/chat/chatbox/ChatBackIcon.vue     |   6 +-
 frontend/src/vue/chat/chatbox/ChatBox.vue     |   6 +-
 frontend/src/vue/chat/chatbox/ChatBoxes.vue   |   6 +-
 .../src/vue/chat/chatbox/ChatIsOnlineIcon.vue |   2 +-
 frontend/src/vue/chat/chatbox/ChatNavBar.vue  |   4 +-
 .../src/vue/chat/chatbox/ChatPopupMenu.vue    |   2 +-
 .../vue/chat/chatbox/ChatShowUserTyping.vue   |   2 +-
 .../src/vue/chat/chatbox/SearchMessages.vue   |   2 +-
 .../src/vue/chat/chatbox/UserImageIcon.vue    |   2 +-
 .../src/vue/chat/chatbox/VideoContainer.vue   |   2 +-
 frontend/src/vue/chat/chatbox/VideoObject.vue |   2 +-
 .../chat/message/ChatChangeNameMessage.vue    |   2 +-
 .../vue/chat/message/ChatMessageHeader.vue    |   2 +-
 .../vue/chat/message/ChatMessageToolTip.vue   |   4 +-
 .../vue/chat/message/ChatMessageWrapper.vue   |   2 +-
 .../vue/chat/message/ChatReceivingFile.vue    |   4 +-
 .../src/vue/chat/message/ChatSendingFile.vue  |   2 +-
 .../chat/message/ChatSendingFileTransfer.vue  |   5 +-
 .../vue/chat/message/ChatSendingMessage.vue   |   4 +-
 .../src/vue/chat/message/ChatTextMessage.vue  |   4 +-
 frontend/src/vue/chat/message/ChatThread.vue  |   2 +-
 .../chat/message/ChatUserActionMessage.vue    |   2 +-
 .../vue/chat/message/ReceivingFileInfo.vue    |   4 +-
 frontend/src/vue/chat/right/ChannelTable.vue  |   2 +-
 .../chat/right/ChatRightCollapsedSection.vue  |   2 +-
 .../src/vue/chat/right/ChatRightSection.vue   |   2 +-
 .../src/vue/chat/right/PrivateRoomRow.vue     |   2 +-
 .../vue/chat/right/RoomDirectUsersTable.vue   |   2 +-
 frontend/src/vue/chat/right/RoomRightIcon.vue |   5 +-
 .../src/vue/chat/right/RoomRowWrapper.vue     |   2 +-
 frontend/src/vue/chat/right/UserFlagRow.vue   |   2 +-
 frontend/src/vue/chat/right/UserNavInfo.vue   |   2 +-
 frontend/src/vue/chat/right/UserRow.vue       |   4 +-
 .../src/vue/chat/textarea/ChatAttachments.vue |   2 +-
 .../src/vue/chat/textarea/ChatTagging.vue     |   4 +-
 .../src/vue/chat/textarea/ChatTextArea.vue    |  13 +-
 .../src/vue/chat/textarea/GiphySearch.vue     |   4 +-
 .../src/vue/chat/textarea/MediaRecorder.vue   |   5 +-
 frontend/src/vue/chat/textarea/Painter.vue    |   2 +-
 .../src/vue/chat/textarea/SmileyHolder.vue    |   4 +-
 frontend/src/vue/pages/ChannelAddRoom.vue     |   2 +-
 frontend/src/vue/pages/ChannelSettings.vue    |  12 +-
 frontend/src/vue/pages/ChannelsPage.vue       |   4 +-
 frontend/src/vue/pages/ConfirmMail.vue        |   2 +-
 frontend/src/vue/pages/CreateChannel.vue      |   6 +-
 frontend/src/vue/pages/CreatePrivateRoom.vue  |   2 +-
 frontend/src/vue/pages/EmailChanged.vue       |   2 +-
 frontend/src/vue/pages/MainPage.vue           |   4 +-
 frontend/src/vue/pages/PainterPage.vue        |   2 +-
 frontend/src/vue/pages/RoomSettings.vue       |  12 +-
 frontend/src/vue/pages/RoomUsersListPage.vue  |   8 +-
 frontend/src/vue/pages/UserProfile.vue        |   4 +-
 .../src/vue/pages/UserProfileChangeEmail.vue  |   4 +-
 .../vue/pages/UserProfileChangePassword.vue   |   4 +-
 frontend/src/vue/pages/UserProfileImage.vue   |   4 +-
 frontend/src/vue/pages/UserProfileInfo.vue    |   9 +-
 .../vue/pages/UserProfileOauthSettings.vue    |   2 +-
 .../src/vue/pages/UserProfileSettings.vue     |  12 +-
 frontend/src/vue/pages/ViewProfilePage.vue    |   4 +-
 frontend/src/vue/parts/CreateRoom.vue         |   6 +-
 frontend/src/vue/parts/Growls.vue             |   2 +-
 frontend/src/vue/parts/ParentChannel.vue      |   2 +-
 frontend/src/vue/parts/PickUser.vue           |   2 +-
 frontend/src/vue/ui/AppCheckbox.vue           |   2 +-
 frontend/src/vue/ui/AppGrowl.vue              |   4 +-
 frontend/src/vue/ui/AppImageCropper.vue       |   4 +-
 frontend/src/vue/ui/AppInputDate.vue          |   2 +-
 frontend/src/vue/ui/AppInputRange.vue         |   2 +-
 frontend/src/vue/ui/AppLoadingImage.vue       |   2 +-
 frontend/src/vue/ui/AppMenuBar.vue            |   4 +-
 frontend/src/vue/ui/AppNavWrapper.vue         |   2 +-
 frontend/src/vue/ui/AppProgressBar.vue        |   2 +-
 frontend/src/vue/ui/AppSeparator.vue          | 114 ++++++++++++++++-
 frontend/src/vue/ui/AppSubmit.vue             |   4 +-
 frontend/src/vue/ui/AppSuspense.vue           |   2 +-
 frontend/src/vue/ui/AppTab.vue                |   2 +-
 151 files changed, 676 insertions(+), 532 deletions(-)

diff --git a/frontend/src/ts/classes/DatabaseWrapper.ts b/frontend/src/ts/classes/DatabaseWrapper.ts
index 7ddd25d55..a9a937b1f 100644
--- a/frontend/src/ts/classes/DatabaseWrapper.ts
+++ b/frontend/src/ts/classes/DatabaseWrapper.ts
@@ -1,32 +1,32 @@
-import {ImageType} from "@common/model/enum/image.type";
-import type {IStorage, SetFileIdsForMessage, SetRoomsUsers,} from "@/ts/types/types";
+import type {ImageType} from "@common/model/enum/image.type";
+import type {IStorage, SetFileIdsForMessage, SetRoomsUsers} from "@/ts/types/types";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type {
-    ChannelModel,
-    ChannelsDictModel,
-    CurrentUserInfoModel,
-    CurrentUserSettingsModel,
-    FileModel,
-    MessageModel,
-    MessageStatusModel,
-    RoomDictModel,
-    RoomModel,
-    RoomSettingsModel,
-    UserModel,
+  ChannelModel,
+  ChannelsDictModel,
+  CurrentUserInfoModel,
+  CurrentUserSettingsModel,
+  FileModel,
+  MessageModel,
+  MessageStatusModel,
+  RoomDictModel,
+  RoomModel,
+  RoomSettingsModel,
+  UserModel,
 } from "@/ts/types/model";
 import {MessageStatusInner} from "@/ts/types/model";
-import {convertToBoolean, getChannelDict, getRoomsBaseDict,} from "@/ts/types/converters";
+import {convertToBoolean, getChannelDict, getRoomsBaseDict} from "@/ts/types/converters";
 import type {
-    ChannelDB,
-    FileDB,
-    MessageDB,
-    ProfileDB,
-    RoomDB,
-    RoomUsersDB,
-    SettingsDB,
-    TagDB,
-    UserDB,
+  ChannelDB,
+  FileDB,
+  MessageDB,
+  ProfileDB,
+  RoomDB,
+  RoomUsersDB,
+  SettingsDB,
+  TagDB,
+  UserDB,
 } from "@/ts/types/db";
 import type {SetStateFromStorage} from "@/ts/types/dto";
 import type {MainWindow} from "@/ts/classes/MainWindow";
@@ -332,7 +332,7 @@ export default class DatabaseWrapper implements IStorage {
     this.write((t) => {
       this.executeMultiple(
         t,
-        m.files.map(file => [
+        m.files.map((file) => [
           "update file set file_id = ?, preview_file_id = ? where symbol = ? and message_id = ?",
           [file.id, file.previewId ?? null, file.symbol, m.messageId],
         ]),
diff --git a/frontend/src/ts/classes/DefaultStore.ts b/frontend/src/ts/classes/DefaultStore.ts
index a77c0dad9..f3813c049 100644
--- a/frontend/src/ts/classes/DefaultStore.ts
+++ b/frontend/src/ts/classes/DefaultStore.ts
@@ -1,74 +1,74 @@
-import {Gender} from "@common/model/enum/gender";
+import type {Gender} from "@common/model/enum/gender";
 import {MessageStatus} from "@common/model/enum/message.status";
 import Vuex from "vuex";
 
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {
-    ChannelsDictModel,
-    ChannelsDictUIModel,
-    ChannelUIModel,
-    CurrentUserInfoModel,
-    IncomingCallModel,
-    Location,
-    MessageStatusModel,
-    PastingTextAreaElement,
-    RoomDictModel,
-    SendingFileTransfer,
-    UserDictModel,
+  ChannelsDictModel,
+  ChannelsDictUIModel,
+  ChannelUIModel,
+  CurrentUserInfoModel,
+  IncomingCallModel,
+  Location,
+  MessageStatusModel,
+  PastingTextAreaElement,
+  RoomDictModel,
+  SendingFileTransfer,
+  UserDictModel,
 } from "@/ts/types/model";
 import {
-    ChannelModel,
-    CurrentUserInfoWoImage,
-    CurrentUserSettingsModel,
-    EditingMessage,
-    GrowlModel,
-    GrowlType,
-    MessageModel,
-    MessageStatusInner,
-    ReceivingFile,
-    RoomModel,
-    RoomSettingsModel,
-    SendingFile,
-    UserModel,
+  ChannelModel,
+  CurrentUserInfoWoImage,
+  CurrentUserSettingsModel,
+  EditingMessage,
+  GrowlModel,
+  GrowlType,
+  MessageModel,
+  MessageStatusInner,
+  ReceivingFile,
+  RoomModel,
+  RoomSettingsModel,
+  SendingFile,
+  UserModel,
 } from "@/ts/types/model";
 import type {PrivateRoomsIds} from "@/ts/types/types";
 import {
-    AddMessagesDTO,
-    AddSendingFileTransfer,
-    BooleanIdentifier,
-    IStorage,
-    LiveConnectionLocation,
-    MarkMessageAsRead,
-    MediaIdentifier,
-    MessagesLocation,
-    NumberIdentifier,
-    RemoveMessageProgress,
-    RoomLogEntry,
-    RoomMessageIds,
-    RoomMessagesIds,
-    SetCallOpponent,
-    SetDevices,
-    SetFileIdsForMessage,
-    SetMessageProgress,
-    SetMessageProgressError,
-    SetOpponentAnchor,
-    SetOpponentVoice,
-    SetReceivingFileStatus,
-    SetReceivingFileUploaded,
-    SetRoomsUsers,
-    SetSearchStateTo,
-    SetSearchTextTo,
-    SetSendingFileStatus,
-    SetSendingFileUploaded,
-    SetUploadProgress,
-    SetUploadXHR,
-    ShareIdentifier,
-    StringIdentifier,
+  AddMessagesDTO,
+  AddSendingFileTransfer,
+  BooleanIdentifier,
+  IStorage,
+  LiveConnectionLocation,
+  MarkMessageAsRead,
+  MediaIdentifier,
+  MessagesLocation,
+  NumberIdentifier,
+  RemoveMessageProgress,
+  RoomLogEntry,
+  RoomMessageIds,
+  RoomMessagesIds,
+  SetCallOpponent,
+  SetDevices,
+  SetFileIdsForMessage,
+  SetMessageProgress,
+  SetMessageProgressError,
+  SetOpponentAnchor,
+  SetOpponentVoice,
+  SetReceivingFileStatus,
+  SetReceivingFileUploaded,
+  SetRoomsUsers,
+  SetSearchStateTo,
+  SetSearchTextTo,
+  SetSendingFileStatus,
+  SetSendingFileUploaded,
+  SetUploadProgress,
+  SetUploadXHR,
+  ShareIdentifier,
+  StringIdentifier,
 } from "@/ts/types/types";
-import {SetStateFromStorage, SetStateFromWS,} from "@/ts/types/dto";
+import {SetStateFromStorage, SetStateFromWS} from "@/ts/types/dto";
 import {encodeHTML} from "@/ts/utils/htmlApi";
-import {ACTIVE_ROOM_ID_LS_NAME, ALL_ROOM_ID, SHOW_I_TYPING_INTERVAL,} from "@/ts/utils/consts";
-import {Action, Module, Mutation, VuexModule,} from "vuex-module-decorators";
+import {ACTIVE_ROOM_ID_LS_NAME, ALL_ROOM_ID, SHOW_I_TYPING_INTERVAL} from "@/ts/utils/consts";
+import {Action, Module, Mutation, VuexModule} from "vuex-module-decorators";
 
 
 const logger = loggerFactory.getLogger("store");
@@ -626,7 +626,7 @@ export class DefaultStore extends VuexModule {
     if (!mm.files) {
       throw Error(`Message ${payload.messageId} in room ${payload.roomId} doesn't have files`);
     }
-    payload.files.forEach(file => {
+    payload.files.forEach((file) => {
       mm.files![file.symbol].fileId = file.id || null;
       mm.files![file.symbol].previewFileId = file.previewId || null;
     });
diff --git a/frontend/src/ts/classes/Fetch.ts b/frontend/src/ts/classes/Fetch.ts
index 81f32c89c..a2f945138 100644
--- a/frontend/src/ts/classes/Fetch.ts
+++ b/frontend/src/ts/classes/Fetch.ts
@@ -52,7 +52,7 @@ export default class Fetch {
       const r = new XMLHttpRequest();
       r.addEventListener("load", () => {
         try {
-          let response = JSON.parse(r.response);
+          const response = JSON.parse(r.response);
           if (r.status < 200 || r.status >= 300) {
             this.processException(response);
           } else {
@@ -61,7 +61,6 @@ export default class Fetch {
           }
         } catch (e) {
           reject(e);
-          return;
         }
       });
       r.addEventListener("error", () => {
diff --git a/frontend/src/ts/classes/LocalStorage.ts b/frontend/src/ts/classes/LocalStorage.ts
index 0099a025d..957acc41f 100644
--- a/frontend/src/ts/classes/LocalStorage.ts
+++ b/frontend/src/ts/classes/LocalStorage.ts
@@ -1,14 +1,12 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
-import type {IStorage, SetFileIdsForMessage, SetRoomsUsers,} from "@/ts/types/types";
-import type {
-    ChannelModel,
-    CurrentUserInfoModel,
-    CurrentUserSettingsModel,
-    MessageModel,
-    RoomSettingsModel,
-    UserModel,
-} from "@/ts/types/model";
-import {MessageStatusModel} from '@/ts/types/model';
+import type {IStorage, SetFileIdsForMessage, SetRoomsUsers} from "@/ts/types/types";
+import type {ChannelModel,
+  CurrentUserInfoModel,
+  CurrentUserSettingsModel,
+  MessageModel,
+  RoomSettingsModel,
+  UserModel,
+  MessageStatusModel} from "@/ts/types/model";
 import type {Logger} from "lines-logger";
 
 interface LocalStorageMessage {
diff --git a/frontend/src/ts/classes/MediaCapture.ts b/frontend/src/ts/classes/MediaCapture.ts
index ce605949c..26af4d771 100644
--- a/frontend/src/ts/classes/MediaCapture.ts
+++ b/frontend/src/ts/classes/MediaCapture.ts
@@ -1,7 +1,7 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {stopVideo} from "@/ts/utils/htmlApi";
-import type {permissions_type, PlatformUtil,} from "@/ts/types/model";
+import type {permissions_type, PlatformUtil} from "@/ts/types/model";
 
 export default class MediaCapture {
   private readonly isRecordingVideo: boolean;
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index e6528e3d4..1a3988070 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,6 +1,6 @@
-import {DefaultWsInMessage, HandlerName} from "@common/ws/common";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {IMessageHandler} from "@common/legacy";
+import type {DefaultWsInMessage, HandlerName} from "@common/ws/common";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {IMessageHandler} from "@common/legacy";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 
diff --git a/frontend/src/ts/devices/AndroidPlatformUtils.ts b/frontend/src/ts/devices/AndroidPlatformUtils.ts
index f126b3113..e071643e2 100644
--- a/frontend/src/ts/devices/AndroidPlatformUtils.ts
+++ b/frontend/src/ts/devices/AndroidPlatformUtils.ts
@@ -1,5 +1,5 @@
 import {IS_ANDROID} from "@/ts/utils/consts";
-import type {permissions_type, PlatformUtil,} from "@/ts/types/model";
+import type {permissions_type, PlatformUtil} from "@/ts/types/model";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 
diff --git a/frontend/src/ts/devices/WebPlatformUtils.ts b/frontend/src/ts/devices/WebPlatformUtils.ts
index a506c321e..ea72affde 100644
--- a/frontend/src/ts/devices/WebPlatformUtils.ts
+++ b/frontend/src/ts/devices/WebPlatformUtils.ts
@@ -1,4 +1,4 @@
-import type {permissions_type, PlatformUtil,} from "@/ts/types/model";
+import type {permissions_type, PlatformUtil} from "@/ts/types/model";
 
 export class WebPlatformUtils implements PlatformUtil {
   public async askPermissions(...askedPermissions: permissions_type): Promise<void> {
diff --git a/frontend/src/ts/devices/electron.ts b/frontend/src/ts/devices/electron.ts
index 0c24a778f..5fe36406f 100644
--- a/frontend/src/ts/devices/electron.ts
+++ b/frontend/src/ts/devices/electron.ts
@@ -1,4 +1,4 @@
-import {app, BrowserWindow,} from "electron";
+import {app, BrowserWindow} from "electron";
 import * as constants from "@/ts/utils/consts";
 import {ELECTRON_IGNORE_SSL, ELECTRON_MAIN_FILE, IS_DEBUG} from "@/ts/utils/consts";
 
diff --git a/frontend/src/ts/instances/loggerFactory.ts b/frontend/src/ts/instances/loggerFactory.ts
index 8729ad0b7..691f5020a 100644
--- a/frontend/src/ts/instances/loggerFactory.ts
+++ b/frontend/src/ts/instances/loggerFactory.ts
@@ -1,5 +1,5 @@
 import type {LogLevel} from "lines-logger";
 import {LoggerFactory} from "lines-logger";
-import {IS_DEBUG, LOG_LEVEL_LS,} from "@/ts/utils/consts";
+import {IS_DEBUG, LOG_LEVEL_LS} from "@/ts/utils/consts";
 
 export default new LoggerFactory(localStorage.getItem(LOG_LEVEL_LS) as LogLevel || (IS_DEBUG ? "trace" : "error"));
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index d605e29f2..90339665e 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -1,7 +1,7 @@
 import type {LoginMessage, LoginMessageBody} from "@/ts/types/messages/inner/login";
 import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import type {RouterNavigateMessage, RouterNavigateMessageBody,} from "@/ts/types/messages/inner/router.navigate";
-import {createRouter, createWebHashHistory,} from "vue-router";
+import type {RouterNavigateMessage, RouterNavigateMessageBody} from "@/ts/types/messages/inner/router.navigate";
+import {createRouter, createWebHashHistory} from "vue-router";
 import {store} from "@/ts/instances/storeInstance";
 import MainPage from "@/vue/pages/MainPage.vue";
 import ChannelsPage from "@/vue/pages/ChannelsPage.vue";
@@ -18,7 +18,7 @@ import CreatePrivateRoom from "@/vue/pages/CreatePrivateRoom.vue";
 import ViewProfilePage from "@/vue/pages/ViewProfilePage.vue";
 import RoomSettings from "@/vue/pages/RoomSettings.vue";
 import ApplyResetPassword from "@/vue/auth/ApplyResetPassword.vue";
-import {ACTIVE_ROOM_ID_LS_NAME, ALL_ROOM_ID,} from "@/ts/utils/consts";
+import {ACTIVE_ROOM_ID_LS_NAME, ALL_ROOM_ID} from "@/ts/utils/consts";
 import ConfirmMail from "@/vue/pages/ConfirmMail.vue";
 import UserProfileChangeEmail from "@/vue/pages/UserProfileChangeEmail.vue";
 import CreateChannel from "@/vue/pages/CreateChannel.vue";
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index f40bcb03c..afca5944f 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -28,12 +28,11 @@ import {RoomHandler} from "@/ts/message_handlers/RomHandler";
 import {mainWindow} from "@/ts/instances/mainWindow";
 import {SmileysApi} from "@/ts/utils/smileys";
 import {loggerMixin} from "@/ts/utils/mixins";
-import {switchDirective, validityDirective,} from "@/ts/utils/directives";
+import {switchDirective, validityDirective} from "@/ts/utils/directives";
 import Subscription from "@/ts/classes/Subscription";
 import type {Router} from "vue-router";
 import {SessionHolderImpl} from "@/ts/classes/SessionHolderImpl";
-import {SessionHolder} from "@/ts/types/types";
-
+import type {SessionHolder} from "@/ts/types/types";
 
 
 const logger: Logger = loggerFactory.getLoggerColor("main", "#007a70");
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 52928a832..761a8abdd 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -1,9 +1,9 @@
-import {
+import type {
   DefaultWsInMessage,
   DefaultWsOutMessage,
   HandlerName,
   RequestWsOutMessage,
-  ResponseWsInMessage
+  ResponseWsInMessage,
 } from "@common/ws/common";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
@@ -47,7 +47,7 @@ export default class AbstractMessageProcessor {
     message.cbId = ++this.uniquePositiveMessageId;
   }
 
-  public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | null | ResponseWsInMessage<D> {
+  public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | ResponseWsInMessage<D> | null {
     let data: DefaultWsInMessage<string, HandlerName, any> | null = null;
     try {
       data = JSON.parse(jsonData);
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/Api.ts
index b67f361bc..8df5ebe50 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/Api.ts
@@ -7,7 +7,7 @@ import FileApi from "@/ts/message_handlers/http_modules/FileApi";
 import RestApi from "@/ts/message_handlers/http_modules/RestApi";
 import JsApi from "@/ts/message_handlers/http_modules/JsApi";
 import GiphyApi from "@/ts/message_handlers/http_modules/GiphyApi";
-import {GIPHY_API_KEY, GIPHY_URL,} from "@/ts/utils/consts";
+import {GIPHY_API_KEY, GIPHY_URL} from "@/ts/utils/consts";
 
 export default class Api {
   public readonly authApi: AuthApi;
diff --git a/frontend/src/ts/message_handlers/MessageHelper.ts b/frontend/src/ts/message_handlers/MessageHelper.ts
index fd3770cad..a806fb28d 100644
--- a/frontend/src/ts/message_handlers/MessageHelper.ts
+++ b/frontend/src/ts/message_handlers/MessageHelper.ts
@@ -1,6 +1,6 @@
 import faviconUrl from "@/assets/img/favicon.ico";
 import {incoming} from "@/ts/utils/audio";
-import type {FileModel, MessageModel,} from "@/ts/types/model";
+import type {FileModel, MessageModel} from "@/ts/types/model";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {AudioPlayer} from "@/ts/classes/AudioPlayer";
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index b51c18c8c..5d470d094 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,24 +1,24 @@
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {RoomDto} from "@common/model/dto/room.dto";
-import {AddRoomBase, ChangeDeviceType} from "@common/model/ws.base";
-import {AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomMessage} from "@common/ws/message/room/add.room";
-import {DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {ShowITypeWsInMessage} from "@common/ws/message/room/show.i.type";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
-import {
+import type {ChannelDto} from "@common/model/dto/channel.dto";
+import type {RoomDto} from "@common/model/dto/room.dto";
+import type {AddRoomBase, ChangeDeviceType} from "@common/model/ws.base";
+import type {AddChannelMessage} from "@common/ws/message/room/add.channel";
+import type {AddInviteMessage} from "@common/ws/message/room/add.invite";
+import type {AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import type {AddRoomMessage} from "@common/ws/message/room/add.room";
+import type {DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import type {DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import type {InviteUserMessage} from "@common/ws/message/room/invite.user";
+import type {LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import type {RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import type {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import type {SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import type {ShowITypeWsInMessage} from "@common/ws/message/room/show.i.type";
+import type {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import type {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import type {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import type {
   AddChannelMessage,
   AddInviteMessage,
   AddRoomBase,
@@ -30,11 +30,11 @@ import {
   LeaveUserMessage,
   RemoveOnlineUserMessage,
   SaveChannelSettingsMessage,
-  SaveRoomSettingsMessage
+  SaveRoomSettingsMessage,
 } from "@common/legacy";
-import {ShowITypeWsInMessage} from '@common/ws/message/show.i.type';
+import type {ShowITypeWsInMessage} from "@common/ws/message/show.i.type";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
-import type {RoomLogEntry, SetRoomsUsers,} from "@/ts/types/types";
+import type {RoomLogEntry, SetRoomsUsers} from "@/ts/types/types";
 
 import type {
   ChannelModel,
@@ -45,7 +45,7 @@ import type {
   UserDictModel,
   UserModel,
 } from "@/ts/types/model";
-import {convertUser, getChannelDict, getRoom, getRoomsBaseDict,} from "@/ts/types/converters";
+import {convertUser, getChannelDict, getRoom, getRoomsBaseDict} from "@/ts/types/converters";
 
 import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import type {Logger} from "lines-logger";
@@ -54,10 +54,10 @@ import type Api from "@/ts/message_handlers/Api";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {AudioPlayer} from "@/ts/classes/AudioPlayer";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import {login, logout,} from "@/ts/utils/audio";
+import {login, logout} from "@/ts/utils/audio";
 import type Subscription from "@/ts/classes/Subscription";
 
-import {SetStateFromWS} from "@/ts/types/dto";
+import type {SetStateFromWS} from "@/ts/types/dto";
 
 
 export class RoomHandler extends MessageHandler {
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 8ed03790d..9f3cc7475 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,32 +1,32 @@
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {MessagesResponseMessage} from "@common/model/ws.base";
-import {AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddRoomMessage} from "@common/ws/message/room/add.room";
-import {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {ShowITypeWsOutMessage} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {PingMessage} from "@common/ws/message/ws/ping";
-import {PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {PrintMessageWsInMessage, PrintMessageWsOutMessage} from "@common/ws/message/ws-message/print.message";
-import {GetCountryCodeWsInMessage, GetCountryCodeWsOutMessage} from "@common/ws/message/get.country.code";
-import {SetMessageStatusWsOutMessage} from "@common/ws/message/set.message.status";
-import {SyncHistoryWsInMessage, SyncHistoryWsOutMessage} from "@common/ws/message/sync.history";
-import {DefaultWsOutMessage} from "@common/ws/common";
+import type {GiphyDto} from "@common/model/dto/giphy.dto";
+import type {RoomNoUsersDto} from "@common/model/dto/room.dto";
+import type {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import type {MessageStatus} from "@common/model/enum/message.status";
+import type {MessagesResponseMessage} from "@common/model/ws.base";
+import type {AddChannelMessage} from "@common/ws/message/room/add.channel";
+import type {AddInviteMessage} from "@common/ws/message/room/add.invite";
+import type {AddRoomMessage} from "@common/ws/message/room/add.room";
+import type {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import type {ShowITypeWsOutMessage} from "@common/ws/message/room/show.i.type";
+import type {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import type {PingMessage} from "@common/ws/message/ws/ping";
+import type {PongMessage} from "@common/ws/message/ws/pong";
+import type {SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import type {SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import type {SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import type {SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import type {UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import type {PrintMessageWsInMessage, PrintMessageWsOutMessage} from "@common/ws/message/ws-message/print.message";
+import type {GetCountryCodeWsInMessage, GetCountryCodeWsOutMessage} from "@common/ws/message/get.country.code";
+import type {SetMessageStatusWsOutMessage} from "@common/ws/message/set.message.status";
+import type {SyncHistoryWsInMessage, SyncHistoryWsOutMessage} from "@common/ws/message/sync.history";
+import type {DefaultWsOutMessage} from "@common/ws/common";
 import {WS_SESSION_EXPIRED_CODE} from "@common/consts";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import {
+import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import type {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import type {
   AddChannelMessage,
   AddInviteMessage,
   AddRoomMessage,
@@ -35,10 +35,10 @@ import {
   SetSettingsMessage,
   SetUserProfileMessage,
   UserProfileChangedMessage,
-  WebRtcSetConnectionIdMessage
+  WebRtcSetConnectionIdMessage,
 } from "@common/legacy";
-import {ShowITypeWsOutMessage} from '@common/ws/message/show.i.type';
-import {PrintMessageWsInMessage, PrintMessageWsOutMessage} from '@common/ws/message/print.message';
+import type {ShowITypeWsOutMessage} from "@common/ws/message/show.i.type";
+import type {PrintMessageWsInMessage, PrintMessageWsOutMessage} from "@common/ws/message/print.message";
 import {
   CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT,
   CONNECTION_RETRY_TIME,
@@ -46,12 +46,12 @@ import {
   IS_DEBUG,
   LOG_LEVEL_LS,
 } from "@/ts/utils/consts";
-import type {Logger, LogLevel,} from "lines-logger";
+import type {Logger, LogLevel} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
-import type {CurrentUserInfoWoImage, CurrentUserSettingsModel, Location,} from "@/ts/types/model";
-import type {MessageSupplier, SessionHolder,} from "@/ts/types/types";
-import {convertLocation, currentUserInfoDtoToModel, userSettingsDtoToModel,} from "@/ts/types/converters";
+import type {CurrentUserInfoWoImage, CurrentUserSettingsModel, Location} from "@/ts/types/model";
+import type {MessageSupplier, SessionHolder} from "@/ts/types/types";
+import {convertLocation, currentUserInfoDtoToModel, userSettingsDtoToModel} from "@/ts/types/converters";
 
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 6512c249f..dc27b6ee3 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -1,17 +1,17 @@
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import type {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import type {GiphyDto} from "@common/model/dto/giphy.dto";
+import type {MessageModelDto} from "@common/model/dto/message.model.dto";
 import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
-import {MessagesResponseMessage} from "@common/model/ws.base";
-import {DeleteMessage} from "@common/ws/message/ws-message/delete.message";
-import {PrintMessageWsInMessage} from "@common/ws/message/ws-message/print.message";
-import {SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
-import {SyncHistoryWsInMessage} from "@common/ws/message/sync.history";
-import {HandlerName} from "@common/ws/common";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {DeleteMessage, MessagesResponseMessage} from "@common/legacy";
-import {PrintMessageWsInMessage} from '@common/ws/message/print.message';
+import type {MessagesResponseMessage} from "@common/model/ws.base";
+import type {DeleteMessage} from "@common/ws/message/ws-message/delete.message";
+import type {PrintMessageWsInMessage} from "@common/ws/message/ws-message/print.message";
+import type {SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
+import type {SyncHistoryWsInMessage} from "@common/ws/message/sync.history";
+import type {HandlerName} from "@common/ws/common";
+import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import type {DeleteMessage, MessagesResponseMessage} from "@common/legacy";
+import type {PrintMessageWsInMessage} from "@common/ws/message/print.message";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Api from "@/ts/message_handlers/Api";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
@@ -23,7 +23,7 @@ import type {
   SetMessageProgressError,
   SetUploadProgress,
 } from "@/ts/types/types";
-import type {FileModel, MessageModel, RoomModel,} from "@/ts/types/model";
+import type {FileModel, MessageModel, RoomModel} from "@/ts/types/model";
 import {MessageStatusInner} from "@/ts/types/model";
 import type {Logger} from "lines-logger";
 
@@ -34,9 +34,9 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import {savedFiles} from "@/ts/utils/htmlApi";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
-import {LAST_SYNCED, MESSAGES_PER_SEARCH,} from "@/ts/utils/consts";
+import {LAST_SYNCED, MESSAGES_PER_SEARCH} from "@/ts/utils/consts";
 import {convertMessageModelDtoToModel} from "@/ts/types/converters";
-import {checkIfIdIsMissing, getMissingIds,} from "@/ts/utils/pureFunctions";
+import {checkIfIdIsMissing, getMissingIds} from "@/ts/utils/pureFunctions";
 import type Subscription from "@/ts/classes/Subscription";
 
 
@@ -338,7 +338,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
   }
 
   public async printMessage(request: PrintMessageWsInMessage) {
-    let inMessage: MessageModelDto = request.message;
+    const inMessage: MessageModelDto = request.message;
     const message: MessageModel = convertMessageModelDtoToModel(inMessage, null, (time) => this.ws.convertServerTimeToPC(time));
     this.messageHelper.processUnknownP2pMessage(message);
     if (inMessage.userId !== this.store.myId) {
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index 1114602fa..c0f6bcaf7 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -1,5 +1,5 @@
-import {GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {ResponseWsInMessage} from "@common/ws/common";
+import type {GrowlWsInMessage} from "@common/ws/message/growl.message";
+import type {ResponseWsInMessage} from "@common/ws/common";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type Subscription from "@/ts/classes/Subscription";
 import type {MessageSupplier} from "@/ts/types/types";
@@ -36,14 +36,16 @@ export class WsMessageProcessor extends AbstractMessageProcessor {
     }
   }
 
-  // TODO
-  // public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | null | ResponseWsInMessage<D> {
-  //   const data: DefaultWsInMessage<string, HandlerName, D> | null| ResponseWsInMessage<D> = super.parseMessage(jsonData);
-  //   if ((data as DefaultWsInMessage<string, HandlerName, D>)?.handler !== "void" && (!data?.handler || !data.action)) {
-  //     this.logger.error("Invalid message structure")();
-  //
-  //     return null;
-  //   }
-  //   return data;
-  // }
+  /*
+   * TODO
+   * public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | null | ResponseWsInMessage<D> {
+   *   const data: DefaultWsInMessage<string, HandlerName, D> | null| ResponseWsInMessage<D> = super.parseMessage(jsonData);
+   *   if ((data as DefaultWsInMessage<string, HandlerName, D>)?.handler !== "void" && (!data?.handler || !data.action)) {
+   *     this.logger.error("Invalid message structure")();
+   *
+   *     return null;
+   *   }
+   *   return data;
+   * }
+   */
 }
diff --git a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
index 8e67e3fa5..82cbdb51c 100644
--- a/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/AuthApi.ts
@@ -1,10 +1,10 @@
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SessionResponse} from "@common/model/http.base";
+import type {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import type {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import type {SignInRequest} from "@common/http/auth/sign.in";
+import type {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import type {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import type {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import type {SessionResponse} from "@common/model/http.base";
 
 
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/message_handlers/http_modules/FileApi.ts b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
index deaa09136..a8df88231 100644
--- a/frontend/src/ts/message_handlers/http_modules/FileApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/FileApi.ts
@@ -1,4 +1,4 @@
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import type {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
 
 
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
index 8afe5fa7f..6cb52bc48 100644
--- a/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/GiphyApi.ts
@@ -5,8 +5,10 @@ import type Fetch from "@/ts/classes/Fetch";
 
 export default class GiphyApi {
   protected readonly logger: Logger;
-  private fetch: Fetch;
-  private apiKey: string;
+
+  private readonly fetch: Fetch;
+
+  private readonly apiKey: string;
 
   public constructor(fetch: Fetch, apiKey: string) {
     this.fetch = fetch;
diff --git a/frontend/src/ts/message_handlers/http_modules/RestApi.ts b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
index c870fc42f..d775d504a 100644
--- a/frontend/src/ts/message_handlers/http_modules/RestApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/RestApi.ts
@@ -1,7 +1,7 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type Fetch from "@/ts/classes/Fetch";
-import type {OauthStatus, ViewUserProfileDto,} from "@/ts/types/dto";
+import type {OauthStatus, ViewUserProfileDto} from "@/ts/types/dto";
 
 export default class RestApi {
   protected readonly logger: Logger;
diff --git a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
index 0e85b197c..004c3f010 100644
--- a/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
+++ b/frontend/src/ts/message_handlers/http_modules/VerifyApi.ts
@@ -1,7 +1,7 @@
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import type {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import type {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import type {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import type {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
 
 
 import loggerFactory from "@/ts/instances/loggerFactory";
@@ -44,7 +44,7 @@ export default class VerifyApi {
   public async sendRestorePassword(params: SendRestorePasswordRequest): Promise<SendRestorePasswordResponse> {
     return this.fetch.doPost<SendRestorePasswordResponse>({
       url: "/send-restore-password",
-      params: params,
+      params,
     });
   }
 }
diff --git a/frontend/src/ts/types/converters.ts b/frontend/src/ts/types/converters.ts
index e59e2a0d9..499891318 100644
--- a/frontend/src/ts/types/converters.ts
+++ b/frontend/src/ts/types/converters.ts
@@ -1,27 +1,27 @@
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
+import type {ChannelDto} from "@common/model/dto/channel.dto";
+import type {FileModelDto} from "@common/model/dto/file.model.dto";
+import type {LocationDto} from "@common/model/dto/location.dto";
+import type {MessageModelDto} from "@common/model/dto/message.model.dto";
+import type {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import type {UserDto} from "@common/model/dto/user.dto";
+import type {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import type {Gender} from "@common/model/enum/gender";
 import {MessageStatus} from "@common/model/enum/message.status";
 import type {
-    ChannelModel,
-    CurrentUserInfoModel,
-    CurrentUserInfoWoImage,
-    CurrentUserSettingsModel,
-    FileModel,
-    Location,
-    MessageModel,
-    RoomModel,
-    RoomSettingsModel,
-    UserModel,
+  ChannelModel,
+  CurrentUserInfoModel,
+  CurrentUserInfoWoImage,
+  CurrentUserSettingsModel,
+  FileModel,
+  Location,
+  MessageModel,
+  RoomModel,
+  RoomSettingsModel,
+  UserModel,
 } from "@/ts/types/model";
 
-import type {BooleanDB,} from "@/ts/types/db";
+import type {BooleanDB} from "@/ts/types/db";
 import type {MessageP2pDto} from "@/ts/types/messages/p2pDto";
 
 
diff --git a/frontend/src/ts/types/db.ts b/frontend/src/ts/types/db.ts
index a9ec66196..528759024 100644
--- a/frontend/src/ts/types/db.ts
+++ b/frontend/src/ts/types/db.ts
@@ -1,6 +1,6 @@
-import {Gender} from "@common/model/enum/gender";
+import type {Gender} from "@common/model/enum/gender";
 import type {LogLevel} from "lines-logger";
-import {MessageStatusInner} from '@/ts/types/model';
+import type {MessageStatusInner} from "@/ts/types/model";
 
 
 export interface UserDB {
diff --git a/frontend/src/ts/types/dto.ts b/frontend/src/ts/types/dto.ts
index 8650bb420..6f6b5c7b4 100644
--- a/frontend/src/ts/types/dto.ts
+++ b/frontend/src/ts/types/dto.ts
@@ -1,11 +1,11 @@
-import {UserProfileDto} from "@common/model/dto/user.profile.dto";
+import type {UserProfileDto} from "@common/model/dto/user.profile.dto";
 import type {
-    ChannelsDictModel,
-    CurrentUserInfoModel,
-    CurrentUserSettingsModel,
-    MessageStatusModel,
-    RoomDictModel,
-    UserModel,
+  ChannelsDictModel,
+  CurrentUserInfoModel,
+  CurrentUserSettingsModel,
+  MessageStatusModel,
+  RoomDictModel,
+  UserModel,
 } from "@/ts/types/model";
 
 
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index 58d9a0c3c..300ad1112 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -2,9 +2,9 @@ import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type Api from "@/ts/message_handlers/Api";
 import type {Logger} from "lines-logger";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {GoogleCaptcha, PlatformUtil,} from "@/ts/types/model";
+import type {GoogleCaptcha, PlatformUtil} from "@/ts/types/model";
 import type WsMessageHandler from "@/ts/message_handlers/WsMessageHandler";
-import type {IStorage, JsAudioAnalyzer,} from "@/ts/types/types";
+import type {IStorage, JsAudioAnalyzer} from "@/ts/types/types";
 import type WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import type Subscription from "@/ts/classes/Subscription";
 import type {Router} from "vue-router";
diff --git a/frontend/src/ts/types/extensions.d.ts b/frontend/src/ts/types/extensions.d.ts
index 04d35f46d..6872e14ee 100644
--- a/frontend/src/ts/types/extensions.d.ts
+++ b/frontend/src/ts/types/extensions.d.ts
@@ -63,15 +63,15 @@ declare module "*.json" {
 
 
 declare module "*.vue" {
-    import type {DefineComponent} from "vue";
+  import type {DefineComponent} from "vue";
 
-    const component: DefineComponent<{}, {}, any>;
+  const component: DefineComponent<{}, {}, any>;
   export default component;
 }
 
 declare module "*.vue.ts" {
-    import type {DefineComponent} from "vue";
+  import type {DefineComponent} from "vue";
 
-    const component: DefineComponent<{}, {}, any>;
+  const component: DefineComponent<{}, {}, any>;
   export default component;
 }
diff --git a/frontend/src/ts/types/messages/helper.ts b/frontend/src/ts/types/messages/helper.ts
index abb1a0a61..7487bc1f1 100644
--- a/frontend/src/ts/types/messages/helper.ts
+++ b/frontend/src/ts/types/messages/helper.ts
@@ -1,4 +1,4 @@
-import {DefaultWsInMessage, HandlerName} from "@common/ws/common";
+import type {DefaultWsInMessage, HandlerName} from "@common/ws/common";
 
 export interface DefaultInnerSystemMessage<A extends string, H extends HandlerName, D> extends DefaultWsInMessage<A, H, D> {
   // If true, no errors should be present on handeling this message by sucrcription if nothing was notified
diff --git a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
index 187598f9d..d2af6485f 100644
--- a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
@@ -1,11 +1,11 @@
-import {ChangeDeviceType} from "@common/model/ws.base";
+import type {ChangeDeviceType} from "@common/model/ws.base";
 
 
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeDeviceType} from "@common/legacy";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {ChangeDeviceType} from "@common/legacy";
 
 
-export interface ChangeP2pRoomInfoMessageBody  {
+export interface ChangeP2pRoomInfoMessageBody {
   allowZeroSubscribers: true;
   changeType: ChangeDeviceType;
   roomId: number;
diff --git a/frontend/src/ts/types/messages/inner/change.stream.ts b/frontend/src/ts/types/messages/inner/change.stream.ts
index a3d56e529..86a8b6efd 100644
--- a/frontend/src/ts/types/messages/inner/change.stream.ts
+++ b/frontend/src/ts/types/messages/inner/change.stream.ts
@@ -1,6 +1,6 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface ChangeStreamMessageBody {
   newStream: MediaStream;
 }
-export type ChangeStreamMessage = DefaultInnerSystemMessage<"streamChanged", "peerConnection:*", ChangeStreamMessageBody>
+export type ChangeStreamMessage = DefaultInnerSystemMessage<"streamChanged", "peerConnection:*", ChangeStreamMessageBody>;
diff --git a/frontend/src/ts/types/messages/inner/change.user.online.info.ts b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
index 8599780e5..dd231286f 100644
--- a/frontend/src/ts/types/messages/inner/change.user.online.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
@@ -1,8 +1,8 @@
-import {ChangeOnlineType} from "@common/model/ws.base";
+import type {ChangeOnlineType} from "@common/model/ws.base";
 
 
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {ChangeOnlineType} from "@common/legacy";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {ChangeOnlineType} from "@common/legacy";
 
 export interface ChangeUserOnlineInfoMessageBody {
   opponentWsId: string;
diff --git a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
index 9edb0ab8d..c37c0c798 100644
--- a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
+++ b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
@@ -1,4 +1,4 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface CheckTransferDestroyMessageBody {
   wsOpponentId: string;
diff --git a/frontend/src/ts/types/messages/inner/connect.to.remote.ts b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
index 57acac761..d0b6597dc 100644
--- a/frontend/src/ts/types/messages/inner/connect.to.remote.ts
+++ b/frontend/src/ts/types/messages/inner/connect.to.remote.ts
@@ -1,5 +1,5 @@
-import {HandlerName} from "@common/ws/common";
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {HandlerName} from "@common/ws/common";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface ConnectToRemoteMessageBody {
   stream: MediaStream | null;
diff --git a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
index af7da4ef9..d1b14469e 100644
--- a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
+++ b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
@@ -1,3 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type DestroyPeerConnectionMessage = DefaultInnerSystemMessage<"destroy", "peerConnection:*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/internet.appear.ts b/frontend/src/ts/types/messages/inner/internet.appear.ts
index e7b57dd79..60ce0a056 100644
--- a/frontend/src/ts/types/messages/inner/internet.appear.ts
+++ b/frontend/src/ts/types/messages/inner/internet.appear.ts
@@ -1,3 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type InternetAppearMessage = DefaultInnerSystemMessage<"internetAppear", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/login.ts b/frontend/src/ts/types/messages/inner/login.ts
index 0231d4554..f1aca348f 100644
--- a/frontend/src/ts/types/messages/inner/login.ts
+++ b/frontend/src/ts/types/messages/inner/login.ts
@@ -1,4 +1,4 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface LoginMessageBody {
   session: string;
diff --git a/frontend/src/ts/types/messages/inner/logout.ts b/frontend/src/ts/types/messages/inner/logout.ts
index ad6faf651..30fa44c1f 100644
--- a/frontend/src/ts/types/messages/inner/logout.ts
+++ b/frontend/src/ts/types/messages/inner/logout.ts
@@ -1,3 +1,3 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export type LogoutMessage = DefaultInnerSystemMessage<"logout", "*", {}>;
diff --git a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
index bf28b20f7..77d5da0c6 100644
--- a/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
+++ b/frontend/src/ts/types/messages/inner/pub.set.rooms.ts
@@ -1,9 +1,9 @@
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {RoomDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
+import type {ChannelDto} from "@common/model/dto/channel.dto";
+import type {RoomDto} from "@common/model/dto/room.dto";
+import type {UserDto} from "@common/model/dto/user.dto";
 
 
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 
 export interface PubSetRoomsMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/router.navigate.ts b/frontend/src/ts/types/messages/inner/router.navigate.ts
index ab807e7e5..c81fc7c2c 100644
--- a/frontend/src/ts/types/messages/inner/router.navigate.ts
+++ b/frontend/src/ts/types/messages/inner/router.navigate.ts
@@ -1,4 +1,4 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface RouterNavigateMessageBody {
   to: string;
diff --git a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
index 8b4598354..6f5a01086 100644
--- a/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
+++ b/frontend/src/ts/types/messages/inner/send.set.messages.status.ts
@@ -1,5 +1,5 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import {MessageStatusModel} from "@/ts/types/model";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {MessageStatusModel} from "@/ts/types/model";
 
 export interface SendSetMessagesStatusMessageBody {
   messageIds: number[];
diff --git a/frontend/src/ts/types/messages/inner/sync.p2p.ts b/frontend/src/ts/types/messages/inner/sync.p2p.ts
index fb83fc330..4cc43f2fa 100644
--- a/frontend/src/ts/types/messages/inner/sync.p2p.ts
+++ b/frontend/src/ts/types/messages/inner/sync.p2p.ts
@@ -1,6 +1,6 @@
-import {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
 export interface SyncP2PMessageBody {
   id: number;
 }
-export type SyncP2PMessage = DefaultInnerSystemMessage<"syncP2pMessage", "peerConnection:*", SyncP2PMessageBody>
+export type SyncP2PMessage = DefaultInnerSystemMessage<"syncP2pMessage", "peerConnection:*", SyncP2PMessageBody>;
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index a2873de7b..e36cb997b 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -3,8 +3,8 @@
  * So if we create a structure on one PC (on frontend) and handle on another (on frontend as well)
  * this file should do it
  */
-import {MessageStatus} from "@common/model/enum/message.status";
-import type {MessageP2pDto, MessagesInfo,} from "@/ts/types/messages/p2pDto";
+import type {MessageStatus} from "@common/model/enum/message.status";
+import type {MessageP2pDto, MessagesInfo} from "@/ts/types/messages/p2pDto";
 
 
 export type P2PHandlerType<A extends string> = (a: DefaultP2pMessage<A>) => Promise<void> | void;
@@ -14,7 +14,7 @@ export type P2PHandlerTypes<K extends string> = {
 };
 
 export interface DefaultP2pMessage<A extends string> extends DefaultMessage<A> {
- resolveCbId?: number; // If this callback id is present, resolve it
+  resolveCbId?: number; // If this callback id is present, resolve it
 
 }
 
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 58fdd2f04..92ebbe0d8 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -1,6 +1,6 @@
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
+import type {Gender} from "@common/model/enum/gender";
+import type {ImageType} from "@common/model/enum/image.type";
+import type {MessageStatus} from "@common/model/enum/message.status";
 import type {LogLevel} from "lines-logger";
 
 
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 84e04e56c..e4e68a674 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -1,20 +1,20 @@
-import {SaveFileResponse} from "@common/http/file/save.file";
-import {DefaultWsInMessage, HandlerName} from "@common/ws/common";
+import type {SaveFileResponse} from "@common/http/file/save.file";
+import type {DefaultWsInMessage, HandlerName} from "@common/ws/common";
 import type {
-    CallInfoModel,
-    ChannelModel,
-    CurrentUserInfoModel,
-    CurrentUserSettingsModel,
-    FileModel,
-    FileTransferStatus,
-    MessageModel,
-    MessageStatusModel,
-    RoomLog,
-    RoomModel,
-    RoomSettingsModel,
-    SendingFileTransfer,
-    UploadProgressModel,
-    UserModel
+  CallInfoModel,
+  ChannelModel,
+  CurrentUserInfoModel,
+  CurrentUserSettingsModel,
+  FileModel,
+  FileTransferStatus,
+  MessageModel,
+  MessageStatusModel,
+  RoomLog,
+  RoomModel,
+  RoomSettingsModel,
+  SendingFileTransfer,
+  UploadProgressModel,
+  UserModel,
 } from "@/ts/types/model";
 import type {SetStateFromStorage} from "@/ts/types/dto";
 
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index c09b1305d..408ca6bd4 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -1,7 +1,7 @@
 import {ImageType} from "@common/model/enum/image.type";
-import {IS_DEBUG, PASTED_GIPHY_CLASS, PASTED_IMG_CLASS, USERNAME_REGEX,} from "@/ts/utils/consts";
+import {IS_DEBUG, PASTED_GIPHY_CLASS, PASTED_IMG_CLASS, USERNAME_REGEX} from "@/ts/utils/consts";
 import type {MessageDataEncode} from "@/ts/types/types";
-import type {CurrentUserSettingsModel, FileModel, MessageModel, UserModel,} from "@/ts/types/model";
+import type {CurrentUserSettingsModel, FileModel, MessageModel, UserModel} from "@/ts/types/model";
 import recordIcon from "@/assets/img/audio.svg";
 import fileIcon from "@/assets/img/file.svg";
 import {getFlag} from "@/ts/utils/flags";
@@ -9,7 +9,7 @@ import videoIcon from "@/assets/img/icon-play-red.svg";
 import type {SmileysApi} from "@/ts/utils/smileys";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
-import {MEDIA_API_URL, webpSupported,} from "@/ts/utils/runtimeConsts";
+import {MEDIA_API_URL, webpSupported} from "@/ts/utils/runtimeConsts";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GIFObject} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/utils/pureFunctions.ts b/frontend/src/ts/utils/pureFunctions.ts
index 086ddcf70..53549b679 100644
--- a/frontend/src/ts/utils/pureFunctions.ts
+++ b/frontend/src/ts/utils/pureFunctions.ts
@@ -1,6 +1,6 @@
 import {MessageStatus} from "@common/model/enum/message.status";
-import type {FileModel, MessageModel,} from "@/ts/types/model";
-import {MessageStatusInner} from '@/ts/types/model';
+import type {FileModel, MessageModel} from "@/ts/types/model";
+import {MessageStatusInner} from "@/ts/types/model";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {MessageSender} from "@/ts/types/types";
 import {ALLOW_EDIT_MESSAGE_IF_UPDATE_HAPPENED_MS_AGO} from "@/ts/utils/consts";
diff --git a/frontend/src/ts/utils/runtimeConsts.ts b/frontend/src/ts/utils/runtimeConsts.ts
index 0c8c8005b..bb04ddc53 100644
--- a/frontend/src/ts/utils/runtimeConsts.ts
+++ b/frontend/src/ts/utils/runtimeConsts.ts
@@ -1,5 +1,5 @@
 import mobile from "is-mobile";
-import {BACKEND_ADDRESS, IS_SSL, PUBLIC_PATH, WEBRTC_CONFIG,} from "@/ts/utils/consts";
+import {BACKEND_ADDRESS, IS_SSL, PUBLIC_PATH, WEBRTC_CONFIG} from "@/ts/utils/consts";
 
 export const isMobile: boolean = mobile.isMobile();
 
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 5e582df26..26ad3495c 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,7 +1,7 @@
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {HandlerName} from "@common/ws/common";
+import type {SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import type {HandlerName} from "@common/ws/common";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
@@ -191,7 +191,7 @@ export default abstract class AbstractPeerConnection extends MessageHandler {
       this.logger.warn("Putting sendrtc data event to the queue")();
       this.sendRtcDataQueue.push(message);
     } else {
-      const data: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown} = message.data;
+      const {data} = message;
       if (this.pc!.iceConnectionState && this.pc!.iceConnectionState !== "closed") {
         if ((<RTCSessionDescriptionInit>data).sdp) {
           this.logger.log("Creating answer")();
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index db5d940d7..523f90f1a 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,17 +1,17 @@
-import {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {HandlerName} from "@common/ws/common";
-import {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import {
+import type {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import type {NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import type {OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import type {HandlerName} from "@common/ws/common";
+import type {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import type {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import type {
   NotifyCallActiveMessage,
   OfferCall,
   OfferFile,
   OfferMessage,
-  WebRtcSetConnectionIdMessage
+  WebRtcSetConnectionIdMessage,
 } from "@common/legacy";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
@@ -22,7 +22,7 @@ import FileHandler from "@/ts/webrtc/file/FileHandler";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import {MAX_ACCEPT_FILE_SIZE_WO_FS_API} from "@/ts/utils/consts";
-import {requestFileSystem, resolveMediaUrl,} from "@/ts/utils/htmlApi";
+import {requestFileSystem, resolveMediaUrl} from "@/ts/utils/htmlApi";
 import FileReceiverPeerConnection from "@/ts/webrtc/file/FileReceiveerPeerConnection";
 import Subscription from "@/ts/classes/Subscription";
 import CallHandler from "@/ts/webrtc/call/CallHandler";
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 96df18f7c..0ea02692d 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,15 +1,15 @@
-import {CallStatus} from "@common/model/webrtc.base";
-import {AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import type {CallStatus} from "@common/model/webrtc.base";
+import type {AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import type {ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
 import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import type {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
 
-import {browserVersion, isChrome, isMobile,} from "@/ts/utils/runtimeConsts";
+import {browserVersion, isChrome, isMobile} from "@/ts/utils/runtimeConsts";
 import Subscription from "@/ts/classes/Subscription";
-import type {CallsInfoModel, IncomingCallModel,} from "@/ts/types/model";
+import type {CallsInfoModel, IncomingCallModel} from "@/ts/types/model";
 import type {
   BooleanIdentifier,
   JsAudioAnalyzer,
@@ -18,9 +18,9 @@ import type {
   SetDevices,
 } from "@/ts/types/types";
 import {VideoType} from "@/ts/types/types";
-import {CHROME_EXTENSION_ID, CHROME_EXTENSION_URL,} from "@/ts/utils/consts";
-import {extractError, getChromeVersion,} from "@/ts/utils/pureFunctions";
-import {createMicrophoneLevelVoice, getAverageAudioLevel, removeAudioProcesssor,} from "@/ts/utils/audioprocc";
+import {CHROME_EXTENSION_ID, CHROME_EXTENSION_URL} from "@/ts/utils/consts";
+import {extractError, getChromeVersion} from "@/ts/utils/pureFunctions";
+import {createMicrophoneLevelVoice, getAverageAudioLevel, removeAudioProcesssor} from "@/ts/utils/audioprocc";
 import CallSenderPeerConnection from "@/ts/webrtc/call/CallSenderPeerConnection";
 import CallReceiverPeerConnection from "@/ts/webrtc/call/CallReceiverPeerConnection";
 
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 0b8610b7e..677b873e3 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,15 +1,15 @@
-import {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import {DestroyCallConnection} from "@common/legacy";
-import {createMicrophoneLevelVoice, getAverageAudioLevel, removeAudioProcesssor,} from "@/ts/utils/audioprocc";
+import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
+import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import type {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import type {DestroyCallConnection} from "@common/legacy";
+import {createMicrophoneLevelVoice, getAverageAudioLevel, removeAudioProcesssor} from "@/ts/utils/audioprocc";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
-import type {JsAudioAnalyzer, SetCallOpponent, SetOpponentAnchor, SetOpponentVoice,} from "@/ts/types/types";
+import type {JsAudioAnalyzer, SetCallOpponent, SetOpponentAnchor, SetOpponentVoice} from "@/ts/types/types";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
-import {getStreamLog, getTrackLog,} from "@/ts/utils/pureFunctions";
-import type {CallInfoModel, RoomModel,} from "@/ts/types/model";
+import {getStreamLog, getTrackLog} from "@/ts/utils/pureFunctions";
+import type {CallInfoModel, RoomModel} from "@/ts/types/model";
 import {stopVideo} from "@/ts/utils/htmlApi";
 import type Subscription from "@/ts/classes/Subscription";
 
diff --git a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
index f032c73c6..8da221e45 100644
--- a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
@@ -1,4 +1,4 @@
-import {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
 
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 7d3eba581..23c33abc5 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,4 +1,4 @@
-import {ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import type {ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index b2a23764e..6afc4d9d5 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,12 +1,12 @@
-import {DestroyFileConnectionMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import type {SetReceivingFileStatus, SetReceivingFileUploaded,} from "@/ts/types/types";
+import type {DestroyFileConnectionMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
+import type {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import type {SetReceivingFileStatus, SetReceivingFileUploaded} from "@/ts/types/types";
 import type {ReceivingFile} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import {requestFileSystem} from "@/ts/utils/htmlApi";
-import {MAX_ACCEPT_FILE_SIZE_WO_FS_API, MAX_BUFFER_SIZE,} from "@/ts/utils/consts";
+import {MAX_ACCEPT_FILE_SIZE_WO_FS_API, MAX_BUFFER_SIZE} from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index eaf280d6f..a6a95a014 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,11 +1,11 @@
-import {DestroyFileConnectionMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import type {AddSendingFileTransfer, SetSendingFileStatus, SetSendingFileUploaded,} from "@/ts/types/types";
+import type {DestroyFileConnectionMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
+import type {AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import type {AddSendingFileTransfer, SetSendingFileStatus, SetSendingFileUploaded} from "@/ts/types/types";
 import type {SendingFileTransfer} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
-import {bytesToSize, getDay,} from "@/ts/utils/pureFunctions";
-import {READ_CHUNK_SIZE, SEND_CHUNK_SIZE,} from "@/ts/utils/consts";
+import {bytesToSize, getDay} from "@/ts/utils/pureFunctions";
+import {READ_CHUNK_SIZE, SEND_CHUNK_SIZE} from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 5bd122fbb..76464db29 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,6 +1,6 @@
 import {MessageStatus} from "@common/model/enum/message.status";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import type {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import type {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
@@ -20,10 +20,10 @@ import type {
   SendNewP2PMessage,
   SetMessageStatusRequest,
 } from "@/ts/types/messages/p2pMessages";
-import type {MessageModel, RoomModel,} from "@/ts/types/model";
-import {MessageStatusInner} from '@/ts/types/model';
-import type {MessageP2pDto, MessagesInfo,} from "@/ts/types/messages/p2pDto";
-import {messageModelToP2p, p2pMessageToModel,} from "@/ts/types/converters";
+import type {MessageModel, RoomModel} from "@/ts/types/model";
+import {MessageStatusInner} from "@/ts/types/model";
+import type {MessageP2pDto, MessagesInfo} from "@/ts/types/messages/p2pDto";
+import {messageModelToP2p, p2pMessageToModel} from "@/ts/types/converters";
 
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 0c3fe3b79..e41e5ec74 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,8 +1,8 @@
 import {MessageStatus} from "@common/model/enum/message.status";
-import {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import type {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import type {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
-import type {MessageSender, UserIdConn,} from "@/ts/types/types";
+import type {MessageSender, UserIdConn} from "@/ts/types/types";
 import type {RoomModel} from "@/ts/types/model";
 import MessageSenderPeerConnection from "@/ts/webrtc/message/MessageSenderPeerConnection";
 import MessageReceiverPeerConnection from "@/ts/webrtc/message/MessageReceiverPeerConnection";
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index 1506b0e61..508d919bd 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -5,12 +5,14 @@
   </div>
 </template>
 
-<script lang='ts'>
-import {Component, Vue, Watch,} from "vue-property-decorator";
+<script lang="ts">
+import {Theme} from "@common/model/enum/theme";
+
+
+import {Component, Vue, Watch} from "vue-property-decorator";
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import Growls from "@/vue/parts/Growls.vue";
-import {Theme} from "@common/model/enum/theme";
 
 
 @Component({
diff --git a/frontend/src/vue/auth/ApplyResetPassword.vue b/frontend/src/vue/auth/ApplyResetPassword.vue
index db8ffff4e..449863f11 100644
--- a/frontend/src/vue/auth/ApplyResetPassword.vue
+++ b/frontend/src/vue/auth/ApplyResetPassword.vue
@@ -40,11 +40,10 @@
   </form>
 </template>
 <script lang="ts">
-
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
-import {LoginMessage} from '@/ts/types/messages/innerMessages';
+import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 
 @Component({
   name: "ApplyResetPassword",
@@ -68,7 +67,7 @@ export default class ApplyResetPassword extends Vue {
     vueProperty: "error",
   })
   async created() {
-    let data = await this.$api.verifyApi.verifyToken({token: (this.$route.query.token) as string});
+    const data = await this.$api.verifyApi.verifyToken({token: (this.$route.query.token) as string});
     this.restoreUser = data.username;
   }
 
@@ -81,9 +80,9 @@ export default class ApplyResetPassword extends Vue {
     if (this.password !== this.repeatPassword) {
       this.$store.growlError("Passords don't match");
     } else {
-      let response = await this.$api.verifyApi.acceptToken({
+      const response = await this.$api.verifyApi.acceptToken({
         token: this.$route.query.token as string,
-        password: this.password
+        password: this.password,
       });
       const {session} = response;
       const message: LoginMessage = {
diff --git a/frontend/src/vue/auth/AuthPage.vue b/frontend/src/vue/auth/AuthPage.vue
index 4071b3b75..15b009893 100644
--- a/frontend/src/vue/auth/AuthPage.vue
+++ b/frontend/src/vue/auth/AuthPage.vue
@@ -13,9 +13,9 @@
   </div>
 </template>
 
-<script lang='ts'>
-import {Component, Vue,} from "vue-property-decorator";
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+<script lang="ts">
+import {Component, Vue} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
 import {AUTO_REGISTRATION} from "@/ts/utils/consts";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 
diff --git a/frontend/src/vue/auth/CaptchaComponent.vue b/frontend/src/vue/auth/CaptchaComponent.vue
index 2d028b27f..8ecaafd73 100644
--- a/frontend/src/vue/auth/CaptchaComponent.vue
+++ b/frontend/src/vue/auth/CaptchaComponent.vue
@@ -23,8 +23,8 @@
 </template>
 
 <script lang="ts">
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
-import {CAPTCHA_IFRAME, RECAPTCHA_PUBLIC_KEY,} from "@/ts/utils/consts";
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
+import {CAPTCHA_IFRAME, RECAPTCHA_PUBLIC_KEY} from "@/ts/utils/consts";
 import type {GoogleCaptcha} from "@/ts/types/model";
 import {ref} from "vue";
 
diff --git a/frontend/src/vue/auth/FacebookAuth.vue b/frontend/src/vue/auth/FacebookAuth.vue
index 51e8128b6..1f9fbd329 100644
--- a/frontend/src/vue/auth/FacebookAuth.vue
+++ b/frontend/src/vue/auth/FacebookAuth.vue
@@ -12,7 +12,7 @@
 
 <script lang="ts">
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {FACEBOOK_APP_ID} from "@/ts/utils/consts";
 
diff --git a/frontend/src/vue/auth/GoogleAuth.vue b/frontend/src/vue/auth/GoogleAuth.vue
index a9c1a0e9f..ac3447a9f 100644
--- a/frontend/src/vue/auth/GoogleAuth.vue
+++ b/frontend/src/vue/auth/GoogleAuth.vue
@@ -11,7 +11,7 @@
 </template>
 <script lang="ts">
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {GOOGLE_OAUTH_2_CLIENT_ID} from "@/ts/utils/consts";
 
diff --git a/frontend/src/vue/auth/RegisterFieldSet.vue b/frontend/src/vue/auth/RegisterFieldSet.vue
index 3baae36c9..197ec7d2a 100644
--- a/frontend/src/vue/auth/RegisterFieldSet.vue
+++ b/frontend/src/vue/auth/RegisterFieldSet.vue
@@ -11,7 +11,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {IconColor} from "@/ts/types/types";
 
 @Component({name: "FieldSet"})
diff --git a/frontend/src/vue/auth/ResetPassword.vue b/frontend/src/vue/auth/ResetPassword.vue
index 27c9ec580..89ff1e548 100644
--- a/frontend/src/vue/auth/ResetPassword.vue
+++ b/frontend/src/vue/auth/ResetPassword.vue
@@ -4,18 +4,18 @@
   >
     <div>
       <input
+        v-model="userNameOrEmail"
         class="input"
         name="username_or_password"
         placeholder="Username or email"
         required
         type="text"
-        v-model="userNameOrEmail"
       />
       <div class="slider">
         Enter your username or email
       </div>
     </div>
-     <captcha-component v-model:loading="running" v-model:token="captcha"/>
+    <captcha-component v-model:loading="running" v-model:token="captcha"/>
     <div>
       <app-submit
         :running="running"
@@ -26,8 +26,8 @@
   </form>
 </template>
 
-<script lang='ts'>
-import {Component, Ref, Vue,} from "vue-property-decorator";
+<script lang="ts">
+import {Component, Ref, Vue} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import CaptchaComponent from "@/vue/auth/CaptchaComponent.vue";
@@ -40,13 +40,14 @@ import CaptchaComponent from "@/vue/auth/CaptchaComponent.vue";
   },
 })
 export default class ResetPassword extends Vue {
-
   @Ref()
   public repactha!: HTMLElement;
 
   public running: boolean = false;
-  public captcha: string = '';
-  public userNameOrEmail: string = '';
+
+  public captcha: string = "";
+
+  public userNameOrEmail: string = "";
 
   public created() {
     this.$store.setRegHeader("Restore password");
@@ -59,8 +60,8 @@ export default class ResetPassword extends Vue {
   public async restorePassword(event: Event) {
     await this.$api.verifyApi.sendRestorePassword({
       captcha: this.captcha,
-      email: this.userNameOrEmail.includes('@') ? this.userNameOrEmail : undefined,
-      username: !this.userNameOrEmail.includes('@') ? this.userNameOrEmail: undefined,
+      email: this.userNameOrEmail.includes("@") ? this.userNameOrEmail : undefined,
+      username: !this.userNameOrEmail.includes("@") ? this.userNameOrEmail : undefined,
     });
     this.$store.growlSuccess("A reset email has been sent to your email address, please follow the instruction in it");
   }
diff --git a/frontend/src/vue/auth/SignIn.vue b/frontend/src/vue/auth/SignIn.vue
index eaca32c72..f229c9f03 100644
--- a/frontend/src/vue/auth/SignIn.vue
+++ b/frontend/src/vue/auth/SignIn.vue
@@ -46,8 +46,8 @@
   </form>
 </template>
 
-<script lang='ts'>
-import {Component, Ref, Vue,} from "vue-property-decorator";
+<script lang="ts">
+import {Component, Ref, Vue} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 
@@ -67,9 +67,12 @@ export default class SignIn extends Vue {
   @Ref()
   public form!: HTMLFormElement;
 
-  public username: string = '';
-  public password: string = '';
-  public captcha: string = '';
+  public username: string = "";
+
+  public password: string = "";
+
+  public captcha: string = "";
+
   public running: boolean = false;
 
   public created() {
@@ -82,7 +85,7 @@ export default class SignIn extends Vue {
   })
   public async login() {
     let response;
-    if (this.username?.includes('@')) {
+    if (this.username?.includes("@")) {
       response = await this.$api.authApi.signIn({
         email: this.username,
         password: this.password,
diff --git a/frontend/src/vue/auth/SignUp.vue b/frontend/src/vue/auth/SignUp.vue
index 3936ce065..18a1c586a 100644
--- a/frontend/src/vue/auth/SignUp.vue
+++ b/frontend/src/vue/auth/SignUp.vue
@@ -116,9 +116,11 @@
   </form>
 </template>
 
-<script lang='ts'>
+<script lang="ts">
+import {Gender} from "@common/model/enum/gender";
+
 
-import {Component, Prop, Vue, Watch,} from "vue-property-decorator";
+import {Component, Prop, Vue, Watch} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import RegisterFieldSet from "@/vue/auth/RegisterFieldSet.vue";
@@ -127,7 +129,6 @@ import {IconColor} from "@/ts/types/types";
 import type {LoginMessage} from "@/ts/types/messages/inner/login";
 import SocialAuthSignUp from "@/vue/auth/SocialAuthSignUp.vue";
 import {USERNAME_REGEX} from "@/ts/utils/consts";
-import {Gender} from "@common/model/enum/gender";
 
 
 @Component({
diff --git a/frontend/src/vue/auth/SocialAuthSignUp.vue b/frontend/src/vue/auth/SocialAuthSignUp.vue
index 37f6b042d..f3b3a89cc 100644
--- a/frontend/src/vue/auth/SocialAuthSignUp.vue
+++ b/frontend/src/vue/auth/SocialAuthSignUp.vue
@@ -6,12 +6,15 @@
 </template>
 
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {OauthSessionResponse} from "@common/model/http.base";
+
+
+import {Component, Vue} from "vue-property-decorator";
 import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import FacebookAuth from "@/vue/auth/FacebookAuth.vue";
 import GoogleAuth from "@/vue/auth/GoogleAuth.vue";
-import {FACEBOOK_APP_ID, GOOGLE_OAUTH_2_CLIENT_ID,} from "@/ts/utils/consts";
-import {OauthSessionResponse} from "@common/helpers";
+import {FACEBOOK_APP_ID, GOOGLE_OAUTH_2_CLIENT_ID} from "@/ts/utils/consts";
+import type {OauthSessionResponse} from "@common/helpers";
 
 
 @Component({
diff --git a/frontend/src/vue/chat/call/CallContainerIcons.vue b/frontend/src/vue/chat/call/CallContainerIcons.vue
index 0fea4b561..57db03694 100644
--- a/frontend/src/vue/chat/call/CallContainerIcons.vue
+++ b/frontend/src/vue/chat/call/CallContainerIcons.vue
@@ -60,7 +60,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue} from "vue-property-decorator";
 import {CallsInfoModel} from "@/ts/types/model";
 
 @Component({name: "CallContainerIcons"})
diff --git a/frontend/src/vue/chat/call/ChatCall.vue b/frontend/src/vue/chat/call/ChatCall.vue
index 0fbdc9356..1b90e115a 100644
--- a/frontend/src/vue/chat/call/ChatCall.vue
+++ b/frontend/src/vue/chat/call/ChatCall.vue
@@ -45,9 +45,9 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
 import {CallsInfoModel} from "@/ts/types/model";
-import type {BooleanIdentifier, ShareIdentifier,} from "@/ts/types/types";
+import type {BooleanIdentifier, ShareIdentifier} from "@/ts/types/types";
 import {VideoType} from "@/ts/types/types";
 
 import ChatRemotePeer from "@/vue/chat/call/ChatRemotePeer.vue";
diff --git a/frontend/src/vue/chat/call/ChatRemotePeer.vue b/frontend/src/vue/chat/call/ChatRemotePeer.vue
index 32684ebef..74793cbc9 100644
--- a/frontend/src/vue/chat/call/ChatRemotePeer.vue
+++ b/frontend/src/vue/chat/call/ChatRemotePeer.vue
@@ -19,7 +19,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
 import {CallInfoModel} from "@/ts/types/model";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import VideoObject from "@/vue/chat/chatbox/VideoObject.vue";
diff --git a/frontend/src/vue/chat/call/IncomingCall.vue b/frontend/src/vue/chat/call/IncomingCall.vue
index 2db79f8d9..c0fa0e7ab 100644
--- a/frontend/src/vue/chat/call/IncomingCall.vue
+++ b/frontend/src/vue/chat/call/IncomingCall.vue
@@ -41,9 +41,9 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
-import {IncomingCallModel, RoomDictModel,} from "@/ts/types/model";
+import {IncomingCallModel, RoomDictModel} from "@/ts/types/model";
 
 
 @Component({name: "IncomingCall"})
diff --git a/frontend/src/vue/chat/call/InputDevicesSettings.vue b/frontend/src/vue/chat/call/InputDevicesSettings.vue
index 3e3012860..cdfeabdf1 100644
--- a/frontend/src/vue/chat/call/InputDevicesSettings.vue
+++ b/frontend/src/vue/chat/call/InputDevicesSettings.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {CallsInfoModel} from "@/ts/types/model";
 import type {StringIdentifier} from "@/ts/types/types";
 import {State} from "@/ts/instances/storeInstance";
diff --git a/frontend/src/vue/chat/chatbox/ChatBackIcon.vue b/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
index d00762071..7475f6799 100644
--- a/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBackIcon.vue
@@ -2,10 +2,12 @@
   <router-link :to="link" class="icon-left"/>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
-import {State} from "@/ts/instances/storeInstance";
 import {ALL_ROOM_ID} from "@common/consts";
 
+
+import {Component, Vue} from "vue-property-decorator";
+import {State} from "@/ts/instances/storeInstance";
+
 @Component({name: "ChatBackIcon"})
 export default class ChatBackIcon extends Vue {
   @State
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index a3fe24375..093d9d1d4 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -93,9 +93,11 @@
   </div>
 </template>
 <script lang="ts">
+import {MessageStatus} from "@common/model/enum/message.status";
 
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
 import ChatTextMessage from "@/vue/chat/message/ChatTextMessage.vue";
 import SearchMessages from "@/vue/chat/chatbox/SearchMessages.vue";
 import {RoomModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/chat/chatbox/ChatBoxes.vue b/frontend/src/vue/chat/chatbox/ChatBoxes.vue
index 4ef2988bd..f0291ac2c 100644
--- a/frontend/src/vue/chat/chatbox/ChatBoxes.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBoxes.vue
@@ -19,10 +19,12 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue, Watch,} from "vue-property-decorator";
+import {ALL_ROOM_ID} from "@common/consts";
+
+
+import {Component, Vue, Watch} from "vue-property-decorator";
 import ChatBox from "@/vue/chat/chatbox/ChatBox.vue";
 import {State} from "@/ts/instances/storeInstance";
-import {ALL_ROOM_ID} from "@common/consts";
 import {RoomModel} from "@/ts/types/model";
 
 
diff --git a/frontend/src/vue/chat/chatbox/ChatIsOnlineIcon.vue b/frontend/src/vue/chat/chatbox/ChatIsOnlineIcon.vue
index 062a50397..7c02d81c7 100644
--- a/frontend/src/vue/chat/chatbox/ChatIsOnlineIcon.vue
+++ b/frontend/src/vue/chat/chatbox/ChatIsOnlineIcon.vue
@@ -6,7 +6,7 @@
   >●</span>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 
 @Component({name: "ChatIsOnlineIcon"})
diff --git a/frontend/src/vue/chat/chatbox/ChatNavBar.vue b/frontend/src/vue/chat/chatbox/ChatNavBar.vue
index d927323c8..32ce07696 100644
--- a/frontend/src/vue/chat/chatbox/ChatNavBar.vue
+++ b/frontend/src/vue/chat/chatbox/ChatNavBar.vue
@@ -28,11 +28,11 @@
   </app-nav-wrapper>
 </template>
 <script lang="ts">
-import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue} from "vue-property-decorator";
 import AppNavWrapper from "@/vue/ui/AppNavWrapper.vue";
 import {State} from "@/ts/instances/storeInstance";
 import type {UserModel} from "@/ts/types/model";
-import {ChannelsDictUIModel, RoomModel, UserDictModel,} from "@/ts/types/model";
+import {ChannelsDictUIModel, RoomModel, UserDictModel} from "@/ts/types/model";
 import ChatIsOnlineIcon from "@/vue/chat/chatbox/ChatIsOnlineIcon.vue";
 import {PrivateRoomsIds} from "@/ts/types/types";
 import UserNavInfo from "@/vue/chat/right/UserNavInfo.vue";
diff --git a/frontend/src/vue/chat/chatbox/ChatPopupMenu.vue b/frontend/src/vue/chat/chatbox/ChatPopupMenu.vue
index 0780f8579..2f9f263a9 100644
--- a/frontend/src/vue/chat/chatbox/ChatPopupMenu.vue
+++ b/frontend/src/vue/chat/chatbox/ChatPopupMenu.vue
@@ -29,7 +29,7 @@
   </app-modal>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import {RoomModel} from "@/ts/types/model";
 import AppModal from "@/vue/ui/AppModal.vue";
diff --git a/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue b/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
index 472c53723..20193eeba 100644
--- a/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
+++ b/frontend/src/vue/chat/chatbox/ChatShowUserTyping.vue
@@ -6,7 +6,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 
diff --git a/frontend/src/vue/chat/chatbox/SearchMessages.vue b/frontend/src/vue/chat/chatbox/SearchMessages.vue
index 2427a02de..e60222c22 100644
--- a/frontend/src/vue/chat/chatbox/SearchMessages.vue
+++ b/frontend/src/vue/chat/chatbox/SearchMessages.vue
@@ -25,7 +25,7 @@
 </template>
 <script lang="ts">
 import debounce from "lodash.debounce";
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
 import {RoomModel} from "@/ts/types/model";
 
 const START_TYPING = "Start typing and messages will appear";
diff --git a/frontend/src/vue/chat/chatbox/UserImageIcon.vue b/frontend/src/vue/chat/chatbox/UserImageIcon.vue
index 952d64a5b..5a89366f9 100644
--- a/frontend/src/vue/chat/chatbox/UserImageIcon.vue
+++ b/frontend/src/vue/chat/chatbox/UserImageIcon.vue
@@ -13,7 +13,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {UserModel} from "@/ts/types/model";
 import {resolveMediaUrl} from "@/ts/utils/htmlApi";
 import loggerFactory from "@/ts/instances/loggerFactory";
diff --git a/frontend/src/vue/chat/chatbox/VideoContainer.vue b/frontend/src/vue/chat/chatbox/VideoContainer.vue
index 535b531df..c5dde434e 100644
--- a/frontend/src/vue/chat/chatbox/VideoContainer.vue
+++ b/frontend/src/vue/chat/chatbox/VideoContainer.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Emit, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {Component, Emit, Prop, Ref, Vue, Watch} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import {CallsInfoModel} from "@/ts/types/model";
 import VideoObject from "@/vue/chat/chatbox/VideoObject.vue";
diff --git a/frontend/src/vue/chat/chatbox/VideoObject.vue b/frontend/src/vue/chat/chatbox/VideoObject.vue
index af4ccf453..98697049e 100644
--- a/frontend/src/vue/chat/chatbox/VideoObject.vue
+++ b/frontend/src/vue/chat/chatbox/VideoObject.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
 import {getStreamLog} from "@/ts/utils/pureFunctions";
 
 @Component({name: "VideoObject"})
diff --git a/frontend/src/vue/chat/message/ChatChangeNameMessage.vue b/frontend/src/vue/chat/message/ChatChangeNameMessage.vue
index a19defe55..c944394b0 100644
--- a/frontend/src/vue/chat/message/ChatChangeNameMessage.vue
+++ b/frontend/src/vue/chat/message/ChatChangeNameMessage.vue
@@ -10,7 +10,7 @@
   </chat-message-wrapper>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import ChatMessageWrapper from "@/vue/chat/message/ChatMessageWrapper.vue";
 
 @Component({
diff --git a/frontend/src/vue/chat/message/ChatMessageHeader.vue b/frontend/src/vue/chat/message/ChatMessageHeader.vue
index 4881e2a59..acf31e2db 100644
--- a/frontend/src/vue/chat/message/ChatMessageHeader.vue
+++ b/frontend/src/vue/chat/message/ChatMessageHeader.vue
@@ -5,7 +5,7 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {UserDictModel} from "@/ts/types/model";
 
 import UserImageIcon from "@/vue/chat/chatbox/UserImageIcon.vue";
diff --git a/frontend/src/vue/chat/message/ChatMessageToolTip.vue b/frontend/src/vue/chat/message/ChatMessageToolTip.vue
index fc1df8336..484091b0c 100644
--- a/frontend/src/vue/chat/message/ChatMessageToolTip.vue
+++ b/frontend/src/vue/chat/message/ChatMessageToolTip.vue
@@ -25,11 +25,11 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import type {EditingMessage} from "@/ts/types/model";
 import {MessageModel} from "@/ts/types/model";
-import {editMessageWs, showAllowEditing,} from "@/ts/utils/pureFunctions";
+import {editMessageWs, showAllowEditing} from "@/ts/utils/pureFunctions";
 
 @Component({name: "ChatMessageToolTip"})
 export default class ChatMessageToolTip extends Vue {
diff --git a/frontend/src/vue/chat/message/ChatMessageWrapper.vue b/frontend/src/vue/chat/message/ChatMessageWrapper.vue
index d1621cf22..644e3c290 100644
--- a/frontend/src/vue/chat/message/ChatMessageWrapper.vue
+++ b/frontend/src/vue/chat/message/ChatMessageWrapper.vue
@@ -6,7 +6,7 @@
   </p>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {timeToString} from "@/ts/utils/htmlApi";
 
 @Component({name: "ChatMessageWrapper"})
diff --git a/frontend/src/vue/chat/message/ChatReceivingFile.vue b/frontend/src/vue/chat/message/ChatReceivingFile.vue
index ec79901ea..b931806d8 100644
--- a/frontend/src/vue/chat/message/ChatReceivingFile.vue
+++ b/frontend/src/vue/chat/message/ChatReceivingFile.vue
@@ -35,9 +35,9 @@
   </chat-message-wrapper>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
-import {FileTransferStatus, ReceivingFile,} from "@/ts/types/model";
+import {FileTransferStatus, ReceivingFile} from "@/ts/types/model";
 import AppProgressBar from "@/vue/ui/AppProgressBar.vue";
 import ChatMessageHeader from "@/vue/chat/message/ChatMessageHeader.vue";
 import ReceivingFileInfo from "@/vue/chat/message/ReceivingFileInfo.vue";
diff --git a/frontend/src/vue/chat/message/ChatSendingFile.vue b/frontend/src/vue/chat/message/ChatSendingFile.vue
index 353ed2bbc..f0f9c9ad7 100644
--- a/frontend/src/vue/chat/message/ChatSendingFile.vue
+++ b/frontend/src/vue/chat/message/ChatSendingFile.vue
@@ -28,7 +28,7 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {SendingFile} from "@/ts/types/model";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 import AppProgressBar from "@/vue/ui/AppProgressBar.vue";
diff --git a/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue b/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
index b2bcca188..e03126e8d 100644
--- a/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
+++ b/frontend/src/vue/chat/message/ChatSendingFileTransfer.vue
@@ -19,12 +19,11 @@
   </tbody>
 </template>
 <script lang="ts">
-
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import AppProgressBar from "@/vue/ui/AppProgressBar.vue";
 import type {UserModel} from "@/ts/types/model";
-import {FileTransferStatus, SendingFileTransfer,} from "@/ts/types/model";
+import {FileTransferStatus, SendingFileTransfer} from "@/ts/types/model";
 
 
 const fileStatusDict: Record<FileTransferStatus, string> = {
diff --git a/frontend/src/vue/chat/message/ChatSendingMessage.vue b/frontend/src/vue/chat/message/ChatSendingMessage.vue
index ff8ab48ef..c9bf21e3e 100644
--- a/frontend/src/vue/chat/message/ChatSendingMessage.vue
+++ b/frontend/src/vue/chat/message/ChatSendingMessage.vue
@@ -41,13 +41,13 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Ref, Vue,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue} from "vue-property-decorator";
 import ChatTextMessage from "@/vue/chat/message/ChatTextMessage.vue";
 import AppProgressBar from "@/vue/ui/AppProgressBar.vue";
 
 import type {SetMessageProgressError} from "@/ts/types/types";
 import type {EditingMessage} from "@/ts/types/model";
-import {CurrentUserInfoModel, MessageModel, MessageStatusInner, RoomDictModel,} from "@/ts/types/model";
+import {CurrentUserInfoModel, MessageModel, MessageStatusInner, RoomDictModel} from "@/ts/types/model";
 import ChatMessageToolTip from "@/vue/chat/message/ChatMessageToolTip.vue";
 import ChatTextArea from "@/vue/chat/textarea/ChatTextArea.vue";
 
diff --git a/frontend/src/vue/chat/message/ChatTextMessage.vue b/frontend/src/vue/chat/message/ChatTextMessage.vue
index 31ab60c9e..90b86bfe5 100644
--- a/frontend/src/vue/chat/message/ChatTextMessage.vue
+++ b/frontend/src/vue/chat/message/ChatTextMessage.vue
@@ -15,8 +15,8 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Ref, Vue,} from "vue-property-decorator";
-import {CurrentUserSettingsModel, MessageModel,} from "@/ts/types/model";
+import {Component, Prop, Ref, Vue} from "vue-property-decorator";
+import {CurrentUserSettingsModel, MessageModel} from "@/ts/types/model";
 import {
   encodeHTML,
   encodeMessageInited,
diff --git a/frontend/src/vue/chat/message/ChatThread.vue b/frontend/src/vue/chat/message/ChatThread.vue
index 1c028aced..19d3ca40f 100644
--- a/frontend/src/vue/chat/message/ChatThread.vue
+++ b/frontend/src/vue/chat/message/ChatThread.vue
@@ -35,7 +35,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
 import {MessageModel} from "@/ts/types/model";
 import ChatSendingMessage from "@/vue/chat/message/ChatSendingMessage.vue";
 import ChatTextArea from "@/vue/chat/textarea/ChatTextArea.vue";
diff --git a/frontend/src/vue/chat/message/ChatUserActionMessage.vue b/frontend/src/vue/chat/message/ChatUserActionMessage.vue
index d865154a0..e50a96d03 100644
--- a/frontend/src/vue/chat/message/ChatUserActionMessage.vue
+++ b/frontend/src/vue/chat/message/ChatUserActionMessage.vue
@@ -9,7 +9,7 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
 import ChatMessageWrapper from "@/vue/chat/message/ChatMessageWrapper.vue";
 
diff --git a/frontend/src/vue/chat/message/ReceivingFileInfo.vue b/frontend/src/vue/chat/message/ReceivingFileInfo.vue
index 6df3458ae..aca0cda32 100644
--- a/frontend/src/vue/chat/message/ReceivingFileInfo.vue
+++ b/frontend/src/vue/chat/message/ReceivingFileInfo.vue
@@ -42,9 +42,9 @@
 </template>
 
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
-import {FileTransferStatus, ReceivingFile,} from "@/ts/types/model";
+import {FileTransferStatus, ReceivingFile} from "@/ts/types/model";
 
 @Component({name: "ReceivingFileInfo"})
 export default class ReceivingFileInfo extends Vue {
diff --git a/frontend/src/vue/chat/right/ChannelTable.vue b/frontend/src/vue/chat/right/ChannelTable.vue
index 0a1d21866..960309ba5 100644
--- a/frontend/src/vue/chat/right/ChannelTable.vue
+++ b/frontend/src/vue/chat/right/ChannelTable.vue
@@ -20,7 +20,7 @@
   </chat-right-collapsed-section>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import {ChannelUIModel} from "@/ts/types/model";
 import ChatRightCollapsedSection from "@/vue/chat/right/ChatRightCollapsedSection.vue";
diff --git a/frontend/src/vue/chat/right/ChatRightCollapsedSection.vue b/frontend/src/vue/chat/right/ChatRightCollapsedSection.vue
index eaf5510d3..6b791f48d 100644
--- a/frontend/src/vue/chat/right/ChatRightCollapsedSection.vue
+++ b/frontend/src/vue/chat/right/ChatRightCollapsedSection.vue
@@ -15,7 +15,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue} from "vue-property-decorator";
 
 @Component({name: "ChatRightCollapsedSection"})
 export default class ChatRightCollapsedSection extends Vue {
diff --git a/frontend/src/vue/chat/right/ChatRightSection.vue b/frontend/src/vue/chat/right/ChatRightSection.vue
index c18a43195..75a30c99e 100644
--- a/frontend/src/vue/chat/right/ChatRightSection.vue
+++ b/frontend/src/vue/chat/right/ChatRightSection.vue
@@ -9,7 +9,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import RoomDirectUsersTable from "@/vue/chat/right/RoomDirectUsersTable.vue";
 import ChannelTable from "@/vue/chat/right/ChannelTable.vue";
 import type {ChannelUIModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/chat/right/PrivateRoomRow.vue b/frontend/src/vue/chat/right/PrivateRoomRow.vue
index 39d7a9276..22230e187 100644
--- a/frontend/src/vue/chat/right/PrivateRoomRow.vue
+++ b/frontend/src/vue/chat/right/PrivateRoomRow.vue
@@ -5,7 +5,7 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
 import {RoomModel} from "@/ts/types/model";
 import {PrivateRoomsIds} from "@/ts/types/types";
diff --git a/frontend/src/vue/chat/right/RoomDirectUsersTable.vue b/frontend/src/vue/chat/right/RoomDirectUsersTable.vue
index ae8272621..088a47088 100644
--- a/frontend/src/vue/chat/right/RoomDirectUsersTable.vue
+++ b/frontend/src/vue/chat/right/RoomDirectUsersTable.vue
@@ -13,7 +13,7 @@
   </chat-right-collapsed-section>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import PrivateRoomRow from "@/vue/chat/right/PrivateRoomRow.vue";
 import {State} from "@/ts/instances/storeInstance";
 import type {RoomModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/chat/right/RoomRightIcon.vue b/frontend/src/vue/chat/right/RoomRightIcon.vue
index f2deab830..988660fa6 100644
--- a/frontend/src/vue/chat/right/RoomRightIcon.vue
+++ b/frontend/src/vue/chat/right/RoomRightIcon.vue
@@ -26,7 +26,10 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {MessageStatus} from "@common/model/enum/message.status";
+
+
+import {Component, Prop, Vue} from "vue-property-decorator";
 import type {MessageModel} from "@/ts/types/model";
 import {RoomModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/chat/right/RoomRowWrapper.vue b/frontend/src/vue/chat/right/RoomRowWrapper.vue
index bd8b85ba7..670d695bc 100644
--- a/frontend/src/vue/chat/right/RoomRowWrapper.vue
+++ b/frontend/src/vue/chat/right/RoomRowWrapper.vue
@@ -7,7 +7,7 @@
   </li>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import RoomRightIcon from "@/vue/chat/right/RoomRightIcon.vue";
 import {RoomModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
diff --git a/frontend/src/vue/chat/right/UserFlagRow.vue b/frontend/src/vue/chat/right/UserFlagRow.vue
index b1251888d..1d2bd9f50 100644
--- a/frontend/src/vue/chat/right/UserFlagRow.vue
+++ b/frontend/src/vue/chat/right/UserFlagRow.vue
@@ -8,7 +8,7 @@
   </user-row>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import UserRow from "@/vue/chat/right/UserRow.vue";
 import {UserModel} from "@/ts/types/model";
 import {FLAGS} from "@/ts/utils/consts";
diff --git a/frontend/src/vue/chat/right/UserNavInfo.vue b/frontend/src/vue/chat/right/UserNavInfo.vue
index a23232e3c..6a18e9d23 100644
--- a/frontend/src/vue/chat/right/UserNavInfo.vue
+++ b/frontend/src/vue/chat/right/UserNavInfo.vue
@@ -9,7 +9,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import UserImageIcon from "@/vue/chat/chatbox/UserImageIcon.vue";
 import {UserModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/chat/right/UserRow.vue b/frontend/src/vue/chat/right/UserRow.vue
index cac8c982a..b9a09a4f6 100644
--- a/frontend/src/vue/chat/right/UserRow.vue
+++ b/frontend/src/vue/chat/right/UserRow.vue
@@ -11,8 +11,8 @@
 </template>
 <script lang="ts">
 import {State} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
-import {RoomModel, UserModel,} from "@/ts/types/model";
+import {Component, Prop, Vue} from "vue-property-decorator";
+import {RoomModel, UserModel} from "@/ts/types/model";
 import UserImageIcon from "@/vue/chat/chatbox/UserImageIcon.vue";
 
 
diff --git a/frontend/src/vue/chat/textarea/ChatAttachments.vue b/frontend/src/vue/chat/textarea/ChatAttachments.vue
index fd9e75310..67b3da129 100644
--- a/frontend/src/vue/chat/textarea/ChatAttachments.vue
+++ b/frontend/src/vue/chat/textarea/ChatAttachments.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Emit, Prop, Ref, Vue,} from "vue-property-decorator";
+import {Component, Emit, Prop, Ref, Vue} from "vue-property-decorator";
 import {buildQueryParams} from "@/ts/utils/pureFunctions";
 
 @Component({name: "ChatAttachments"})
diff --git a/frontend/src/vue/chat/textarea/ChatTagging.vue b/frontend/src/vue/chat/textarea/ChatTagging.vue
index 5244e12de..fead90d0f 100644
--- a/frontend/src/vue/chat/textarea/ChatTagging.vue
+++ b/frontend/src/vue/chat/textarea/ChatTagging.vue
@@ -13,8 +13,8 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Emit, Prop, Vue, Watch,} from "vue-property-decorator";
-import {UserDictModel, UserModel,} from "@/ts/types/model";
+import {Component, Emit, Prop, Vue, Watch} from "vue-property-decorator";
+import {UserDictModel, UserModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 
 @Component({name: "ChatTagging"})
diff --git a/frontend/src/vue/chat/textarea/ChatTextArea.vue b/frontend/src/vue/chat/textarea/ChatTextArea.vue
index 03a4cce96..f741404da 100644
--- a/frontend/src/vue/chat/textarea/ChatTextArea.vue
+++ b/frontend/src/vue/chat/textarea/ChatTextArea.vue
@@ -56,7 +56,10 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {ImageType} from "@common/model/enum/image.type";
+
+
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
 import {
   createTag,
   encodeHTML,
@@ -75,7 +78,7 @@ import {
   savedFiles,
   timeToString,
 } from "@/ts/utils/htmlApi";
-import type {EditingMessage, MessageModel, PastingTextAreaElement, UserModel,} from "@/ts/types/model";
+import type {EditingMessage, MessageModel, PastingTextAreaElement, UserModel} from "@/ts/types/model";
 import {
   CurrentUserInfoModel,
   CurrentUserSettingsModel,
@@ -85,13 +88,13 @@ import {
 } from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 
-import type {MessageDataEncode, MessageSender,} from "@/ts/types/types";
-import {editMessageWs, showAllowEditing,} from "@/ts/utils/pureFunctions";
+import type {MessageDataEncode, MessageSender} from "@/ts/types/types";
+import {editMessageWs, showAllowEditing} from "@/ts/utils/pureFunctions";
 import MediaRecorder from "@/vue/chat/textarea/MediaRecorder.vue";
 import ChatAttachments from "@/vue/chat/textarea/ChatAttachments.vue";
 import SmileyHolder from "@/vue/chat/textarea/SmileyHolder.vue";
 import {isMobile} from "@/ts/utils/runtimeConsts";
-import {SHOW_I_TYPING_INTERVAL, USERNAME_REGEX,} from "@/ts/utils/consts";
+import {SHOW_I_TYPING_INTERVAL, USERNAME_REGEX} from "@/ts/utils/consts";
 import ChatTagging from "@/vue/chat/textarea/ChatTagging.vue";
 import {Throttle} from "@/ts/classes/Throttle";
 import GiphySearch from "@/vue/chat/textarea/GiphySearch.vue";
diff --git a/frontend/src/vue/chat/textarea/GiphySearch.vue b/frontend/src/vue/chat/textarea/GiphySearch.vue
index 1ba1b185c..a03179ae1 100644
--- a/frontend/src/vue/chat/textarea/GiphySearch.vue
+++ b/frontend/src/vue/chat/textarea/GiphySearch.vue
@@ -42,13 +42,13 @@
 </template>
 
 <script lang="ts">
-import {Component, Emit, Ref, Vue, Watch,} from "vue-property-decorator";
+import {Component, Emit, Ref, Vue, Watch} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppSuspense from "@/vue/ui/AppSuspense.vue";
 import {webpSupported} from "@/ts/utils/runtimeConsts";
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import type {GIFObject, MultiResponse,} from "giphy-api";
+import type {GIFObject, MultiResponse} from "giphy-api";
 import AppLoadingImage from "@/vue/ui/AppLoadingImage.vue";
 import {LOAD_GIPHIES_PER_REQUEST} from "@/ts/utils/consts";
 
diff --git a/frontend/src/vue/chat/textarea/MediaRecorder.vue b/frontend/src/vue/chat/textarea/MediaRecorder.vue
index 70f19a6bb..69e2b8ffe 100644
--- a/frontend/src/vue/chat/textarea/MediaRecorder.vue
+++ b/frontend/src/vue/chat/textarea/MediaRecorder.vue
@@ -19,11 +19,10 @@
   </div>
 </template>
 <script lang="ts">
-
-import {Component, Prop, Ref, Vue,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue} from "vue-property-decorator";
 import MediaCapture from "@/ts/classes/MediaCapture";
 
-import {isChrome, isMobile,} from "@/ts/utils/runtimeConsts";
+import {isChrome, isMobile} from "@/ts/utils/runtimeConsts";
 
 
 @Component({name: "MediaRecorder"})
diff --git a/frontend/src/vue/chat/textarea/Painter.vue b/frontend/src/vue/chat/textarea/Painter.vue
index 7756e7f62..9707bf4ac 100644
--- a/frontend/src/vue/chat/textarea/Painter.vue
+++ b/frontend/src/vue/chat/textarea/Painter.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Ref, Vue,} from "vue-property-decorator";
+import {Component, Ref, Vue} from "vue-property-decorator";
 
 import loggerFactory from "@/ts/instances/loggerFactory";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
diff --git a/frontend/src/vue/chat/textarea/SmileyHolder.vue b/frontend/src/vue/chat/textarea/SmileyHolder.vue
index 6d886ad17..fa8dfeb53 100644
--- a/frontend/src/vue/chat/textarea/SmileyHolder.vue
+++ b/frontend/src/vue/chat/textarea/SmileyHolder.vue
@@ -56,8 +56,8 @@
   <div v-else/>
 </template>
 <script lang="ts">
-import {Component, Emit, Vue, Watch,} from "vue-property-decorator";
-import type {Smile, SmileVariation, SmileysStructure,} from "@/ts/utils/smileys";
+import {Component, Emit, Vue, Watch} from "vue-property-decorator";
+import type {Smile, SmileVariation, SmileysStructure} from "@/ts/utils/smileys";
 
 @Component({name: "SmileyHolder"})
 export default class SmileyHolder extends Vue {
diff --git a/frontend/src/vue/pages/ChannelAddRoom.vue b/frontend/src/vue/pages/ChannelAddRoom.vue
index a4bbb0150..54e69aa1b 100644
--- a/frontend/src/vue/pages/ChannelAddRoom.vue
+++ b/frontend/src/vue/pages/ChannelAddRoom.vue
@@ -6,7 +6,7 @@
   />
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import CreateRoom from "@/vue/parts/CreateRoom.vue";
 import {State} from "@/ts/instances/storeInstance";
 import type {ChannelUIModel} from "@/ts/types/model";
diff --git a/frontend/src/vue/pages/ChannelSettings.vue b/frontend/src/vue/pages/ChannelSettings.vue
index 849ff2d42..b883c3795 100644
--- a/frontend/src/vue/pages/ChannelSettings.vue
+++ b/frontend/src/vue/pages/ChannelSettings.vue
@@ -101,16 +101,18 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
-import type {ChannelUIModel, UserModel,} from "@/ts/types/model";
-import {ChannelsDictUIModel, CurrentUserInfoModel,} from "@/ts/types/model";
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {ALL_ROOM_ID} from "@common/consts";
+
+
+import {Component, Vue} from "vue-property-decorator";
+import type {ChannelUIModel, UserModel} from "@/ts/types/model";
+import {ChannelsDictUIModel, CurrentUserInfoModel} from "@/ts/types/model";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import type {RouterNavigateMessage} from "@/ts/types/messages/innerMessages";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
-import {ALL_ROOM_ID} from "@common/consts";
 
 @Component({
   name: "ChannelSettings",
diff --git a/frontend/src/vue/pages/ChannelsPage.vue b/frontend/src/vue/pages/ChannelsPage.vue
index d3791e1f1..6d0828872 100644
--- a/frontend/src/vue/pages/ChannelsPage.vue
+++ b/frontend/src/vue/pages/ChannelsPage.vue
@@ -17,8 +17,8 @@
   </div>
 </template>
 
-<script lang='ts'>
-import {Component, Vue, Watch,} from "vue-property-decorator";
+<script lang="ts">
+import {Component, Vue, Watch} from "vue-property-decorator";
 
 import ChatRightSection from "@/vue/chat/right/ChatRightSection.vue";
 // Import NavEditMessage from '@/vue/chat/NavEditMessage.vue';
diff --git a/frontend/src/vue/pages/ConfirmMail.vue b/frontend/src/vue/pages/ConfirmMail.vue
index 02f6ee89d..ce6ac7840 100644
--- a/frontend/src/vue/pages/ConfirmMail.vue
+++ b/frontend/src/vue/pages/ConfirmMail.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 
 @Component({name: "ConfirmMail"})
diff --git a/frontend/src/vue/pages/CreateChannel.vue b/frontend/src/vue/pages/CreateChannel.vue
index 001c6f7ee..a84c59faa 100644
--- a/frontend/src/vue/pages/CreateChannel.vue
+++ b/frontend/src/vue/pages/CreateChannel.vue
@@ -32,11 +32,13 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {ALL_ROOM_ID} from "@common/consts";
+
+
+import {Component, Vue} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import PickUser from "@/vue/parts/PickUser.vue";
-import {ALL_ROOM_ID} from "@common/consts";
 
 @Component({
   name: "CreateChannel",
diff --git a/frontend/src/vue/pages/CreatePrivateRoom.vue b/frontend/src/vue/pages/CreatePrivateRoom.vue
index ed21f8782..110dea8b0 100644
--- a/frontend/src/vue/pages/CreatePrivateRoom.vue
+++ b/frontend/src/vue/pages/CreatePrivateRoom.vue
@@ -5,7 +5,7 @@
   />
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import CreateRoom from "@/vue/parts/CreateRoom.vue";
 import {State} from "@/ts/instances/storeInstance";
 import {PrivateRoomsIds} from "@/ts/types/types";
diff --git a/frontend/src/vue/pages/EmailChanged.vue b/frontend/src/vue/pages/EmailChanged.vue
index dd14d9d6c..0c619312b 100644
--- a/frontend/src/vue/pages/EmailChanged.vue
+++ b/frontend/src/vue/pages/EmailChanged.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 
 @Component({name: "ConfirmMail"})
diff --git a/frontend/src/vue/pages/MainPage.vue b/frontend/src/vue/pages/MainPage.vue
index 83751ebf9..5cf587085 100644
--- a/frontend/src/vue/pages/MainPage.vue
+++ b/frontend/src/vue/pages/MainPage.vue
@@ -19,8 +19,8 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
-import {CurrentUserInfoModel, IncomingCallModel,} from "@/ts/types/model";
+import {Component, Vue} from "vue-property-decorator";
+import {CurrentUserInfoModel, IncomingCallModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import IncomingCall from "@/vue/chat/call/IncomingCall.vue";
 import AppNavWrapper from "@/vue/ui/AppNavWrapper.vue";
diff --git a/frontend/src/vue/pages/PainterPage.vue b/frontend/src/vue/pages/PainterPage.vue
index 06a14da5c..0a9e88213 100644
--- a/frontend/src/vue/pages/PainterPage.vue
+++ b/frontend/src/vue/pages/PainterPage.vue
@@ -4,7 +4,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Ref, Vue,} from "vue-property-decorator";
+import {Component, Ref, Vue} from "vue-property-decorator";
 import Painter from "@/vue/chat/textarea/Painter.vue";
 
 
diff --git a/frontend/src/vue/pages/RoomSettings.vue b/frontend/src/vue/pages/RoomSettings.vue
index 7f48ab30f..e79a5f148 100644
--- a/frontend/src/vue/pages/RoomSettings.vue
+++ b/frontend/src/vue/pages/RoomSettings.vue
@@ -115,17 +115,19 @@
   </div>
 </template>
 <script lang="ts">
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
-import {Component, Vue,} from "vue-property-decorator";
+import {ALL_ROOM_ID} from "@common/consts";
+
+
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
+import {Component, Vue} from "vue-property-decorator";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
-import type {RoomModel, UserModel,} from "@/ts/types/model";
-import {RoomDictModel, UserDictModel,} from "@/ts/types/model";
+import type {RoomModel, UserModel} from "@/ts/types/model";
+import {RoomDictModel, UserDictModel} from "@/ts/types/model";
 import ParentChannel from "@/vue/parts/ParentChannel.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import {PrivateRoomsIds} from "@/ts/types/types";
-import {ALL_ROOM_ID} from "@common/consts";
 
 
 @Component({
diff --git a/frontend/src/vue/pages/RoomUsersListPage.vue b/frontend/src/vue/pages/RoomUsersListPage.vue
index d059abc41..85d2a3f54 100644
--- a/frontend/src/vue/pages/RoomUsersListPage.vue
+++ b/frontend/src/vue/pages/RoomUsersListPage.vue
@@ -29,15 +29,15 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
-import {ChannelsDictUIModel, RoomDictModel, UserDictModel,} from "@/ts/types/model";
+import {Component, Vue} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
+import {ChannelsDictUIModel, RoomDictModel, UserDictModel} from "@/ts/types/model";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import UserFlagRow from "@/vue/chat/right/UserFlagRow.vue";
 
 @Component({
-  name: 'RoomUsersListPage',
+  name: "RoomUsersListPage",
   components: {
     UserFlagRow,
     AppSubmit,
diff --git a/frontend/src/vue/pages/UserProfile.vue b/frontend/src/vue/pages/UserProfile.vue
index d01da8539..7270e3f33 100644
--- a/frontend/src/vue/pages/UserProfile.vue
+++ b/frontend/src/vue/pages/UserProfile.vue
@@ -31,8 +31,8 @@
   </div>
 </template>
 <script lang="ts">
-import {FACEBOOK_APP_ID, GOOGLE_OAUTH_2_CLIENT_ID,} from "@/ts/utils/consts";
-import {Component, Vue,} from "vue-property-decorator";
+import {FACEBOOK_APP_ID, GOOGLE_OAUTH_2_CLIENT_ID} from "@/ts/utils/consts";
+import {Component, Vue} from "vue-property-decorator";
 import AppTab from "@/vue/ui/AppTab.vue";
 
 @Component({
diff --git a/frontend/src/vue/pages/UserProfileChangeEmail.vue b/frontend/src/vue/pages/UserProfileChangeEmail.vue
index a3ffdd647..6805ec476 100644
--- a/frontend/src/vue/pages/UserProfileChangeEmail.vue
+++ b/frontend/src/vue/pages/UserProfileChangeEmail.vue
@@ -45,8 +45,8 @@
   </form>
 </template>
 <script lang="ts">
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
-import {Component, Vue,} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
+import {Component, Vue} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/pages/UserProfileChangePassword.vue b/frontend/src/vue/pages/UserProfileChangePassword.vue
index 60b67212b..96d51837e 100644
--- a/frontend/src/vue/pages/UserProfileChangePassword.vue
+++ b/frontend/src/vue/pages/UserProfileChangePassword.vue
@@ -69,8 +69,8 @@
   </form>
 </template>
 <script lang="ts">
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
-import {Component, Vue,} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
+import {Component, Vue} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/pages/UserProfileImage.vue b/frontend/src/vue/pages/UserProfileImage.vue
index 07197a8a2..1e91a4864 100644
--- a/frontend/src/vue/pages/UserProfileImage.vue
+++ b/frontend/src/vue/pages/UserProfileImage.vue
@@ -10,8 +10,8 @@
   </div>
 </template>
 <script lang="ts">
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
-import {Component, Ref, Vue, Watch,} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
+import {Component, Ref, Vue, Watch} from "vue-property-decorator";
 import {resolveMediaUrl} from "@/ts/utils/htmlApi";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppImageCropper from "@/vue/ui/AppImageCropper.vue";
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index aa5ea3e4b..0d5d856c3 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -112,8 +112,13 @@
   </form>
 </template>
 <script lang="ts">
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
-import {Component, Vue,} from "vue-property-decorator";
+import {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {Gender} from "@common/model/enum/gender";
+import {SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+
+
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
+import {Component, Vue} from "vue-property-decorator";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/pages/UserProfileOauthSettings.vue b/frontend/src/vue/pages/UserProfileOauthSettings.vue
index c0d0fdbcd..3b57ee767 100644
--- a/frontend/src/vue/pages/UserProfileOauthSettings.vue
+++ b/frontend/src/vue/pages/UserProfileOauthSettings.vue
@@ -18,7 +18,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 import type {OauthStatus} from "@/ts/types/dto";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import FacebookAuth from "@/vue/auth/FacebookAuth.vue";
diff --git a/frontend/src/vue/pages/UserProfileSettings.vue b/frontend/src/vue/pages/UserProfileSettings.vue
index 7b2f025ca..fcb7d2176 100644
--- a/frontend/src/vue/pages/UserProfileSettings.vue
+++ b/frontend/src/vue/pages/UserProfileSettings.vue
@@ -114,16 +114,20 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue, Watch,} from "vue-property-decorator";
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+
+
+import {Component, Vue, Watch} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
 import {CurrentUserSettingsModel} from "@/ts/types/model";
 import {userSettingsDtoToModel} from "@/ts/types/converters";
 import type {LogLevel} from "lines-logger";
 import {logLevels} from "lines-logger";
-import {LAST_SYNCED, SERVICE_WORKER_VERSION_LS_NAME,} from "@/ts/utils/consts";
-import {addToHomeScreen, canBeInstalled,} from "@/ts/utils/addToHomeScreen";
+import {LAST_SYNCED, SERVICE_WORKER_VERSION_LS_NAME} from "@/ts/utils/consts";
+import {addToHomeScreen, canBeInstalled} from "@/ts/utils/addToHomeScreen";
 
 
 @Component({
diff --git a/frontend/src/vue/pages/ViewProfilePage.vue b/frontend/src/vue/pages/ViewProfilePage.vue
index 7325cab1a..50a8ef5b9 100644
--- a/frontend/src/vue/pages/ViewProfilePage.vue
+++ b/frontend/src/vue/pages/ViewProfilePage.vue
@@ -57,8 +57,8 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
+import {Component, Vue} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
 import {resolveMediaUrl} from "@/ts/utils/htmlApi";
 import type {UserModel} from "@/ts/types/model";
 import type {ViewUserProfileDto} from "@/ts/types/dto";
diff --git a/frontend/src/vue/parts/CreateRoom.vue b/frontend/src/vue/parts/CreateRoom.vue
index c844cecd4..350e6c98a 100644
--- a/frontend/src/vue/parts/CreateRoom.vue
+++ b/frontend/src/vue/parts/CreateRoom.vue
@@ -61,12 +61,12 @@
   </div>
 </template>
 <script lang="ts">
-import {ApplyGrowlErr, State,} from "@/ts/instances/storeInstance";
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
-import {ChannelsDictUIModel, CurrentUserInfoModel,} from "@/ts/types/model";
+import {ChannelsDictUIModel, CurrentUserInfoModel} from "@/ts/types/model";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
 import {PrivateRoomsIds} from "@/ts/types/types";
 import ParentChannel from "@/vue/parts/ParentChannel.vue";
diff --git a/frontend/src/vue/parts/Growls.vue b/frontend/src/vue/parts/Growls.vue
index e9558627f..9af33c58d 100644
--- a/frontend/src/vue/parts/Growls.vue
+++ b/frontend/src/vue/parts/Growls.vue
@@ -8,7 +8,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue, Watch,} from "vue-property-decorator";
+import {Component, Vue, Watch} from "vue-property-decorator";
 import type {GrowlModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import AppGrowl from "@/vue/ui/AppGrowl.vue";
diff --git a/frontend/src/vue/parts/ParentChannel.vue b/frontend/src/vue/parts/ParentChannel.vue
index 436f1becb..7adb0d632 100644
--- a/frontend/src/vue/parts/ParentChannel.vue
+++ b/frontend/src/vue/parts/ParentChannel.vue
@@ -13,7 +13,7 @@
   </select>
 </template>
 <script lang="ts">
-import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue} from "vue-property-decorator";
 import {State} from "@/ts/instances/storeInstance";
 import type {ChannelUIModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/parts/PickUser.vue b/frontend/src/vue/parts/PickUser.vue
index 205ad7391..a030781ee 100644
--- a/frontend/src/vue/parts/PickUser.vue
+++ b/frontend/src/vue/parts/PickUser.vue
@@ -30,7 +30,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import type {UserModel} from "@/ts/types/model";
 import {State} from "@/ts/instances/storeInstance";
 import UserRow from "@/vue/chat/right/UserRow.vue";
diff --git a/frontend/src/vue/ui/AppCheckbox.vue b/frontend/src/vue/ui/AppCheckbox.vue
index dad8279ef..ea56737f9 100644
--- a/frontend/src/vue/ui/AppCheckbox.vue
+++ b/frontend/src/vue/ui/AppCheckbox.vue
@@ -11,7 +11,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Emit, Prop, Ref, Vue,} from "vue-property-decorator";
+import {Component, Emit, Prop, Ref, Vue} from "vue-property-decorator";
 
 
 let uniqueId = 1;
diff --git a/frontend/src/vue/ui/AppGrowl.vue b/frontend/src/vue/ui/AppGrowl.vue
index 0e6f2a540..c88014c6c 100644
--- a/frontend/src/vue/ui/AppGrowl.vue
+++ b/frontend/src/vue/ui/AppGrowl.vue
@@ -11,8 +11,8 @@
   </transition>
 </template>
 
-<script lang='ts'>
-import {Component, Prop, Vue,} from "vue-property-decorator";
+<script lang="ts">
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {GrowlModel} from "@/ts/types/model";
 
 @Component({name: "AppGrowl"})
diff --git a/frontend/src/vue/ui/AppImageCropper.vue b/frontend/src/vue/ui/AppImageCropper.vue
index 33518c98a..4f4743963 100644
--- a/frontend/src/vue/ui/AppImageCropper.vue
+++ b/frontend/src/vue/ui/AppImageCropper.vue
@@ -66,10 +66,10 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Ref, Vue, Watch,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue, Watch} from "vue-property-decorator";
 import VueCropper, {VueCropperMethods} from "vue-cropperjs";
 import {isMobile} from "@/ts/utils/runtimeConsts";
-import {canvasContext, stopVideo,} from "@/ts/utils/htmlApi";
+import {canvasContext, stopVideo} from "@/ts/utils/htmlApi";
 
 
 @Component({
diff --git a/frontend/src/vue/ui/AppInputDate.vue b/frontend/src/vue/ui/AppInputDate.vue
index e891f36de..d344ba361 100644
--- a/frontend/src/vue/ui/AppInputDate.vue
+++ b/frontend/src/vue/ui/AppInputDate.vue
@@ -7,7 +7,7 @@
   />
 </template>
 <script lang="ts">
-import {Component, Emit, Prop, Vue,} from "vue-property-decorator";
+import {Component, Emit, Prop, Vue} from "vue-property-decorator";
 
 
 @Component({
diff --git a/frontend/src/vue/ui/AppInputRange.vue b/frontend/src/vue/ui/AppInputRange.vue
index e20601903..bb745963c 100644
--- a/frontend/src/vue/ui/AppInputRange.vue
+++ b/frontend/src/vue/ui/AppInputRange.vue
@@ -8,7 +8,7 @@
   />
 </template>
 <script lang="ts">
-import {Component, Prop, Ref, Vue,} from "vue-property-decorator";
+import {Component, Prop, Ref, Vue} from "vue-property-decorator";
 
 let uniqueId = 1;
 
diff --git a/frontend/src/vue/ui/AppLoadingImage.vue b/frontend/src/vue/ui/AppLoadingImage.vue
index 29342d207..f7a48cc1c 100644
--- a/frontend/src/vue/ui/AppLoadingImage.vue
+++ b/frontend/src/vue/ui/AppLoadingImage.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 
 @Component({
   name: "AppLoadingImage",
diff --git a/frontend/src/vue/ui/AppMenuBar.vue b/frontend/src/vue/ui/AppMenuBar.vue
index 4ee6cb171..46d9d7d19 100644
--- a/frontend/src/vue/ui/AppMenuBar.vue
+++ b/frontend/src/vue/ui/AppMenuBar.vue
@@ -45,8 +45,8 @@
   </app-modal>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
-import {GITHUB_LINK, ISSUES,} from "@/ts/utils/consts";
+import {Component, Vue} from "vue-property-decorator";
+import {GITHUB_LINK, ISSUES} from "@/ts/utils/consts";
 import {State} from "@/ts/instances/storeInstance";
 import {CurrentUserInfoModel} from "@/ts/types/model";
 import AppModal from "@/vue/ui/AppModal.vue";
diff --git a/frontend/src/vue/ui/AppNavWrapper.vue b/frontend/src/vue/ui/AppNavWrapper.vue
index 8bcb799fb..08245de19 100644
--- a/frontend/src/vue/ui/AppNavWrapper.vue
+++ b/frontend/src/vue/ui/AppNavWrapper.vue
@@ -4,7 +4,7 @@
   </nav>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 
 @Component({name: "AppNavWrapper"})
 export default class AppNavWrapper extends Vue {
diff --git a/frontend/src/vue/ui/AppProgressBar.vue b/frontend/src/vue/ui/AppProgressBar.vue
index b02b17782..b77055908 100644
--- a/frontend/src/vue/ui/AppProgressBar.vue
+++ b/frontend/src/vue/ui/AppProgressBar.vue
@@ -12,7 +12,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {Component, Prop, Vue} from "vue-property-decorator";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 import {UploadProgressModel} from "@/ts/types/model";
 
diff --git a/frontend/src/vue/ui/AppSeparator.vue b/frontend/src/vue/ui/AppSeparator.vue
index 5e0124daf..33aade940 100644
--- a/frontend/src/vue/ui/AppSeparator.vue
+++ b/frontend/src/vue/ui/AppSeparator.vue
@@ -5,8 +5,118 @@
     </legend>
   </fieldset>
 </template>
-<script lang="ts">
-import {Component, Prop, Vue,} from "vue-property-decorator";
+import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
+import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
+import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
+import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
+import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
+import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
+import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
+import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
+import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
+import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
+import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
+import {ChannelDto} from "@common/model/dto/channel.dto";
+import {FileModelDto} from "@common/model/dto/file.model.dto";
+import {GiphyDto} from "@common/model/dto/giphy.dto";
+import {LocationDto} from "@common/model/dto/location.dto";
+import {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
+import {UserDto} from "@common/model/dto/user.dto";
+import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {Gender} from "@common/model/enum/gender";
+import {ImageType} from "@common/model/enum/image.type";
+import {MessageStatus} from "@common/model/enum/message.status";
+import {Theme} from "@common/model/enum/theme";
+import {VerificationType} from "@common/model/enum/verification.type";
+import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
+import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {
+  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
+  ChangeUserOnlineBase,
+  MessagesResponseMessage,
+  NewRoom,
+  RoomExistedBefore
+} from "@common/model/ws.base";
+import {
+  DestroyCallConnectionBody,
+  DestroyCallConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {
+  DestroyFileConnectionBody,
+  DestroyFileConnectionMessage
+} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
+import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
+import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
+import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
+import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage,
+  ShowITypeWsOutBody,
+  ShowITypeWsOutMessage
+} from "@common/ws/message/room/show.i.type";
+import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
+import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
+import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
+import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
+import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
+import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
+import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
+import {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutBody,
+  PrintMessageWsOutMessage
+} from "@common/ws/message/ws-message/print.message";
+import {
+  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutBody,
+  GetCountryCodeWsOutMessage
+} from "@common/ws/message/get.country.code";
+import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
+import {
+  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
+  SetMessageStatusWsOutBody,
+  SetMessageStatusWsOutMessage
+} from "@common/ws/message/set.message.status";
+import {
+  SyncHistoryWsInBody,
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutBody,
+  SyncHistoryWsOutMessage
+} from "@common/ws/message/sync.history";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  HandlerName,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
+import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
+
+
+import {Component, Prop, Vue} from "vue-property-decorator";
 
 @Component({name: "AppSeparator"})
 export default class AppSeparator extends Vue {
diff --git a/frontend/src/vue/ui/AppSubmit.vue b/frontend/src/vue/ui/AppSubmit.vue
index 3c5e49c9e..1d5df316d 100644
--- a/frontend/src/vue/ui/AppSubmit.vue
+++ b/frontend/src/vue/ui/AppSubmit.vue
@@ -12,8 +12,8 @@
   </button>
 </template>
 
-<script lang='ts'>
-import {Component, Prop, Vue,} from "vue-property-decorator";
+<script lang="ts">
+import {Component, Prop, Vue} from "vue-property-decorator";
 
 @Component({name: "AppSubmit"})
 export default class AppSubmit extends Vue {
diff --git a/frontend/src/vue/ui/AppSuspense.vue b/frontend/src/vue/ui/AppSuspense.vue
index dc5ef310a..58f1be9be 100644
--- a/frontend/src/vue/ui/AppSuspense.vue
+++ b/frontend/src/vue/ui/AppSuspense.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 
 @Component({
   name: "AppSuspense",
diff --git a/frontend/src/vue/ui/AppTab.vue b/frontend/src/vue/ui/AppTab.vue
index 495f8711d..b47ab656e 100644
--- a/frontend/src/vue/ui/AppTab.vue
+++ b/frontend/src/vue/ui/AppTab.vue
@@ -4,7 +4,7 @@
   </div>
 </template>
 <script lang="ts">
-import {Component, Vue,} from "vue-property-decorator";
+import {Component, Vue} from "vue-property-decorator";
 
 @Component({name: "AppTab"})
 export default class AppTab extends Vue {

From 11fd51f526f1607fd46ff48784881bdd0d530d14 Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Fri, 20 May 2022 21:22:33 +0300
Subject: [PATCH 123/221] blah6

---
 frontend/src/vue/pages/UserProfileInfo.vue     | 4 ++--
 frontend/src/vue/pages/UserProfileSettings.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index 0d5d856c3..7d3c49db0 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -112,9 +112,9 @@
   </form>
 </template>
 <script lang="ts">
-import {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import type {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
 import {Gender} from "@common/model/enum/gender";
-import {SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
+import type {SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
 
 
 import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
diff --git a/frontend/src/vue/pages/UserProfileSettings.vue b/frontend/src/vue/pages/UserProfileSettings.vue
index fcb7d2176..1d7629c11 100644
--- a/frontend/src/vue/pages/UserProfileSettings.vue
+++ b/frontend/src/vue/pages/UserProfileSettings.vue
@@ -114,8 +114,8 @@
   </div>
 </template>
 <script lang="ts">
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {SetSettingsMessage} from "@common/ws/message/ws/set.settings";
+import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import type {SetSettingsMessage} from "@common/ws/message/ws/set.settings";
 
 
 import {Component, Vue, Watch} from "vue-property-decorator";

From 0188e631d5dd00fb6c30acc42edd3d524e8dbc77 Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Fri, 20 May 2022 21:23:07 +0300
Subject: [PATCH 124/221] blah6

---
 frontend/src/vue/auth/SocialAuthSignUp.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/vue/auth/SocialAuthSignUp.vue b/frontend/src/vue/auth/SocialAuthSignUp.vue
index f3b3a89cc..094139dce 100644
--- a/frontend/src/vue/auth/SocialAuthSignUp.vue
+++ b/frontend/src/vue/auth/SocialAuthSignUp.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts">
-import {OauthSessionResponse} from "@common/model/http.base";
+import type {OauthSessionResponse} from "@common/model/http.base";
 
 
 import {Component, Vue} from "vue-property-decorator";

From e6b58012d6d046c78d1ae2e91ac3cae09608169e Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 21 May 2022 14:55:36 +0300
Subject: [PATCH 125/221] save changes

---
 common/src/model/http.base.ts                 |   4 +
 common/src/model/webrtc.base.ts               |   3 +
 common/src/ws/common.ts                       |   7 +
 common/src/ws/message/get.country.code.ts     |   5 +-
 .../destroy.call.connection.ts                |  13 +-
 .../destroy.file.connection.ts                |   1 +
 common/src/ws/message/room/add.channel.ts     |   2 +-
 common/src/ws/message/room/add.invite.ts      |   3 +-
 common/src/ws/message/room/add.online.user.ts |   4 +-
 common/src/ws/message/room/add.room.ts        |   2 +-
 common/src/ws/message/room/create.new.user.ts |   2 +-
 common/src/ws/message/room/invite.user.ts     |   2 +-
 .../src/ws/message/room/remove.online.user.ts |   2 +-
 .../src/ws/message/sync/set.connection.id.ts  |   6 +-
 .../ws/message/webrtc-transfer/accept.file.ts |  11 +-
 common/src/ws/message/webrtc/offer.call.ts    |  19 +-
 common/src/ws/message/webrtc/offer.file.ts    |  27 +-
 common/src/ws/message/ws/pong.ts              |   9 +-
 common/src/ws/message/ws/set.settings.ts      |  10 +-
 common/src/ws/message/ws/set.user.profile.ts  |  10 +-
 common/src/ws/message/ws/set.ws.id.ts         |   4 +-
 frontend/.eslintrc.json                       |   2 +-
 .../src/ts/classes/NotificationHandler.ts     |  11 +-
 frontend/src/ts/classes/Subscription.ts       |  12 +-
 frontend/src/ts/instances/routerInstance.ts   |  22 +-
 .../AbstractMessageProcessor.ts               |  14 +-
 .../src/ts/message_handlers/MesageHandler.ts  |  26 --
 .../src/ts/message_handlers/RomHandler.ts     | 151 +++++-----
 frontend/src/ts/message_handlers/WsHandler.ts | 264 +++++++++++-------
 .../ts/message_handlers/WsMessageHandler.ts   |   2 +-
 .../ts/types/messages/inner/answer.call.ts    |   3 +
 .../messages/inner/change.p2p.room.info.ts    |   1 -
 .../messages/inner/change.user.online.info.ts |   5 +-
 .../messages/inner/check.transfer.destroy.ts  |   4 +-
 .../ts/types/messages/inner/decline.call.ts   |   3 +
 .../messages/inner/destroy.peer.connection.ts |   2 +-
 .../types/messages/inner/internet.appear.ts   |   2 +-
 .../src/ts/types/messages/inner/logout.ts     |   2 +-
 .../types/messages/inner/video.answer.call.ts |   3 +
 .../peer-connection/accept.file.reply.ts      |   3 +
 .../peer-connection/decline.file.reply.ts     |   3 +
 .../peer-connection/decline.sending.ts        |   3 +
 .../peer-connection/retry.file.reply.ts       |   3 +
 frontend/src/ts/types/types.ts                |  14 +-
 frontend/src/ts/utils/pubsub.ts               |  26 ++
 .../src/ts/webrtc/AbstractPeerConnection.ts   |  15 +-
 frontend/src/ts/webrtc/BaseTransferHandler.ts |   4 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           | 133 +++++----
 frontend/src/ts/webrtc/call/CallHandler.ts    |  72 +++--
 .../src/ts/webrtc/call/CallPeerConnection.ts  |  22 +-
 .../webrtc/file/FileSenderPeerConnection.ts   |  19 +-
 frontend/src/vue/auth/ApplyResetPassword.vue  |   6 +-
 frontend/src/vue/auth/AuthPage.vue            |   6 +-
 frontend/src/vue/auth/SignIn.vue              |   2 +-
 frontend/src/vue/auth/SocialAuthSignUp.vue    |   3 +-
 frontend/src/vue/chat/chatbox/ChatBox.vue     |  24 +-
 frontend/src/vue/pages/ChannelSettings.vue    |   2 +-
 frontend/src/vue/pages/UserProfileInfo.vue    |   3 +-
 frontend/src/vue/ui/AppSeparator.vue          | 116 +-------
 .../add.online.user.transformer.ts            |   2 +-
 .../out.message/inner.transformer.ts          |   2 +-
 .../out.message/print.message.transformer.ts  |   2 +-
 .../remove.online.user.transformer.ts         |   2 +-
 .../out.message/set.ws.id.transformer.ts      |   2 +-
 .../modules/api/websocket/message.service.ts  |   4 +-
 .../api/websocket/websocket.gateway.ts        |  22 +-
 .../api/websocket/websocket.service.ts        |   2 +-
 67 files changed, 646 insertions(+), 546 deletions(-)
 delete mode 100644 frontend/src/ts/message_handlers/MesageHandler.ts
 create mode 100644 frontend/src/ts/types/messages/inner/answer.call.ts
 create mode 100644 frontend/src/ts/types/messages/inner/decline.call.ts
 create mode 100644 frontend/src/ts/types/messages/inner/video.answer.call.ts
 create mode 100644 frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
 create mode 100644 frontend/src/ts/types/messages/peer-connection/decline.file.reply.ts
 create mode 100644 frontend/src/ts/types/messages/peer-connection/decline.sending.ts
 create mode 100644 frontend/src/ts/types/messages/peer-connection/retry.file.reply.ts
 create mode 100644 frontend/src/ts/utils/pubsub.ts

diff --git a/common/src/model/http.base.ts b/common/src/model/http.base.ts
index 441ab7b2a..7fe1ce4a0 100644
--- a/common/src/model/http.base.ts
+++ b/common/src/model/http.base.ts
@@ -1,3 +1,6 @@
+import {WebRtcDefaultMessage} from "@common/model/webrtc.base";
+import {ResponseWsInMessage} from "@common/ws/common";
+
 export interface CaptchaRequest {
   captcha?: string;
 }
@@ -22,3 +25,4 @@ export interface SessionResponse {
 export interface OkResponse {
   ok: true;
 }
+
diff --git a/common/src/model/webrtc.base.ts b/common/src/model/webrtc.base.ts
index c8ed71098..2fd5f3622 100644
--- a/common/src/model/webrtc.base.ts
+++ b/common/src/model/webrtc.base.ts
@@ -23,3 +23,6 @@ export interface BrowserBase {
 }
 
 
+export interface WebRtcSetConnectionIdBody extends WebRtcDefaultMessage {
+  time: number;
+}
diff --git a/common/src/ws/common.ts b/common/src/ws/common.ts
index 76130f9cb..75d226309 100644
--- a/common/src/ws/common.ts
+++ b/common/src/ws/common.ts
@@ -1,15 +1,22 @@
+// Every message that server sends to a client (browser) should be a structure like this
 export interface DefaultWsInMessage<A extends string, H extends HandlerName, D> {
   action: A;
   data: D;
   handler: H;
 }
 
+// if sendToServerAndAwait it used
 export interface ResponseWsInMessage <D> {
   data: D;
   cbBySender: string;
   cbId: number;
 }
 
+// if sendToServerAndAwait used but also other clients of this user should receive this message
+export interface MultiResponseMessage <A extends string, H extends HandlerName, D> extends ResponseWsInMessage<D>, DefaultWsInMessage<A,H,D> {
+
+}
+
 export interface DefaultWsOutMessage<A extends string, D> {
   data: D;
   action: A;
diff --git a/common/src/ws/message/get.country.code.ts b/common/src/ws/message/get.country.code.ts
index b2ae767cb..604628647 100644
--- a/common/src/ws/message/get.country.code.ts
+++ b/common/src/ws/message/get.country.code.ts
@@ -4,10 +4,7 @@ import type {
 } from "@common/ws/common";
 import type {LocationDto} from "@common/model/dto/location.dto";
 
-export interface GetCountryCodeWsOutBody {
-}
-
-export type GetCountryCodeWsOutMessage = RequestWsOutMessage<"getCountryCode", GetCountryCodeWsOutBody>;
+export type GetCountryCodeWsOutMessage = RequestWsOutMessage<"getCountryCode", null>;
 
 export interface GetCountryCodeWsInBody {
   userLocation: Record<string, LocationDto>;
diff --git a/common/src/ws/message/peer-connection/destroy.call.connection.ts b/common/src/ws/message/peer-connection/destroy.call.connection.ts
index 904045208..820ff33ba 100644
--- a/common/src/ws/message/peer-connection/destroy.call.connection.ts
+++ b/common/src/ws/message/peer-connection/destroy.call.connection.ts
@@ -1,11 +1,16 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  DefaultWsInMessage,
+  DefaultWsOutMessage
+} from "@common/ws/common";
 import {
   OpponentWsId,
   WebRtcDefaultMessage
 } from "@common/model/webrtc.base";
 
 
-export interface DestroyCallConnectionBody extends OpponentWsId, WebRtcDefaultMessage {
-  content: string;
+export interface DestroyCallConnectionWsOutBody extends WebRtcDefaultMessage {
+  status: "decline" | "hangup";
 }
-export type DestroyCallConnectionMessage = DefaultWsInMessage<"destroyCallConnection", "peerConnection:*", DestroyCallConnectionBody>;
+
+export type DestroyCallConnectionWsOutMessage = DefaultWsOutMessage<"destroyCallConnection", DestroyCallConnectionWsOutBody>;
+export type DestroyCallConnectionWsInMessage = DefaultWsInMessage<"destroyCallConnection", "peerConnection:*", null>;
diff --git a/common/src/ws/message/peer-connection/destroy.file.connection.ts b/common/src/ws/message/peer-connection/destroy.file.connection.ts
index a34bb6da6..da2e175bc 100644
--- a/common/src/ws/message/peer-connection/destroy.file.connection.ts
+++ b/common/src/ws/message/peer-connection/destroy.file.connection.ts
@@ -4,4 +4,5 @@ import type {DefaultWsInMessage} from "@common/ws/common";
 export interface DestroyFileConnectionBody {
   status: "decline" | "success";
 }
+
 export type DestroyFileConnectionMessage = DefaultWsInMessage<"destroyFileConnection", "peerConnection:*", DestroyFileConnectionBody>;
diff --git a/common/src/ws/message/room/add.channel.ts b/common/src/ws/message/room/add.channel.ts
index 903664b12..3d2a24db6 100644
--- a/common/src/ws/message/room/add.channel.ts
+++ b/common/src/ws/message/room/add.channel.ts
@@ -1,7 +1,7 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {NewRoom} from "@common/legacy";
 import type {ChannelDto} from "@common/model/dto/channel.dto";
 import type {RoomDto} from "@common/model/dto/room.dto";
+import {NewRoom} from "@common/model/ws.base";
 
 export interface AddChannelBody extends ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
   channelUsers: number[];
diff --git a/common/src/ws/message/room/add.invite.ts b/common/src/ws/message/room/add.invite.ts
index 376be7770..5787b5187 100644
--- a/common/src/ws/message/room/add.invite.ts
+++ b/common/src/ws/message/room/add.invite.ts
@@ -1,9 +1,8 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import {
   AddRoomBase,
-  NewRoom,
   RoomExistedBefore
-} from "@common/legacy";
+} from "@common/model/ws.base";
 
 export type AddInviteBody = AddRoomBase | RoomExistedBefore;
 
diff --git a/common/src/ws/message/room/add.online.user.ts b/common/src/ws/message/room/add.online.user.ts
index 409307b8c..e2cecd613 100644
--- a/common/src/ws/message/room/add.online.user.ts
+++ b/common/src/ws/message/room/add.online.user.ts
@@ -2,8 +2,8 @@ import type {DefaultWsInMessage} from "@common/ws/common";
 import type {ChangeUserOnlineBase} from "@common/model/ws.base";
 
 
-export interface AddOnlineUserBodyMessage extends ChangeUserOnlineBase {
+export interface AddOnlineUserBody extends ChangeUserOnlineBase {
   opponentWsId: string;
 }
 
-export type AddOnlineUserMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserBodyMessage>;
+export type AddOnlineUserMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserBody>;
diff --git a/common/src/ws/message/room/add.room.ts b/common/src/ws/message/room/add.room.ts
index aa26e7f8c..179298026 100644
--- a/common/src/ws/message/room/add.room.ts
+++ b/common/src/ws/message/room/add.room.ts
@@ -1,5 +1,5 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {AddRoomBase} from "@common/legacy";
+import {AddRoomBase} from "@common/model/ws.base";
 
 export interface AddRoomBody extends AddRoomBase {
   channelUsers: number[];
diff --git a/common/src/ws/message/room/create.new.user.ts b/common/src/ws/message/room/create.new.user.ts
index 8ebb6e3e1..372f2d308 100644
--- a/common/src/ws/message/room/create.new.user.ts
+++ b/common/src/ws/message/room/create.new.user.ts
@@ -8,4 +8,4 @@ export interface CreateNewUserBody extends UserDto {
   }[];
 }
 
-export type CreateNewUsedMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserBody>;
+export type CreateNewUserMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserBody>;
diff --git a/common/src/ws/message/room/invite.user.ts b/common/src/ws/message/room/invite.user.ts
index be926d740..7eea89e5b 100644
--- a/common/src/ws/message/room/invite.user.ts
+++ b/common/src/ws/message/room/invite.user.ts
@@ -2,7 +2,7 @@ import type {DefaultWsInMessage} from "@common/ws/common";
 import {
   NewRoom,
   RoomExistedBefore
-} from "@common/legacy";
+} from "@common/model/ws.base";
 
 export interface InviteUserBody extends NewRoom, RoomExistedBefore {
   roomId: number;
diff --git a/common/src/ws/message/room/remove.online.user.ts b/common/src/ws/message/room/remove.online.user.ts
index d947331e0..44bd951aa 100644
--- a/common/src/ws/message/room/remove.online.user.ts
+++ b/common/src/ws/message/room/remove.online.user.ts
@@ -1,5 +1,5 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import {ChangeUserOnlineBase} from "@common/legacy";
+import {ChangeUserOnlineBase} from "@common/model/ws.base";
 
 export type RemoveOnlineUserBody = ChangeUserOnlineBase;
 
diff --git a/common/src/ws/message/sync/set.connection.id.ts b/common/src/ws/message/sync/set.connection.id.ts
index 50ba61f2d..7c29e8943 100644
--- a/common/src/ws/message/sync/set.connection.id.ts
+++ b/common/src/ws/message/sync/set.connection.id.ts
@@ -1,8 +1,4 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
-import type {WebRtcDefaultMessage} from "@common/legacy";
 import {ResponseWsInMessage} from "@common/ws/common";
+import {WebRtcDefaultMessage} from "@common/model/webrtc.base";
 
-export interface WebRtcSetConnectionIdBody extends WebRtcDefaultMessage {
-  time: number;
-}
-export type WebRtcSetConnectionIdMessage = ResponseWsInMessage<WebRtcSetConnectionIdBody>;
diff --git a/common/src/ws/message/webrtc-transfer/accept.file.ts b/common/src/ws/message/webrtc-transfer/accept.file.ts
index 013b054d7..f8ab61262 100644
--- a/common/src/ws/message/webrtc-transfer/accept.file.ts
+++ b/common/src/ws/message/webrtc-transfer/accept.file.ts
@@ -1,8 +1,15 @@
-import {DefaultWsInMessage} from "@common/ws/common";
+import {
+  DefaultWsInMessage,
+  DefaultWsOutMessage
+} from "@common/ws/common";
+import {WebRtcDefaultMessage} from "@common/model/webrtc.base";
 
 
-export interface AcceptFileBody {
+export interface AcceptFileBody extends WebRtcDefaultMessage {
   received: number;
 }
 
+
 export type AcceptFileMessage = DefaultWsInMessage<"acceptFile", "peerConnection:*", AcceptFileBody>;
+
+export type AcceptFileWsOutMessage = DefaultWsOutMessage<"acceptFile", AcceptFileBody>
diff --git a/common/src/ws/message/webrtc/offer.call.ts b/common/src/ws/message/webrtc/offer.call.ts
index 45633a0d7..b15eaa2f1 100644
--- a/common/src/ws/message/webrtc/offer.call.ts
+++ b/common/src/ws/message/webrtc/offer.call.ts
@@ -1,16 +1,25 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
-import {
+import type {
+  DefaultWsInMessage,
+  RequestWsOutMessage,
+  ResponseWsInMessage,
+} from "@common/ws/common";
+import type {
   BrowserBase,
   OpponentWsId,
-  WebRtcDefaultMessage
+  WebRtcDefaultMessage,
+  WebRtcSetConnectionIdBody,
 } from "@common/model/webrtc.base";
 
 
-export interface OfferCallBody extends OpponentWsId, WebRtcDefaultMessage {
-  content: BrowserBase;
+export interface OfferCallRequestBody extends BrowserBase {
   roomId: number;
+}
+
+export interface OfferCallBody extends OpponentWsId, WebRtcDefaultMessage, OfferCallRequestBody  {
   userId: number;
   time: number;
 }
 
 export type OfferCallMessage = DefaultWsInMessage<"offerCall", "webrtc", OfferCallBody>;
+export type OfferCallRequest = RequestWsOutMessage<"offerCall", OfferCallRequestBody>;
+export type OfferCallResponse = ResponseWsInMessage<WebRtcSetConnectionIdBody>;
diff --git a/common/src/ws/message/webrtc/offer.file.ts b/common/src/ws/message/webrtc/offer.file.ts
index cb93940fc..fee6eaa37 100644
--- a/common/src/ws/message/webrtc/offer.file.ts
+++ b/common/src/ws/message/webrtc/offer.file.ts
@@ -1,22 +1,33 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  DefaultWsInMessage,
+  DefaultWsOutMessage,
+  MultiResponseMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
 import {
   BrowserBase,
   OpponentWsId,
   WebRtcDefaultMessage
 } from "@common/model/webrtc.base";
+import {RequestWsOutMessage} from "@common/ws/common";
+import {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
 
 
-export interface OfferFileContent extends BrowserBase {
-  size: number;
+export type OfferFileRequestBody = {
+  roomId: number;
+  threadId:number | null;
+  browser: string;
   name: string;
+  size: number;
 }
 
-export interface OfferFileBody extends OpponentWsId, WebRtcDefaultMessage {
-  content: OfferFileContent;
-  roomId: number;
-  threadId: number | null;
+export type OfferFileRequest = RequestWsOutMessage<"offerFile", OfferFileRequestBody>
+
+export type OfferFileResponse = WebRtcSetConnectionIdMessage;
+
+export interface OfferFileBody extends OfferFileRequestBody, OpponentWsId, WebRtcDefaultMessage {
   userId: number;
   time: number;
 }
 
-export type OfferFileMessage = DefaultWsInMessage<"offerFile", "webrtc", OfferFileBody>;
+export type OfferFileMessage = MultiResponseMessage<"offerFile", "webrtc", OfferFileBody>;
diff --git a/common/src/ws/message/ws/pong.ts b/common/src/ws/message/ws/pong.ts
index badd2bb3a..ca0968162 100644
--- a/common/src/ws/message/ws/pong.ts
+++ b/common/src/ws/message/ws/pong.ts
@@ -1,6 +1,11 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  DefaultWsInMessage,
+  DefaultWsOutMessage
+} from "@common/ws/common";
 
 export interface PongBody {
   time: string;
 }
-export type PongMessage = DefaultWsInMessage<"pong", "ws", PongBody>;
+export type PongWsOutMessage = DefaultWsOutMessage<"pong", PongBody>;
+
+export type PongWsInMessage = DefaultWsInMessage<"pong", "ws", PongBody>
diff --git a/common/src/ws/message/ws/set.settings.ts b/common/src/ws/message/ws/set.settings.ts
index 189277377..5507c2341 100644
--- a/common/src/ws/message/ws/set.settings.ts
+++ b/common/src/ws/message/ws/set.settings.ts
@@ -1,5 +1,11 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  DefaultWsInMessage,
+  RequestWsOutMessage,
+  ResponseWsInMessage
+} from "@common/ws/common";
 import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
+import {MultiResponseMessage} from "@common/ws/common";
 
 export type SetSettingBody = UserSettingsDto;
-export type SetSettingsMessage = DefaultWsInMessage<"setSettings", "ws", SetSettingBody>;
+export type SetSettingsMessage = MultiResponseMessage<"setSettings", "ws", SetSettingBody>;
+export type SetSettingsWsOutMessage = RequestWsOutMessage<"setSettings", SetSettingBody>
diff --git a/common/src/ws/message/ws/set.user.profile.ts b/common/src/ws/message/ws/set.user.profile.ts
index df757827e..ec0003274 100644
--- a/common/src/ws/message/ws/set.user.profile.ts
+++ b/common/src/ws/message/ws/set.user.profile.ts
@@ -1,5 +1,11 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  DefaultWsInMessage,
+  MultiResponseMessage,
+  RequestWsOutMessage
+} from "@common/ws/common";
 import type {UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
 
 export type SetUserProfileBody = UserProfileDtoWoImage;
-export type SetUserProfileMessage = DefaultWsInMessage<"setUserProfile", "ws", SetUserProfileBody>;
+export type SetUserProfileMessage = MultiResponseMessage<"setUserProfile", "ws", SetUserProfileBody>;
+
+export type SetUserProfileWsOutMessage = RequestWsOutMessage<"setUserProfile", SetUserProfileBody>;
diff --git a/common/src/ws/message/ws/set.ws.id.ts b/common/src/ws/message/ws/set.ws.id.ts
index 0c710a257..f15b83765 100644
--- a/common/src/ws/message/ws/set.ws.id.ts
+++ b/common/src/ws/message/ws/set.ws.id.ts
@@ -5,7 +5,7 @@ import {UserDto} from "@common/model/dto/user.dto";
 import {UserProfileDto} from "@common/model/dto/user.profile.dto";
 import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 
-export interface SetWsIdWsOutBody {
+export interface SetWsIdBody {
   rooms: RoomDto[];
   opponentWsId: string;
   channels: ChannelDto[];
@@ -15,4 +15,4 @@ export interface SetWsIdWsOutBody {
   profile: UserProfileDto;
   settings: UserSettingsDto;
 }
-export type SetWsIdWsOutMessage = DefaultWsInMessage<"setWsId", "ws", SetWsIdWsOutBody>;
+export type SetWsIdWsInMessage = DefaultWsInMessage<"setWsId", "ws", SetWsIdBody>;
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
index 7b24087a3..6f4dc42d5 100644
--- a/frontend/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -94,7 +94,7 @@
     "import/no-relative-parent-imports": 1,
     "import/dynamic-import-chunkname": 0,
     "import/exports-last":1,
-    "import/extensions": [1, "never", {"json":  "always", "vue": "always", "sass": "always", "png":  "always", "wav": "always", "mp3": "always"}],
+//    "import/extensions": [1, "never", {"json":  "always", "vue": "always", "sass": "always", "png":  "always", "wav": "always", "mp3": "always"}],
     "import/first":1,
     "import/group-exports": 0, // vue3
     "import/max-dependencies": 0,
diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index d86abea92..1550dcfb9 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -13,18 +13,15 @@ import {
   SERVICE_WORKER_VERSION_LS_NAME,
 } from "@/ts/utils/consts";
 
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {MainWindow} from "@/ts/classes/MainWindow";
 import type Subscription from "@/ts/classes/Subscription";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 
 
-export default class NotifierHandler extends MessageHandler {
+export default class NotifierHandler {
   protected readonly logger: Logger;
 
-  protected readonly handlers: HandlerTypes<keyof NotifierHandler> = {
-    internetAppear: <HandlerType<"internetAppear", InternetAppearMessage>> this.internetAppear,
-  };
-
   private readonly mainWindow: MainWindow;
 
   private readonly popedNotifQueue: Notification[] = [];
@@ -57,7 +54,6 @@ export default class NotifierHandler extends MessageHandler {
   private readonly sub: Subscription;
 
   public constructor(api: Api, browserVersion: string, isChrome: boolean, isMobile: boolean, ws: WsHandler, store: DefaultStore, mainWindow: MainWindow, sub: Subscription) {
-    super();
     this.api = api;
     this.browserVersion = browserVersion;
     this.isChrome = isChrome;
@@ -73,6 +69,7 @@ export default class NotifierHandler extends MessageHandler {
     this.onFocus(null);
   }
 
+  @Subscribe<InternetAppearMessage>()
   public async internetAppear() {
     if (!this.serviceWorkedTried) {
       await this.tryAgainRegisterServiceWorker();
diff --git a/frontend/src/ts/classes/Subscription.ts b/frontend/src/ts/classes/Subscription.ts
index 1a3988070..e295da2ef 100644
--- a/frontend/src/ts/classes/Subscription.ts
+++ b/frontend/src/ts/classes/Subscription.ts
@@ -1,6 +1,6 @@
 import type {DefaultWsInMessage, HandlerName} from "@common/ws/common";
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import type {IMessageHandler} from "@common/legacy";
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 
@@ -8,7 +8,7 @@ import type {Logger} from "lines-logger";
 export default class Subscription {
   // TODO sub should unsubscribe from some events on logout
 
-  private suscribers: Partial<Record<HandlerName, IMessageHandler[]>> = {};
+  private suscribers: Partial<Record<HandlerName, any[]>> = {};
 
   private readonly logger: Logger;
 
@@ -32,7 +32,7 @@ export default class Subscription {
     return this.suscribers[channel]?.length ?? 0;
   }
 
-  public subscribe(channel: HandlerName, messageHandler: IMessageHandler) {
+  public subscribe(channel: HandlerName, messageHandler: any) {
     if (!this.suscribers[channel]) {
       this.suscribers[channel] = [];
     }
@@ -42,7 +42,7 @@ export default class Subscription {
     }
   }
 
-  public unsubscribe(channel: HandlerName, handler: IMessageHandler) {
+  public unsubscribe(channel: HandlerName, handler: any) {
     const c = this.suscribers[channel];
 
     if (c) {
@@ -63,7 +63,7 @@ export default class Subscription {
     this.logger.debug("notifing {}", message)();
     if (message.handler === "*") {
       Object.values(this.suscribers).forEach((channel) => {
-        channel.forEach((h: IMessageHandler) => {
+        channel.forEach((h: any) => {
           if (h.getHandler(message)) {
             this.logger.debug(`Notifying (${message.handler}).[${message.action}] {}`, h)();
             h.handle(message);
@@ -72,7 +72,7 @@ export default class Subscription {
       });
       return true;
     } else if (this.suscribers[message.handler]?.length) {
-      this.suscribers[message.handler]!.forEach((h: IMessageHandler) => {
+      this.suscribers[message.handler]!.forEach((h: any) => {
         this.logger.debug(`Notifying (${message.handler}).[${message.action}] {}`, h)();
         h.handle(message);
       });
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 90339665e..5cda0f889 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -33,6 +33,7 @@ import RoomUsersListPage from "@/vue/pages/RoomUsersListPage.vue";
 import ChannelAddRoom from "@/vue/pages/ChannelAddRoom.vue";
 import type Subscription from "@/ts/classes/Subscription";
 import type {SessionHolder} from "@/ts/types/types";
+import {Subscribe} from "@/ts/utils/pubsub";
 
 
 export function routerFactory(sub: Subscription, sessionHolder: SessionHolder) {
@@ -186,32 +187,31 @@ export function routerFactory(sub: Subscription, sessionHolder: SessionHolder) {
     }
   });
 
-  sub.subscribe("router", new class RouterProcessor extends MessageHandler {
+     class RouterProcessor {
     protected readonly logger: Logger = logger;
 
-    protected readonly handlers: HandlerTypes<keyof RouterProcessor> = {
-      login: <HandlerType<"login", LoginMessage>> this.login,
-      logout: <HandlerType<"logout", LogoutMessage>> this.logout,
-      navigate: <HandlerType<"navigate", RouterNavigateMessage>> this.navigate,
-    };
-
-    logout() {
+    @Subscribe<LogoutMessage>()
+    public logout() {
       router.replace("/auth/sign-in");
     }
 
-    navigate(a: RouterNavigateMessageBody) {
+    @Subscribe<RouterNavigateMessage>()
+    public navigate(a: RouterNavigateMessageBody) {
       if (router.currentRoute.value.path !== a.to) {
         router.replace(a.to);
       }
     }
 
-    login(a: LoginMessageBody) {
+    @Subscribe<LoginMessage>()
+    public  login(a: LoginMessageBody) {
       if (!a.session) {
         throw Error(`Invalid session ${a.session}`);
       }
       sessionHolder.session = a.session;
       router.replace(`/chat/${ALL_ROOM_ID}`);
     }
-  }());
+  }
+
+  sub.subscribe("router", new RouterProcessor());
   return router;
 }
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 761a8abdd..8d7c1d174 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -39,14 +39,6 @@ export default class AbstractMessageProcessor {
     this.logger = loggerFactory.getLoggerColor("mes-proc", "#4c002b");
   }
 
-  public setMessageCbId<D>(message: RequestWsOutMessage<string, D>) {
-    if (message.cbId) {
-      throw Error("Cb id should ge generated by this");
-    }
-    // Should be ++, so uniqueId won't be 0, if it's 0 then checks like !0 are false, but should be true
-    message.cbId = ++this.uniquePositiveMessageId;
-  }
-
   public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | ResponseWsInMessage<D> | null {
     let data: DefaultWsInMessage<string, HandlerName, any> | null = null;
     try {
@@ -60,11 +52,11 @@ export default class AbstractMessageProcessor {
     return data;
   }
 
-  public async sendToServerAndAwait<D, RES>(message: RequestWsOutMessage<string, D>): Promise<ResponseWsInMessage<RES>> {
+  public async sendToServerAndAwait<REQ extends RequestWsOutMessage<any, any>, RES extends ResponseWsInMessage<any>>(message: Omit<REQ, 'cbId'>): Promise<RES['data']> {
     return new Promise((resolve, reject) => {
-      this.setMessageCbId<D>(message);
+      (message as any).cbId = ++this.uniquePositiveMessageId;
       const jsonMessage = this.getJsonMessage(message);
-      this.callBacks[message.cbId!] = {
+      this.callBacks[(message as any).cbId!] = {
         resolve,
         reject,
       };
diff --git a/frontend/src/ts/message_handlers/MesageHandler.ts b/frontend/src/ts/message_handlers/MesageHandler.ts
deleted file mode 100644
index f086e5885..000000000
--- a/frontend/src/ts/message_handlers/MesageHandler.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type {Logger} from "lines-logger";
-
-
-export default abstract class MessageHandler implements IMessageHandler {
-  protected abstract readonly logger: Logger;
-
-  protected abstract readonly handlers: HandlerTypes<any>;
-
-  // TODO message: any
-  public handle(message: any) {
-    if (!this.handlers) {
-      throw Error(`${this.constructor.name} has empty handlers`);
-    }
-    const handler: HandlerType<string, any> | undefined = this.handlers[message.action];
-    if (handler) {
-      handler.bind(this)(message);
-      this.logger.debug("Notified {}.{} => message", this.constructor.name, message.action, message);
-    } else {
-      this.logger.error("{} can't find handler for {}, available handlers {}. Message: {}", this.constructor.name, message.action, Object.keys(this.handlers), message)();
-    }
-  }
-
-  getHandler(message: any): HandlerType<string, any> | undefined {
-    return this.handlers[message.action];
-  }
-}
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 5d470d094..8f8c8c204 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,39 +1,57 @@
 import type {ChannelDto} from "@common/model/dto/channel.dto";
 import type {RoomDto} from "@common/model/dto/room.dto";
 import type {AddRoomBase, ChangeDeviceType} from "@common/model/ws.base";
-import type {AddChannelMessage} from "@common/ws/message/room/add.channel";
-import type {AddInviteMessage} from "@common/ws/message/room/add.invite";
-import type {AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import type {AddRoomMessage} from "@common/ws/message/room/add.room";
-import type {DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import type {DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import type {InviteUserMessage} from "@common/ws/message/room/invite.user";
-import type {LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import type {RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import type {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import type {SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import type {ShowITypeWsInMessage} from "@common/ws/message/room/show.i.type";
-import type {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import type {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
-import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import type {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import {AddChannelBody} from "@common/ws/message/room/add.channel";
 import type {
   AddChannelMessage,
+} from "@common/ws/message/room/add.channel";
+import {AddInviteBody} from "@common/ws/message/room/add.invite";
+import type {
   AddInviteMessage,
-  AddRoomBase,
+} from "@common/ws/message/room/add.invite";
+import {AddOnlineUserBody} from "@common/ws/message/room/add.online.user";
+import type {
+  AddOnlineUserMessage,
+} from "@common/ws/message/room/add.online.user";
+import {AddRoomBody} from "@common/ws/message/room/add.room";
+import type {
   AddRoomMessage,
-  ChangeDeviceType,
+} from "@common/ws/message/room/add.room";
+import {DeleteChannelBody} from "@common/ws/message/room/delete.channel";
+import type {
   DeleteChannelMessage,
+} from "@common/ws/message/room/delete.channel";
+import {DeleteRoomBody} from "@common/ws/message/room/delete.room";
+import type {
   DeleteRoomMessage,
+} from "@common/ws/message/room/delete.room";
+import {InviteUserBody} from "@common/ws/message/room/invite.user";
+import type {
   InviteUserMessage,
+} from "@common/ws/message/room/invite.user";
+import {LeaveUserBody} from "@common/ws/message/room/leave.user";
+import type {
   LeaveUserMessage,
+} from "@common/ws/message/room/leave.user";
+import {RemoveOnlineUserBody} from "@common/ws/message/room/remove.online.user";
+import type {
   RemoveOnlineUserMessage,
+} from "@common/ws/message/room/remove.online.user";
+import {SaveChannelSettingsBody} from "@common/ws/message/room/save.channel.settings";
+import type {
   SaveChannelSettingsMessage,
-  SaveRoomSettingsMessage,
-} from "@common/legacy";
-import type {ShowITypeWsInMessage} from "@common/ws/message/show.i.type";
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
+} from "@common/ws/message/room/save.channel.settings";
+import type {
+  SaveRoomSettingsBody,
+  SaveRoomSettingsMessage
+} from "@common/ws/message/room/save.room.settings";
+
+import type {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
+import type {ChangeOnlineMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import type {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
+import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+
 import type {RoomLogEntry, SetRoomsUsers} from "@/ts/types/types";
 
 import type {
@@ -58,29 +76,22 @@ import {login, logout} from "@/ts/utils/audio";
 import type Subscription from "@/ts/classes/Subscription";
 
 import type {SetStateFromWS} from "@/ts/types/dto";
-
-
-export class RoomHandler extends MessageHandler {
+import {Subscribe} from "@/ts/utils/pubsub";
+import {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
+import {PubSetRoomsMessageBody} from "@/ts/types/messages/inner/pub.set.rooms";
+import {
+  ShowITypeWsInBody,
+  ShowITypeWsInMessage
+} from "@common/ws/message/room/show.i.type";
+import {
+  CreateNewUserBody,
+  CreateNewUserMessage
+} from "@common/ws/message/room/create.new.user";
+
+
+export class RoomHandler {
   protected readonly logger: Logger;
 
-  protected readonly handlers: HandlerTypes<keyof RoomHandler> = {
-    deleteRoom: <HandlerType<"deleteRoom", "room">> this.deleteRoom,
-    init: <HandlerType<"init", "room">> this.init,
-    leaveUser: <HandlerType<"leaveUser", "room">> this.leaveUser,
-    addRoom: <HandlerType<"addRoom", "room">> this.addRoom,
-    removeOnlineUser: <HandlerType<"removeOnlineUser", "room">> this.removeOnlineUser,
-    addChannel: <HandlerType<"addChannel", "room">> this.addChannel,
-    inviteUser: <HandlerType<"inviteUser", "room">> this.inviteUser,
-    addInvite: <HandlerType<"addInvite", "room">> this.addInvite,
-    addOnlineUser: <HandlerType<"addOnlineUser", "room">> this.addOnlineUser,
-    saveChannelSettings: <HandlerType<"saveChannelSettings", "room">> this.saveChannelSettings,
-    deleteChannel: <HandlerType<"deleteChannel", "room">> this.deleteChannel,
-    saveRoomSettings: <HandlerType<"saveRoomSettings", "room">> this.saveRoomSettings,
-    createNewUser: <HandlerType<"createNewUser", "room">> this.createNewUser,
-    showIType: <HandlerType<"showIType", "room">> this.showIType,
-    logout: <HandlerType<"logout", "room">> this.logout,
-  };
-
   private readonly store: DefaultStore;
 
   private readonly ws: WsHandler;
@@ -96,7 +107,6 @@ export class RoomHandler extends MessageHandler {
     audioPlayer: AudioPlayer,
     sub: Subscription,
   ) {
-    super();
     this.store = store;
     this.sub = sub;
     sub.subscribe("room", this);
@@ -105,7 +115,8 @@ export class RoomHandler extends MessageHandler {
     this.audioPlayer = audioPlayer;
   }
 
-  public leaveUser(message: LeaveUserMessage) {
+  @Subscribe<LeaveUserMessage>()
+  public leaveUser(message: LeaveUserBody) {
     if (this.store.roomsDict[message.roomId]) {
       const m: SetRoomsUsers = {
         roomId: message.roomId,
@@ -126,23 +137,26 @@ export class RoomHandler extends MessageHandler {
     }
   }
 
-  public addRoom(message: AddRoomMessage) {
+  @Subscribe<AddRoomMessage>()
+  public addRoom(message: AddRoomBody) {
     this.mutateRoomAddition(message, "room_created");
   }
 
-  public removeOnlineUser(message: RemoveOnlineUserMessage) {
+  @Subscribe<RemoveOnlineUserMessage>()
+  public removeOnlineUser(message: RemoveOnlineUserBody) {
     if (message.online[message.userId].length === 0) {
       this.addChangeOnlineEntry(message.userId, message.time, "gone offline");
     }
     this.store.setOnline(message.online);
   }
 
-  public addChannel(message: AddChannelMessage) {
-    // TODO
-    this.mutateRoomAddition(message as any, "room_created");
+  @Subscribe<AddChannelMessage>()
+  public addChannel(message: AddChannelBody) {
+    this.mutateRoomAddition(message, "room_created");
   }
 
-  public inviteUser(message: InviteUserMessage) {
+  @Subscribe<InviteUserMessage>()
+  public inviteUser(message: InviteUserBody) {
     this.store.setRoomsUsers({
       roomId: message.roomId,
       users: message.users,
@@ -160,11 +174,13 @@ export class RoomHandler extends MessageHandler {
     this.notifyDevicesChanged(null, message.roomId, "someone_joined");
   }
 
-  public addInvite(message: AddInviteMessage) {
+  @Subscribe<AddInviteMessage>()
+  public addInvite(message: AddInviteBody) {
     this.mutateRoomAddition(message, "invited");
   }
 
-  public createNewUser(message: CreateNewUserMessage) {
+  @Subscribe<CreateNewUserMessage>()
+  public createNewUser(message: CreateNewUserBody) {
     const newVar: UserModel = convertUser(message, null);
     this.store.addUser(newVar);
     message.rooms.forEach(({roomId, users}) => {
@@ -185,13 +201,14 @@ export class RoomHandler extends MessageHandler {
     });
   }
 
-  public addOnlineUser(message: AddOnlineUserMessage) {
+  @Subscribe<AddOnlineUserMessage>()
+  public addOnlineUser(message: AddOnlineUserBody) {
     if (message.online[message.userId].length === 1) {
       // Exactly 1 device is now offline, so that new that appeared is the first one
       this.addChangeOnlineEntry(message.userId, message.time, "appeared online");
     }
     this.store.setOnline({...message.online}); // Prevent modifying original object
-    const payload: ChangeUserOnlineInfoMessage = {
+    const payload: ChangeOnlineMessage = {
       handler: "webrtc",
       allowZeroSubscribers: true,
       action: "changeOnline",
@@ -202,7 +219,8 @@ export class RoomHandler extends MessageHandler {
     this.sub.notify(payload);
   }
 
-  public saveChannelSettings(message: SaveChannelSettingsMessage) {
+  @Subscribe<SaveChannelSettingsMessage>()
+  public saveChannelSettings(message: SaveChannelSettingsBody) {
     if (!this.store.channelsDict[message.id]) {
       this.logger.error("Unable to find channel to edit {} to kick user, available are {}", message.id, Object.keys(this.store.channelsDict))();
     } else {
@@ -217,14 +235,16 @@ export class RoomHandler extends MessageHandler {
     }
   }
 
-  public deleteChannel(message: DeleteChannelMessage) {
+  @Subscribe<DeleteChannelMessage>()
+  public deleteChannel(message: DeleteChannelBody) {
     this.store.deleteChannel(message.channelId);
     message.roomIds.forEach((id) => {
       this.doRoomDelete(id);
     });
   }
 
-  public async showIType(message: ShowITypeWsInMessage) {
+  @Subscribe<ShowITypeWsInMessage>()
+  public async showIType(message: ShowITypeWsInBody) {
     if (this.store.myId !== message.userId) {
       await this.store.showUserIsTyping({
         userId: message.userId,
@@ -233,7 +253,8 @@ export class RoomHandler extends MessageHandler {
     }
   }
 
-  public saveRoomSettings(message: SaveRoomSettingsMessage) {
+  @Subscribe<SaveRoomSettingsMessage>()
+  public saveRoomSettings(message: SaveRoomSettingsBody) {
     const oldRoom = this.store.roomsDict[message.id];
     if (!oldRoom) {
       this.logger.error("Unable to find channel to edit {} to kick user, available are {}", message.id, Object.keys(this.store.roomsDict))();
@@ -247,16 +268,18 @@ export class RoomHandler extends MessageHandler {
     }
   }
 
-
-  public deleteRoom(message: DeleteRoomMessage) {
+  @Subscribe<DeleteRoomMessage>()
+  public deleteRoom(message: DeleteRoomBody) {
     this.doRoomDelete(message.roomId);
   }
 
-  public logout(m: LogoutMessage) {
+  @Subscribe<LogoutMessage>()
+  public logout() {
     this.store.logout();
   }
 
-  public init(m: PubSetRoomsMessage) {
+  @Subscribe<PubSetRoomsMessage>()
+  public init(m: PubSetRoomsMessageBody) {
     const {rooms, channels, users, online} = m;
 
     /*
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 9f3cc7475..5ac7cd957 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -1,6 +1,9 @@
 import type {GiphyDto} from "@common/model/dto/giphy.dto";
 import type {RoomNoUsersDto} from "@common/model/dto/room.dto";
-import type {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
+import type {
+  UserProfileDto,
+  UserProfileDtoWoImage,
+} from "@common/model/dto/user.profile.dto";
 import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 import type {MessageStatus} from "@common/model/enum/message.status";
 import type {MessagesResponseMessage} from "@common/model/ws.base";
@@ -9,36 +12,53 @@ import type {AddInviteMessage} from "@common/ws/message/room/add.invite";
 import type {AddRoomMessage} from "@common/ws/message/room/add.room";
 import type {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
 import type {ShowITypeWsOutMessage} from "@common/ws/message/room/show.i.type";
-import type {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
+import type {
+  WebRtcSetConnectionIdBody,
+  WebRtcSetConnectionIdMessage,
+} from "@common/ws/message/sync/set.connection.id";
 import type {PingMessage} from "@common/ws/message/ws/ping";
-import type {PongMessage} from "@common/ws/message/ws/pong";
-import type {SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import type {SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import type {SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import type {SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import type {UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import type {PrintMessageWsInMessage, PrintMessageWsOutMessage} from "@common/ws/message/ws-message/print.message";
-import type {GetCountryCodeWsInMessage, GetCountryCodeWsOutMessage} from "@common/ws/message/get.country.code";
+import {SetProfileImageBody} from "@common/ws/message/ws/set.profile.image";
+import type {
+  SetProfileImageMessage,
+} from "@common/ws/message/ws/set.profile.image";
+import {
+  SetSettingBody,
+} from "@common/ws/message/ws/set.settings";
+import type {
+  SetSettingsMessage,
+
+  SetSettingsWsOutMessage,
+} from "@common/ws/message/ws/set.settings";
+import type {SetUserProfileMessage, SetUserProfileWsOutMessage} from "@common/ws/message/ws/set.user.profile";
+import type {SetWsIdWsOutMessage,
+  SetWsIdWsInMessage} from "@common/ws/message/ws/set.ws.id";
+import {UserProfileChangedBody} from "@common/ws/message/ws/user.profile.changed";
+import type {
+  UserProfileChangedMessage,
+} from "@common/ws/message/ws/user.profile.changed";
+import type {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutMessage,
+} from "@common/ws/message/ws-message/print.message";
+import type {GetCountryCodeWsInMessage,
+  GetCountryCodeWsOutMessage,
+  GetCountryCodeWsInBody} from "@common/ws/message/get.country.code";
 import type {SetMessageStatusWsOutMessage} from "@common/ws/message/set.message.status";
-import type {SyncHistoryWsInMessage, SyncHistoryWsOutMessage} from "@common/ws/message/sync.history";
+import type {
+  SyncHistoryWsInMessage,
+  SyncHistoryWsOutMessage,
+} from "@common/ws/message/sync.history";
 import type {DefaultWsOutMessage} from "@common/ws/common";
 import {WS_SESSION_EXPIRED_CODE} from "@common/consts";
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import type {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
-import type {
-  AddChannelMessage,
-  AddInviteMessage,
-  AddRoomMessage,
-  MessagesResponseMessage,
-  SaveChannelSettingsMessage,
-  SetSettingsMessage,
-  SetUserProfileMessage,
-  UserProfileChangedMessage,
-  WebRtcSetConnectionIdMessage,
-} from "@common/legacy";
+
 import type {ShowITypeWsOutMessage} from "@common/ws/message/show.i.type";
-import type {PrintMessageWsInMessage, PrintMessageWsOutMessage} from "@common/ws/message/print.message";
+import type {
+  PrintMessageWsInMessage,
+  PrintMessageWsOutMessage,
+} from "@common/ws/message/print.message";
 import {
   CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT,
   CONNECTION_RETRY_TIME,
@@ -46,18 +66,59 @@ import {
   IS_DEBUG,
   LOG_LEVEL_LS,
 } from "@/ts/utils/consts";
-import type {Logger, LogLevel} from "lines-logger";
+import type {
+  Logger,
+  LogLevel,
+} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
-import type {CurrentUserInfoWoImage, CurrentUserSettingsModel, Location} from "@/ts/types/model";
-import type {MessageSupplier, SessionHolder} from "@/ts/types/types";
-import {convertLocation, currentUserInfoDtoToModel, userSettingsDtoToModel} from "@/ts/types/converters";
+import type {
+  CurrentUserInfoWoImage,
+  CurrentUserSettingsModel,
+  Location,
+} from "@/ts/types/model";
+import type {
+  MessageSupplier,
+  SessionHolder,
+} from "@/ts/types/types";
+import {
+  convertLocation,
+  currentUserInfoDtoToModel,
+  userSettingsDtoToModel,
+} from "@/ts/types/converters";
 
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
 
 
 import type Subscription from "@/ts/classes/Subscription";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {SetUserProfileBody} from "@common/ws/message/ws/set.user.profile";
+import {
+  SetWsIdBody,
+} from "@common/ws/message/ws/set.ws.id";
+import {Gender} from "@common/model/enum/gender";
+import {PingBody} from "@common/ws/message/ws/ping";
+import type {
+  PongWsInMessage,
+  PongWsOutMessage,
+} from "@common/ws/message/ws/pong";
+import type {
+  OfferFileBody,
+  OfferFileWsOutMessage,
+
+  OfferFileMessage,
+
+  OfferFileRequest,
+  OfferFileResponse,
+} from "@common/ws/message/webrtc/offer.file";
+import {RequestWsOutMessage} from "@common/ws/common";
+import type {
+  OfferCallRequest,
+  OfferCallResponse,
+} from "@common/ws/message/webrtc/offer.call";
+import type {AcceptFileWsOutMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import type {DestroyCallConnectionWsOutMessage} from "@common/ws/message/peer-connection/destroy.call.connection";
 
 
 enum WsState {
@@ -67,18 +128,6 @@ enum WsState {
 export default class WsHandler extends MessageHandler implements MessageSupplier {
   protected readonly logger: Logger;
 
-  protected readonly handlers: HandlerTypes<keyof WsHandler, "ws"> = {
-    setSettings: <HandlerType<"setSettings", "ws">> this.setSettings,
-    setUserProfile: <HandlerType<"setUserProfile", "ws">> this.setUserProfile,
-    setProfileImage: <HandlerType<"setProfileImage", "ws">> this.setProfileImage,
-    setWsId: <HandlerType<"setWsId", "ws">> this.setWsId,
-    logout: <HandlerType<"logout", "ws">> this.logout,
-    userProfileChanged: <HandlerType<"userProfileChanged", "ws">> this.userProfileChanged,
-    ping: <HandlerType<"ping", "ws">> this.ping,
-    pong: <HandlerType<"pong", "ws">> this.pong,
-  };
-
-
   /*
    * How much current time is ahead of the server time
    * if current time is in the past it will be negative
@@ -142,38 +191,41 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     return this.wsConnectionId;
   }
 
-  public async getCountryCode(): Promise<GetCountryCodeWsInMessage> {
-    return this.messageProc.sendToServerAndAwait<GetCountryCodeWsOutMessage, "getCountryCode">({
+  public async getCountryCode(): Promise<GetCountryCodeWsInBody> {
+    return this.messageProc.sendToServerAndAwait<GetCountryCodeWsOutMessage, GetCountryCodeWsInMessage>({
       action: "getCountryCode",
+      data: null,
     });
   }
 
-  public async offerFile(roomId: number, browser: string, name: string, size: number, threadId: number | null): Promise<WebRtcSetConnectionIdMessage> {
-    return this.messageProc.sendToServerAndAwait({
+  public async offerFile(roomId: number, browser: string, name: string, size: number, threadId: number | null): Promise<WebRtcSetConnectionIdBody> {
+    return this.messageProc.sendToServerAndAwait<OfferFileRequest, OfferFileResponse>({
       action: "offerFile",
-      roomId,
-      threadId,
-      content: {
-        browser,
+      data: {
+        roomId,
+        threadId,
         name,
         size,
+        browser,
       },
     });
   }
 
-  public async offerCall(roomId: number, browser: string): Promise<WebRtcSetConnectionIdMessage> {
-    return this.messageProc.sendToServerAndAwait({
+  public async offerCall(roomId: number, browser: string): Promise<WebRtcSetConnectionIdBody> {
+    return this.messageProc.sendToServerAndAwait<OfferCallRequest, OfferCallResponse>({
       action: "offerCall",
-      roomId,
-      content: {browser},
+      data: {
+        roomId,
+        browser,
+      },
     });
   }
 
   public acceptFile(connId: string, received: number) {
-    this.sendToServer({
+    this.sendToServer<AcceptFileWsOutMessage>({
       action: "acceptFile",
-      connId,
-      content: {
+      data: {
+        connId,
         received,
       },
     });
@@ -259,24 +311,25 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
   }
 
   public async saveSettings(content: UserSettingsDto): Promise<SetSettingsMessage | unknown> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.messageProc.sendToServerAndAwait<SetSettingsWsOutMessage, SetSettingsMessage>({
       action: "setSettings",
-      content,
+      data: content,
     });
   }
 
   public showIType(roomId: number): void {
-    const request: ShowITypeWsOutMessage = {
-      roomId,
+    this.sendToServer<ShowITypeWsOutMessage>({
       action: "showIType",
-    };
-    this.sendToServer(request);
+      data: {
+        roomId,
+      },
+    });
   }
 
-  public async saveUser(content: UserProfileDtoWoImage): Promise<SetUserProfileMessage | unknown> {
-    return this.messageProc.sendToServerAndAwait({
+  public async saveUser(data: UserProfileDtoWoImage): Promise<SetUserProfileBody> {
+    return this.messageProc.sendToServerAndAwait<SetUserProfileWsOutMessage, SetUserProfileMessage>({
       action: "setUserProfile",
-      content,
+      data,
     });
   }
 
@@ -399,7 +452,8 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
      */
   }
 
-  public logout(a: LogoutMessage) {
+  @Subscribe<LogoutMessage>()
+  public logout() {
     const info = [];
     if (this.listenWsTimeout) {
       this.listenWsTimeout = null;
@@ -498,11 +552,13 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     });
   }
 
-  public destroyCallConnection(connId: string, content: "decline" | "hangup") {
-    this.sendToServer({
-      content,
+  public destroyCallConnection(connId: string, status: "decline" | "hangup") {
+    this.sendToServer<DestroyCallConnectionWsOutMessage>({
       action: "destroyCallConnection",
-      connId,
+      data: {
+        status,
+        connId,
+      },
     });
   }
 
@@ -527,46 +583,53 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     });
   }
 
-  public setSettings(m: SetSettingsMessage) {
-    const a: CurrentUserSettingsModel = userSettingsDtoToModel(m.content);
+  @Subscribe<SetSettingsMessage>()
+  public setSettings(settings: SetSettingBody) {
+    const a: CurrentUserSettingsModel = userSettingsDtoToModel(settings);
     this.setUserSettings(a);
   }
 
-  public setUserProfile(m: SetUserProfileMessage) {
-    const a: CurrentUserInfoWoImage = currentUserInfoDtoToModel(m.content);
+
+  @Subscribe<SetUserProfileMessage>()
+  public setUserProfile(m: SetUserProfileBody) {
+    const a: CurrentUserInfoWoImage = currentUserInfoDtoToModel(m);
     a.id = this.store.userInfo!.id; // This could came only when we logged in
     this.store.setUserInfo(a);
   }
 
-  public setProfileImage(m: SetProfileImageMessage) {
-    this.setUserImage(m.content);
+  @Subscribe<SetProfileImageMessage>()
+  public setProfileImage(m: SetProfileImageBody) {
+    this.setUserImage(m.url);
   }
 
   public convertServerTimeToPC(serverTime: number) {
     return serverTime + this.timeDiffWithServer; // ServerTime + (Date.now - serverTime) === Date.now
   }
 
-  public async setWsId(message: SetWsIdWsOutMessage) {
+
+  @Subscribe<SetWsIdWsInMessage>()
+  public async setWsId(message: SetWsIdBody) {
     this.wsConnectionId = message.opponentWsId;
     this.setUserInfo(message.profile);
     this.setUserSettings(message.settings);
     this.setUserImage(message.profile.thumbnail);
     this.timeDiffWithServer = Date.now() - message.time;
-    const pubSetRooms: PubSetRoomsMessage = {
+    this.sub.notify<PubSetRoomsMessage>({
       action: "init",
-      channels: message.channels,
+      data: {
+        channels: message.channels,
+        rooms: message.rooms,
+        online: message.online,
+        users: message.users,
+      },
       handler: "room",
-      rooms: message.rooms,
-      online: message.online,
-      users: message.users,
-    };
-    this.sub.notify(pubSetRooms);
-    const inetAppear: InternetAppearMessage = {
+    });
+
+    this.sub.notify<InternetAppearMessage>({
       action: "internetAppear",
       handler: "*",
-    };
-
-    this.sub.notify(inetAppear);
+      data: null,
+    });
     this.logger.debug("CONNECTION ID HAS BEEN SET TO {})", this.wsConnectionId)();
     if (FLAGS) {
       const getCountryCodeMessage = await this.getCountryCode();
@@ -578,31 +641,30 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     }
   }
 
-  public userProfileChanged(message: UserProfileChangedMessage) {
-    this.store.setUser({
-      id: message.id,
-      username: message.username,
-      thumbnail: message.thumbnail,
-      sex: message.sex,
-    });
+  @Subscribe<UserProfileChangedMessage>()
+  public userProfileChanged(message: UserProfileChangedBody) {
+    this.store.setUser(message);
   }
 
-  public ping(message: PingMessage) {
+
+  @Subscribe<PingMessage>()
+  public ping(message: PingBody) {
     this.startNoPingTimeout();
-    this.sendToServer({
+    this.sendToServer<PongWsOutMessage>({
       action: "pong",
-      time: message.time,
+      data: {
+        time: message.time,
+      },
     });
   }
 
-  public pong(message: PongMessage) {
-    // Private answerPong() {
+  @Subscribe<PongWsInMessage>()
+  public pong() {
     if (this.pingTimeoutFunction) {
       this.logger.debug("Clearing pingTimeoutFunction")();
       clearTimeout(this.pingTimeoutFunction);
       this.pingTimeoutFunction = null;
     }
-    // }
   }
 
   notifyCallActive(param: {connectionId: string | null; opponentWsId: string; roomId: number}) {
@@ -737,8 +799,8 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     this.ws.onopen = this.onWsOpen.bind(this);
   }
 
-  private sendToServer<T extends DefaultWsOutMessage<string>>(messageRequest: T, skipGrowl = false): boolean {
-    const isSent = this.messageProc.sendToServer(messageRequest);
+  private sendToServer<T extends DefaultWsOutMessage<string, any>>(messageRequest: T, skipGrowl = false): boolean {
+    const isSent = this.messageProc.sendToServer<T>(messageRequest);
     if (!isSent && !skipGrowl) {
       this.logger.warn("Can't send message, because connection is lost :(")();
     }
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index dc27b6ee3..baa6134f0 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -10,7 +10,7 @@ import type {SetMessageStatusWsInMessage} from "@common/ws/message/set.message.s
 import type {SyncHistoryWsInMessage} from "@common/ws/message/sync.history";
 import type {HandlerName} from "@common/ws/common";
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
-import type {DeleteMessage, MessagesResponseMessage} from "@common/legacy";
+
 import type {PrintMessageWsInMessage} from "@common/ws/message/print.message";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Api from "@/ts/message_handlers/Api";
diff --git a/frontend/src/ts/types/messages/inner/answer.call.ts b/frontend/src/ts/types/messages/inner/answer.call.ts
new file mode 100644
index 000000000..813543505
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/answer.call.ts
@@ -0,0 +1,3 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export type AnswerCallMessage = DefaultWsInMessage<"answerCall", "webrtcTransfer:*", null>;
diff --git a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
index d2af6485f..2f19a0ad5 100644
--- a/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.p2p.room.info.ts
@@ -2,7 +2,6 @@ import type {ChangeDeviceType} from "@common/model/ws.base";
 
 
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import type {ChangeDeviceType} from "@common/legacy";
 
 
 export interface ChangeP2pRoomInfoMessageBody {
diff --git a/frontend/src/ts/types/messages/inner/change.user.online.info.ts b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
index dd231286f..2ba84f17d 100644
--- a/frontend/src/ts/types/messages/inner/change.user.online.info.ts
+++ b/frontend/src/ts/types/messages/inner/change.user.online.info.ts
@@ -2,12 +2,11 @@ import type {ChangeOnlineType} from "@common/model/ws.base";
 
 
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
-import type {ChangeOnlineType} from "@common/legacy";
 
-export interface ChangeUserOnlineInfoMessageBody {
+export interface ChangeOnlineBody {
   opponentWsId: string;
   userId: number;
   changeType: ChangeOnlineType;
 }
 
-export type ChangeUserOnlineInfoMessage = DefaultInnerSystemMessage<"changeOnline", "webrtc", ChangeUserOnlineInfoMessageBody>;
+export type ChangeOnlineMessage = DefaultInnerSystemMessage<"changeOnline", "webrtc", ChangeOnlineBody>;
diff --git a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
index c37c0c798..ff4e8ce38 100644
--- a/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
+++ b/frontend/src/ts/types/messages/inner/check.transfer.destroy.ts
@@ -1,7 +1,7 @@
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
-export interface CheckTransferDestroyMessageBody {
+export interface CheckTransferDestroyBody {
   wsOpponentId: string;
 }
-export type CheckTransferDestroyMessage = DefaultInnerSystemMessage<"checkTransferDestroy", "webrtcTransfer:*", CheckTransferDestroyMessageBody>;
+export type CheckTransferDestroyMessage = DefaultInnerSystemMessage<"checkTransferDestroy", "webrtcTransfer:*", CheckTransferDestroyBody>;
 
diff --git a/frontend/src/ts/types/messages/inner/decline.call.ts b/frontend/src/ts/types/messages/inner/decline.call.ts
new file mode 100644
index 000000000..d95c0ec3b
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/decline.call.ts
@@ -0,0 +1,3 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export type DeclineCallMessage = DefaultWsInMessage<"declineCall", "webrtcTransfer:*", null>;
diff --git a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
index d1b14469e..72efd98e0 100644
--- a/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
+++ b/frontend/src/ts/types/messages/inner/destroy.peer.connection.ts
@@ -1,3 +1,3 @@
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
-export type DestroyPeerConnectionMessage = DefaultInnerSystemMessage<"destroy", "peerConnection:*", {}>;
+export type DestroyPeerConnectionMessage = DefaultInnerSystemMessage<"destroy", "peerConnection:*", null>;
diff --git a/frontend/src/ts/types/messages/inner/internet.appear.ts b/frontend/src/ts/types/messages/inner/internet.appear.ts
index 60ce0a056..a17a73804 100644
--- a/frontend/src/ts/types/messages/inner/internet.appear.ts
+++ b/frontend/src/ts/types/messages/inner/internet.appear.ts
@@ -1,3 +1,3 @@
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
-export type InternetAppearMessage = DefaultInnerSystemMessage<"internetAppear", "*", {}>;
+export type InternetAppearMessage = DefaultInnerSystemMessage<"internetAppear", "*", null>;
diff --git a/frontend/src/ts/types/messages/inner/logout.ts b/frontend/src/ts/types/messages/inner/logout.ts
index 30fa44c1f..8020c04a3 100644
--- a/frontend/src/ts/types/messages/inner/logout.ts
+++ b/frontend/src/ts/types/messages/inner/logout.ts
@@ -1,3 +1,3 @@
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
-export type LogoutMessage = DefaultInnerSystemMessage<"logout", "*", {}>;
+export type LogoutMessage = DefaultInnerSystemMessage<"logout", "*", null>;
diff --git a/frontend/src/ts/types/messages/inner/video.answer.call.ts b/frontend/src/ts/types/messages/inner/video.answer.call.ts
new file mode 100644
index 000000000..164ac6a28
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/video.answer.call.ts
@@ -0,0 +1,3 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export type VideoAnswerCallMessage = DefaultWsInMessage<"videoAnswerCall", "webrtcTransfer:*", null>;
diff --git a/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts b/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
new file mode 100644
index 000000000..26c95a2ed
--- /dev/null
+++ b/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
@@ -0,0 +1,3 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export type AcceptFileReply = DefaultWsInMessage<"acceptFileReply", "peerConnection:*", null>;
diff --git a/frontend/src/ts/types/messages/peer-connection/decline.file.reply.ts b/frontend/src/ts/types/messages/peer-connection/decline.file.reply.ts
new file mode 100644
index 000000000..c5c1d8944
--- /dev/null
+++ b/frontend/src/ts/types/messages/peer-connection/decline.file.reply.ts
@@ -0,0 +1,3 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export type DeclineFileReply = DefaultWsInMessage<"declineFileReply", "peerConnection:*", null>;
diff --git a/frontend/src/ts/types/messages/peer-connection/decline.sending.ts b/frontend/src/ts/types/messages/peer-connection/decline.sending.ts
new file mode 100644
index 000000000..d568df395
--- /dev/null
+++ b/frontend/src/ts/types/messages/peer-connection/decline.sending.ts
@@ -0,0 +1,3 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export type DeclineSendingMessage = DefaultWsInMessage<"declineSending", "peerConnection:*", null>;
diff --git a/frontend/src/ts/types/messages/peer-connection/retry.file.reply.ts b/frontend/src/ts/types/messages/peer-connection/retry.file.reply.ts
new file mode 100644
index 000000000..172472aa9
--- /dev/null
+++ b/frontend/src/ts/types/messages/peer-connection/retry.file.reply.ts
@@ -0,0 +1,3 @@
+import type {DefaultWsInMessage} from "@common/ws/common";
+
+export type RetryFileReply = DefaultWsInMessage<"retryFileReply", "peerConnection:*", null>;
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index e4e68a674..7db22359c 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -17,6 +17,15 @@ import type {
   UserModel,
 } from "@/ts/types/model";
 import type {SetStateFromStorage} from "@/ts/types/dto";
+import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
+import {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import type {PrintMessageWsInMessage} from "@common/ws/message/ws-message/print.message";
+import type {MessageModelDto} from "@common/model/dto/message.model.dto";
+import {
+  AddChannelBody,
+  AddChannelMessage
+} from "@common/ws/message/room/add.channel";
 
 
 export type ValueFilterForKey<T extends object, U> = {
@@ -300,11 +309,6 @@ export interface IMessageHandler {
   getHandler<H extends HandlerName, A extends string>(message: DefaultWsInMessage<A, H, any>): HandlerType<any, any> | undefined;
 }
 
-export type HandlerType<K extends string, A extends DefaultWsInMessage<K, HandlerName, A["data"]>> = (a: A["data"]) => Promise<void> | void;
-
-export type HandlerTypes<K extends string> = {
-  [Key in K]?: HandlerType<Key, any>
-};
 
 export interface SetRoomsUsers {
   roomId: number;
diff --git a/frontend/src/ts/utils/pubsub.ts b/frontend/src/ts/utils/pubsub.ts
new file mode 100644
index 000000000..c0c9636f5
--- /dev/null
+++ b/frontend/src/ts/utils/pubsub.ts
@@ -0,0 +1,26 @@
+import {
+  DefaultWsInMessage,
+  HandlerName
+} from "@common/ws/common";
+
+//
+// export type PureModel<T> = {
+//   [P in keyof Omit<T, "isNewRecord" | "version"> as T[P] extends Date | number[] | boolean | number | string | undefined ? P : never]: T[P]
+// };
+//
+// export type PickByType<T, Value> = {
+//   [P in keyof T as T[P] extends Value | undefined ? P : never]: T[P]
+// };
+//
+// <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
+
+
+
+export function Subscribe<K extends DefaultWsInMessage<A, H, D>, A extends string = string, H extends HandlerName = HandlerName, D extends any = any>() {
+  return (target: any, memberName: K['action'], propertyDescriptor: PropertyDescriptor) => {
+    if (!target.__handlers) {
+      target.__handlers = {}
+    }
+    target.__handlers[memberName] = memberName;
+  };
+}
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 26ad3495c..cc89f51a3 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,23 +1,25 @@
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import type {SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import type {
+  SendRtcDataBody,
+  SendRtcDataMessage
+} from "@common/ws/message/peer-connection/send.rtc.data";
 import type {HandlerName} from "@common/ws/common";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
 
 
-export default abstract class AbstractPeerConnection extends MessageHandler {
+export default abstract class AbstractPeerConnection {
   protected offerCreator: boolean = false;
 
-  protected sendRtcDataQueue: SendRtcDataMessage[] = [];
+  protected sendRtcDataQueue: SendRtcDataBody[] = [];
 
   protected readonly opponentWsId: string;
 
@@ -47,7 +49,6 @@ export default abstract class AbstractPeerConnection extends MessageHandler {
   };
 
   public constructor(roomId: number, connectionId: string, opponentWsId: string, ws: WsHandler, store: DefaultStore, sub: Subscription) {
-    super();
     this.roomId = roomId;
     this.connectionId = connectionId;
     this.opponentWsId = opponentWsId;
@@ -186,12 +187,12 @@ export default abstract class AbstractPeerConnection extends MessageHandler {
   // Destroy(Des)
 
   // This event comes from websocket from server, which is created by another PC
-  public async sendRtcData(message: SendRtcDataMessage) {
+  public async sendRtcData(message: SendRtcDataBody) {
     if (!this.connectedToRemote) {
       this.logger.warn("Putting sendrtc data event to the queue")();
       this.sendRtcDataQueue.push(message);
     } else {
-      const {data} = message;
+      const {content: data} = message;
       if (this.pc!.iceConnectionState && this.pc!.iceConnectionState !== "closed") {
         if ((<RTCSessionDescriptionInit>data).sdp) {
           this.logger.log("Creating answer")();
diff --git a/frontend/src/ts/webrtc/BaseTransferHandler.ts b/frontend/src/ts/webrtc/BaseTransferHandler.ts
index 77d16fe8a..766562aee 100644
--- a/frontend/src/ts/webrtc/BaseTransferHandler.ts
+++ b/frontend/src/ts/webrtc/BaseTransferHandler.ts
@@ -2,12 +2,11 @@ import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import Subscription from "@/ts/classes/Subscription";
 
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
-export default abstract class BaseTransferHandler extends MessageHandler {
+export default abstract class BaseTransferHandler {
   protected connectionId: string | null = null;
 
   protected readonly wsHandler: WsHandler;
@@ -23,7 +22,6 @@ export default abstract class BaseTransferHandler extends MessageHandler {
   protected readonly sub: Subscription;
 
   public constructor(roomId: number, wsHandler: WsHandler, notifier: NotifierHandler, store: DefaultStore, sub: Subscription) {
-    super();
     this.roomId = roomId;
     this.notifier = notifier;
     this.wsHandler = wsHandler;
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 523f90f1a..7f5be551e 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,18 +1,19 @@
-import type {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import type {NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
+import {NotifyCallActiveBody} from "@common/ws/message/webrtc/notify.call.active";
+import type {
+  NotifyCallActiveMessage,
+} from "@common/ws/message/webrtc/notify.call.active";
 import type {OfferMessage} from "@common/ws/message/webrtc/offer.message";
 import type {HandlerName} from "@common/ws/common";
 import type {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
-import type {ChangeUserOnlineInfoMessage} from "@/ts/types/messages/inner/change.user.online.info";
+import {
+  ChangeOnlineBody,
+} from "@/ts/types/messages/inner/change.user.online.info";
+import type {
+  ChangeOnlineMessage,
+} from "@/ts/types/messages/inner/change.user.online.info";
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
-import type {
-  NotifyCallActiveMessage,
-  OfferCall,
-  OfferFile,
-  OfferMessage,
-  WebRtcSetConnectionIdMessage,
-} from "@common/legacy";
+
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
@@ -20,7 +21,6 @@ import type {ReceivingFile} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
 import FileHandler from "@/ts/webrtc/file/FileHandler";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import {MAX_ACCEPT_FILE_SIZE_WO_FS_API} from "@/ts/utils/consts";
 import {requestFileSystem, resolveMediaUrl} from "@/ts/utils/htmlApi";
 import FileReceiverPeerConnection from "@/ts/webrtc/file/FileReceiveerPeerConnection";
@@ -35,22 +35,34 @@ import type {VideoType} from "@/ts/types/types";
 
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import type {MessageSenderProxy} from "@/ts/message_handlers/MessageSenderProxy";
-
-
-export default class WebRtcApi extends MessageHandler {
+import type {
+  OfferFileMessage,
+} from "@common/ws/message/webrtc/offer.file";
+import {
+  OfferFileBody,
+} from "@common/ws/message/webrtc/offer.file";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {ChangeP2pRoomInfoMessageBody} from "@/ts/types/messages/inner/change.p2p.room.info";
+import type {
+  OfferCallMessage,
+} from "@common/ws/message/webrtc/offer.call";
+import {
+  OfferCallBody,
+} from "@common/ws/message/webrtc/offer.call";
+import {OfferBody} from "@common/ws/message/webrtc/offer.message";
+import type {AnswerCallMessage} from "@/ts/types/messages/inner/answer.call";
+import type {DeclineCallMessage} from "@/ts/types/messages/inner/decline.call";
+import type {VideoAnswerCallMessage} from "@/ts/types/messages/inner/video.answer.call";
+import type {DeclineSendingMessage} from "@/ts/types/messages/peer-connection/decline.sending";
+import type {DeclineFileReply} from "@/ts/types/messages/peer-connection/decline.file.reply";
+import type {RetryFileReply} from "@/ts/types/messages/peer-connection/retry.file.reply";
+import type {AcceptFileReply} from "@/ts/types/messages/peer-connection/accept.file.reply";
+import {WebRtcSetConnectionIdBody} from "@common/model/webrtc.base";
+
+
+export default class WebRtcApi {
   protected logger: Logger;
 
-  protected readonly handlers: HandlerTypes<keyof WebRtcApi, "webrtc"> = {
-    offerFile: <HandlerType<"offerFile", "webrtc">> this.offerFile,
-    changeDevices: <HandlerType<"changeDevices", "webrtc">> this.changeDevices,
-    offerCall: <HandlerType<"offerCall", "webrtc">> this.offerCall,
-    offerMessage: <HandlerType<"offerMessage", "webrtc">> this.offerMessage,
-    changeOnline: <HandlerType<"changeOnline", "webrtc">> this.changeOnline,
-    logout: <HandlerType<"logout", HandlerName>> this.logout,
-    internetAppear: <HandlerType<"internetAppear", HandlerName>> this.internetAppear,
-    notifyCallActive: <HandlerType<"notifyCallActive", HandlerName>> this.notifyCallActive,
-  };
-
   private readonly wsHandler: WsHandler;
 
   private readonly store: DefaultStore;
@@ -68,7 +80,6 @@ export default class WebRtcApi extends MessageHandler {
   private readonly sub: Subscription;
 
   public constructor(ws: WsHandler, store: DefaultStore, notifier: NotifierHandler, messageHelper: MessageHelper, sub: Subscription) {
-    super();
     this.sub = sub;
     this.sub.subscribe("webrtc", this);
     this.wsHandler = ws;
@@ -83,7 +94,8 @@ export default class WebRtcApi extends MessageHandler {
     this.messageSenderProxy = messageSenderProxy;
   }
 
-  public offerCall(message: OfferCall) {
+  @Subscribe<OfferCallMessage>()
+  public offerCall(message: OfferCallBody) {
     this.getCallHandler(message.roomId).initAndDisplayOffer(message);
   }
 
@@ -91,7 +103,8 @@ export default class WebRtcApi extends MessageHandler {
     this.getCallHandler(roomId).joinCall();
   }
 
-  public async changeDevices(m: ChangeP2pRoomInfoMessage): Promise<void> {
+  @Subscribe<ChangeP2pRoomInfoMessage>()
+  public async changeDevices(m: ChangeP2pRoomInfoMessageBody): Promise<void> {
     this.logger.log("change devices {}", m)();
     this.updateCallTransfer(m);
     await this.updateMessagesTransfer(m);
@@ -105,15 +118,18 @@ export default class WebRtcApi extends MessageHandler {
     });
   }
 
-  public internetAppear(m: InternetAppearMessage) {
+  @Subscribe<InternetAppearMessage>()
+  public internetAppear() {
     this.initAndSyncMessages();
   }
 
-  public notifyCallActive(m: NotifyCallActiveMessage) {
+  @Subscribe<NotifyCallActiveMessage>()
+  public notifyCallActive(m: NotifyCallActiveBody) {
     this.getCallHandler(m.roomId).addOpponent(m.connId, m.userId, m.opponentWsId);
   }
 
-  public changeOnline(message: ChangeUserOnlineInfoMessage) {
+  @Subscribe<ChangeOnlineMessage>()
+  public changeOnline(message: ChangeOnlineBody) {
     this.store.roomsArray.filter((r) => r.callInfo.callActive && r.users.includes(message.userId)).forEach((r) => {
       if (message.changeType === "appear_online") {
         this.getCallHandler(r.id).createCallPeerConnection({
@@ -134,34 +150,38 @@ export default class WebRtcApi extends MessageHandler {
     });
   }
 
-  public offerMessage(message: OfferMessage) {
+  @Subscribe<OfferMessage>()
+  public offerMessage(message: OfferBody) {
     this.getMessageHandler(message.roomId).acceptConnection(message);
   }
 
   public acceptFile(connId: string, webRtcOpponentId: string) {
-    this.sub.notify({
+    this.sub.notify<AcceptFileReply>({
       action: "acceptFileReply",
       handler: Subscription.getPeerConnectionId(connId, webRtcOpponentId),
+      data: null,
     });
   }
 
   public declineSending(connId: string, webRtcOpponentId: string) {
-    this.sub.notify({
+    this.sub.notify<DeclineSendingMessage>({
       action: "declineSending",
       handler: Subscription.getPeerConnectionId(connId, webRtcOpponentId),
+      data: null,
     });
   }
 
   public declineFile(connId: string, webRtcOpponentId: string) {
-    this.sub.notify({
+    this.sub.notify<DeclineFileReply>({
       action: "declineFileReply",
       handler: Subscription.getPeerConnectionId(connId, webRtcOpponentId),
+      data: null,
     });
   }
 
   public async sendFileOffer(file: File, channel: number, threadId: number | null) {
     if (file.size > 0) {
-      const e: WebRtcSetConnectionIdMessage = await this.wsHandler.offerFile(channel, browserVersion, file.name, file.size, threadId);
+      const e: WebRtcSetConnectionIdBody = await this.wsHandler.offerFile(channel, browserVersion, file.name, file.size, threadId);
       new FileHandler(channel, threadId, e.connId, this.wsHandler, this.notifier, this.store, file, this.wsHandler.convertServerTimeToPC(e.time), this.sub);
     } else {
       this.store.growlError(`File ${file.name} size is 0. Skipping sending it...`);
@@ -169,9 +189,10 @@ export default class WebRtcApi extends MessageHandler {
   }
 
   public retryFile(connId: string, webRtcOpponentId: string) {
-    this.sub.notify({
+    this.sub.notify<RetryFileReply>({
       action: "retryFileReply",
       handler: Subscription.getPeerConnectionId(connId, webRtcOpponentId),
+      data: null,
     });
   }
 
@@ -196,24 +217,30 @@ export default class WebRtcApi extends MessageHandler {
   }
 
   public answerCall(connId: string) {
-    this.sub.notify({
+    const message: AnswerCallMessage = {
       action: "answerCall",
       handler: Subscription.getTransferId(connId),
-    });
+      data: null,
+    };
+    this.sub.notify(message);
   }
 
   public declineCall(connId: string) {
-    this.sub.notify({
+    const message: DeclineCallMessage = {
       action: "declineCall",
       handler: Subscription.getTransferId(connId),
-    });
+      data: null,
+    };
+    this.sub.notify(message);
   }
 
   public videoAnswerCall(connId: string) {
-    this.sub.notify({
+    const m: VideoAnswerCallMessage = {
       action: "videoAnswerCall",
       handler: Subscription.getTransferId(connId),
-    });
+      data: null,
+    };
+    this.sub.notify(m);
   }
 
   public hangCall(roomId: number) {
@@ -232,7 +259,8 @@ export default class WebRtcApi extends MessageHandler {
     this.callHandlers[roomId].toggleDevice(videoType);
   }
 
-  public logout(m: LogoutMessage) {
+  @Subscribe<LogoutMessage>()
+  public logout() {
     for (const k in this.callHandlers) {
       this.callHandlers[k].hangCall();
     }
@@ -241,8 +269,9 @@ export default class WebRtcApi extends MessageHandler {
     }
   }
 
-  public offerFile(message: OfferFile): void {
-    const limitExceeded = message.content.size > MAX_ACCEPT_FILE_SIZE_WO_FS_API && !requestFileSystem;
+  @Subscribe<OfferFileMessage>()
+  public offerFile(message: OfferFileBody): void {
+    const limitExceeded = message.size > MAX_ACCEPT_FILE_SIZE_WO_FS_API && !requestFileSystem;
     const payload: ReceivingFile = {
       roomId: message.roomId,
       opponentWsId: message.opponentWsId,
@@ -252,15 +281,15 @@ export default class WebRtcApi extends MessageHandler {
       userId: message.userId,
       error: limitExceeded ? `Your browser doesn't support receiving files over ${bytesToSize(MAX_ACCEPT_FILE_SIZE_WO_FS_API)}` : null,
       connId: message.connId,
-      fileName: message.content.name,
+      fileName: message.name,
       time: this.wsHandler.convertServerTimeToPC(message.time),
       upload: {
         uploaded: 0,
-        total: message.content.size,
+        total: message.size,
       },
     };
     this.notifier.showNotification(this.store.allUsersDict[message.userId].username, {
-      body: `Sends file ${message.content.name}`,
+      body: `Sends file ${message.name}`,
       requireInteraction: true,
       icon: resolveMediaUrl(this.store.allUsersDict[message.userId].thumbnail) || faviconUrl,
       replaced: 1,
@@ -271,11 +300,11 @@ export default class WebRtcApi extends MessageHandler {
     }
     this.wsHandler.replyFile(message.connId, browserVersion);
     if (!limitExceeded) {
-      new FileReceiverPeerConnection(message.roomId, message.connId, message.opponentWsId, this.wsHandler, this.store, message.content.size, this.sub);
+      new FileReceiverPeerConnection(message.roomId, message.connId, message.opponentWsId, this.wsHandler, this.store, message.size, this.sub);
     }
   }
 
-  private updateCallTransfer(m: ChangeP2pRoomInfoMessage) {
+  private updateCallTransfer(m: ChangeP2pRoomInfoMessageBody) {
     if (m.changeType === "someone_joined" || m.changeType === "someone_left") {
       this.store.roomsArray.filter((r) => r.callInfo.callActive && r.users.includes(m.userId!)).forEach((r) => {
         if (m.changeType === "someone_joined") {
@@ -302,7 +331,7 @@ export default class WebRtcApi extends MessageHandler {
     }
   }
 
-  private async updateMessagesTransfer(m: ChangeP2pRoomInfoMessage) {
+  private async updateMessagesTransfer(m: ChangeP2pRoomInfoMessageBody) {
     if (m.changeType === "i_deleted") { // Destroy my room
       const mh: MessageTransferHandler = this.messageHandlers[m.roomId];
       if (mh) {
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 0ea02692d..a949aae44 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,8 +1,16 @@
 import type {CallStatus} from "@common/model/webrtc.base";
 import type {AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import type {ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
+import {ReplyCallBody} from "@common/ws/message/webrtc-transfer/reply.call";
+import type {
+  ReplyCallMessage,
+} from "@common/ws/message/webrtc-transfer/reply.call";
 import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
-import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {
+  CheckTransferDestroyBody,
+} from "@/ts/types/messages/inner/check.transfer.destroy";
+import type {
+  CheckTransferDestroyMessage,
+} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import type {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
 import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
@@ -26,18 +34,18 @@ import CallReceiverPeerConnection from "@/ts/webrtc/call/CallReceiverPeerConnect
 
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
 import {stopVideo} from "@/ts/utils/htmlApi";
+import {Subscribe} from "@/ts/utils/pubsub";
+import type {AnswerCallMessage} from "@/ts/types/messages/inner/answer.call";
+import type {VideoAnswerCallMessage} from "@/ts/types/messages/inner/video.answer.call";
+import type {DeclineCallMessage} from "@/ts/types/messages/inner/decline.call";
+import type {OfferCallBody} from "@common/ws/message/webrtc/offer.call";
+import {
+  OfferCallMessage,
+} from "@common/ws/message/webrtc/offer.call";
+import {AcceptCallBody} from "@common/ws/message/webrtc-transfer/accept.call";
 
 
 export default class CallHandler extends FileAndCallTransfer {
-  protected readonly handlers: HandlerTypes<keyof CallHandler, "webrtcTransfer:*", any> = {
-    answerCall: this.answerCall,
-    videoAnswerCall: this.videoAnswerCall,
-    declineCall: this.declineCall,
-    replyCall: <HandlerType<"replyCall", "webrtcTransfer:*", any>> this.replyCall,
-    acceptCall: <HandlerType<"acceptCall", "webrtcTransfer:*", any>> this.acceptCall,
-    checkTransferDestroy: <HandlerType<"checkTransferDestroy", "webrtcTransfer:*", any>> this.checkTransferDestroy,
-  };
-
   private canvas: HTMLCanvasElement | null = null;
 
   private localStream: MediaStream | null = null;
@@ -52,7 +60,8 @@ export default class CallHandler extends FileAndCallTransfer {
     return this.store.roomsDict[this.roomId].callInfo;
   }
 
-  public checkTransferDestroy(payload: CheckTransferDestroyMessage) {
+  @Subscribe<CheckTransferDestroyMessage>()
+  public checkTransferDestroy(payload: CheckTransferDestroyBody) {
     this.removeOpponent(payload.wsOpponentId);
     super.checkTransferDestroy(payload);
   }
@@ -90,7 +99,8 @@ export default class CallHandler extends FileAndCallTransfer {
     return this.connectionId;
   }
 
-  public acceptCall(message: AcceptCallMessage["data"]) {
+  @Subscribe<AcceptCallMessage>()
+  public acceptCall(message: AcceptCallBody) {
     if (this.callStatus !== "received_offer") { // If we're call initiator
       if (!this.connectionId) {
         throw Error("Conn is is null");
@@ -212,7 +222,9 @@ export default class CallHandler extends FileAndCallTransfer {
         handler: Subscription.allPeerConnectionsForTransfer(this.connectionId!),
         action: "streamChanged",
         allowZeroSubscribers: true,
-        newStream: stream!,
+        data: {
+          newStream: stream!,
+        },
       };
       this.sub.notify(message);
     } catch (e: any) {
@@ -350,11 +362,12 @@ export default class CallHandler extends FileAndCallTransfer {
     }
   }
 
-  public replyCall(message: ReplyCallMessage) {
+  @Subscribe<ReplyCallMessage>()
+  public replyCall(message: ReplyCallBody) {
     this.createCallPeerConnection(message);
   }
 
-  public initAndDisplayOffer(message: OfferCall) {
+  public initAndDisplayOffer(message: OfferCallBody) {
     this.setCallStatus("received_offer");
     if (this.connectionId) {
       this.logger.error("Old connId still exists {}", this.connectionId)();
@@ -372,6 +385,7 @@ export default class CallHandler extends FileAndCallTransfer {
     this.createCallPeerConnection(message);
   }
 
+  @Subscribe<AnswerCallMessage>()
   public answerCall() {
     this.doAnswer(false);
   }
@@ -396,12 +410,13 @@ export default class CallHandler extends FileAndCallTransfer {
     this.attachLocalStream(stream);
     this.wsHandler.acceptCall(this.connectionId!);
     this.connectToRemote();
-    const message1: RouterNavigateMessage = {
+    this.sub.notify<RouterNavigateMessage>({
       handler: "router",
       action: "navigate",
-      to: `/chat/${this.roomId}`,
-    };
-    this.sub.notify(message1);
+      data: {
+        to: `/chat/${this.roomId}`,
+      },
+    });
   }
 
   public async joinCall() {
@@ -420,6 +435,7 @@ export default class CallHandler extends FileAndCallTransfer {
     this.connectToRemote();
   }
 
+  @Subscribe<VideoAnswerCallMessage>()
   public videoAnswerCall() {
     this.doAnswer(true);
   }
@@ -455,6 +471,7 @@ export default class CallHandler extends FileAndCallTransfer {
     this.acceptedPeers.length = 0; // = []
   }
 
+  @Subscribe<DeclineCallMessage>()
   public declineCall() {
     this.store.setIncomingCall(null);
     this.wsHandler.destroyCallConnection(this.connectionId!, "decline");
@@ -474,12 +491,12 @@ export default class CallHandler extends FileAndCallTransfer {
         this.logger.error("Can't close connections since it's null")();
         return;
       }
-      const message: DestroyPeerConnectionMessage = {
+      this.sub.notify<DestroyPeerConnectionMessage>({
         action: "destroy",
         handler: Subscription.allPeerConnectionsForTransfer(this.connectionId),
         allowZeroSubscribers: true,
-      };
-      this.sub.notify(message);
+        data: null,
+      });
     } else {
       this.onDestroy();
     }
@@ -501,12 +518,13 @@ export default class CallHandler extends FileAndCallTransfer {
 
   private connectToRemote() {
     this.acceptedPeers.forEach((e) => {
-      const message: ConnectToRemoteMessage = {
+      this.sub.notify<ConnectToRemoteMessage>({
         action: "connectToRemote",
-        stream: this.localStream,
+        data: {
+          stream: this.localStream,
+        },
         handler: Subscription.getPeerConnectionId(this.connectionId!, e),
-      };
-      this.sub.notify(message);
+      });
     });
   }
 
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 677b873e3..71959a4df 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -1,10 +1,15 @@
 import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import type {DestroyPeerConnectionMessage} from "@/ts/types/messages/inner/destroy.peer.connection";
-import type {DestroyCallConnection} from "@common/legacy";
+
 import {createMicrophoneLevelVoice, getAverageAudioLevel, removeAudioProcesssor} from "@/ts/utils/audioprocc";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
-import type {JsAudioAnalyzer, SetCallOpponent, SetOpponentAnchor, SetOpponentVoice} from "@/ts/types/types";
+import type {
+  JsAudioAnalyzer,
+  SetCallOpponent,
+  SetOpponentAnchor,
+  SetOpponentVoice
+} from "@/ts/types/types";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
@@ -12,11 +17,16 @@ import {getStreamLog, getTrackLog} from "@/ts/utils/pureFunctions";
 import type {CallInfoModel, RoomModel} from "@/ts/types/model";
 import {stopVideo} from "@/ts/utils/htmlApi";
 import type Subscription from "@/ts/classes/Subscription";
+import {ConnectToRemoteMessageBody} from "@/ts/types/messages/inner/connect.to.remote";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {DestroyCallConnectionWsInMessage} from "@common/ws/message/peer-connection/destroy.call.connection";
 
 
 export default abstract class CallPeerConnection extends AbstractPeerConnection {
   protected readonly handlers: HandlerTypes<keyof CallPeerConnection, "peerConnection:*"> = {
-    destroy: <HandlerType<"destroy", "peerConnection:*">> this.destroy,
+    destroy: <HandlerType<"destroy", DestroyPeerConnectionMessage>> this.destroy,
+    login: <HandlerType<"login", LoginMessage>> this.login,
     streamChanged: <HandlerType<"streamChanged", "peerConnection:*">> this.streamChanged,
     connectToRemote: <HandlerType<"connectToRemote", "peerConnection:*">> this.connectToRemote,
     sendRtcData: <HandlerType<"sendRtcData", "peerConnection:*">> this.sendRtcData,
@@ -196,11 +206,13 @@ export default abstract class CallPeerConnection extends AbstractPeerConnection
     };
   }
 
-  public destroy(message: DestroyPeerConnectionMessage) { // Called by transfer
+  @Subscribe<DestroyPeerConnectionMessage>()
+  public destroy() { // Called by transfer
     this.unsubscribeAndRemoveFromParent();
   }
 
-  destroyCallConnection(m: DestroyCallConnection) { // Called by opponent devices via ws
+  @Subscribe<DestroyCallConnectionWsInMessage>()
+  public destroyCallConnection() {
     this.unsubscribeAndRemoveFromParent();
   }
 
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index a6a95a014..7179e3026 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -9,6 +9,9 @@ import {READ_CHUNK_SIZE, SEND_CHUNK_SIZE} from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {AcceptFileBody} from "@common/ws/message/webrtc-transfer/accept.file";
+import {DestroyFileConnectionBody} from "@common/ws/message/peer-connection/destroy.file.connection";
 
 
 export default class FileSenderPeerConnection extends FilePeerConnection {
@@ -71,8 +74,9 @@ export default class FileSenderPeerConnection extends FilePeerConnection {
     }
   }
 
-  public acceptFile(message: AcceptFileMessage) {
-    this.offset = message.content.received;
+  @Subscribe<AcceptFileMessage>()
+  public acceptFile(message: AcceptFileBody) {
+    this.offset = message.received;
     this.createPeerConnection();
     const ssfs: SetSendingFileStatus = {
       status: FileTransferStatus.IN_PROGRESS,
@@ -82,7 +86,7 @@ export default class FileSenderPeerConnection extends FilePeerConnection {
       transfer: this.opponentWsId,
     };
     this.store.setSendingFileStatus(ssfs);
-    this.setTranseferdAmount(message.content.received);
+    this.setTranseferdAmount(message.received);
     try {
       // Reliable data channels not supported by Chrome
       this.sendChannel = this.pc!.createDataChannel("sendDataChannel", {reliable: false});
@@ -144,13 +148,14 @@ export default class FileSenderPeerConnection extends FilePeerConnection {
     }
   }
 
-  public destroyFileConnection(message: DestroyFileConnectionMessage) {
+  @Subscribe<DestroyFileConnectionMessage>()
+  public destroyFileConnection(message: DestroyFileConnectionBody) {
     let isError = false;
     let status;
-    if (message.content === "decline") {
+    if (message.status === "decline") {
       status = FileTransferStatus.DECLINED_BY_OPPONENT;
       this.unsubscribeAndRemoveFromParent();
-    } else if (message.content === "success") {
+    } else if (message.status === "success") {
       status = FileTransferStatus.FINISHED;
       this.unsubscribeAndRemoveFromParent();
     } else {
@@ -160,7 +165,7 @@ export default class FileSenderPeerConnection extends FilePeerConnection {
     const payload: SetSendingFileStatus = {
       transfer: this.opponentWsId,
       connId: this.connectionId,
-      error: isError ? message.content : null,
+      error: isError ? message.status : null,
       roomId: this.roomId,
       status,
     };
diff --git a/frontend/src/vue/auth/ApplyResetPassword.vue b/frontend/src/vue/auth/ApplyResetPassword.vue
index 449863f11..2608cf91e 100644
--- a/frontend/src/vue/auth/ApplyResetPassword.vue
+++ b/frontend/src/vue/auth/ApplyResetPassword.vue
@@ -43,7 +43,7 @@
 import {Component, Vue} from "vue-property-decorator";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
-import type {LoginMessage} from "@/ts/types/messages/innerMessages";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
 
 @Component({
   name: "ApplyResetPassword",
@@ -88,7 +88,9 @@ export default class ApplyResetPassword extends Vue {
       const message: LoginMessage = {
         action: "login",
         handler: "router",
-        session,
+        data: {
+          session,
+        },
       };
       this.$messageBus.notify(message);
     }
diff --git a/frontend/src/vue/auth/AuthPage.vue b/frontend/src/vue/auth/AuthPage.vue
index 15b009893..92674e423 100644
--- a/frontend/src/vue/auth/AuthPage.vue
+++ b/frontend/src/vue/auth/AuthPage.vue
@@ -17,7 +17,7 @@
 import {Component, Vue} from "vue-property-decorator";
 import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
 import {AUTO_REGISTRATION} from "@/ts/utils/consts";
-import type {LoginMessage} from "@/ts/types/messages/innerMessages";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
 
 @Component({name: "AuthPage"})
 export default class AuthPage extends Vue {
@@ -39,7 +39,9 @@ export default class AuthPage extends Vue {
       const message: LoginMessage = {
         action: "login",
         handler: "router",
-        session,
+        data: {
+          session,
+        },
       };
       this.$messageBus.notify(message);
     }
diff --git a/frontend/src/vue/auth/SignIn.vue b/frontend/src/vue/auth/SignIn.vue
index f229c9f03..6e949279a 100644
--- a/frontend/src/vue/auth/SignIn.vue
+++ b/frontend/src/vue/auth/SignIn.vue
@@ -52,8 +52,8 @@ import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import {ApplyGrowlErr} from "@/ts/instances/storeInstance";
 
 import CaptchaComponent from "@/vue/auth/CaptchaComponent.vue";
-import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import SocialAuthSignUp from "@/vue/auth/SocialAuthSignUp.vue";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
 
 @Component({
   name: "SignIn",
diff --git a/frontend/src/vue/auth/SocialAuthSignUp.vue b/frontend/src/vue/auth/SocialAuthSignUp.vue
index 094139dce..6311227d3 100644
--- a/frontend/src/vue/auth/SocialAuthSignUp.vue
+++ b/frontend/src/vue/auth/SocialAuthSignUp.vue
@@ -10,11 +10,10 @@ import type {OauthSessionResponse} from "@common/model/http.base";
 
 
 import {Component, Vue} from "vue-property-decorator";
-import type {LoginMessage} from "@/ts/types/messages/innerMessages";
 import FacebookAuth from "@/vue/auth/FacebookAuth.vue";
 import GoogleAuth from "@/vue/auth/GoogleAuth.vue";
 import {FACEBOOK_APP_ID, GOOGLE_OAUTH_2_CLIENT_ID} from "@/ts/utils/consts";
-import type {OauthSessionResponse} from "@common/helpers";
+import {LoginMessage} from "@/ts/types/messages/inner/login";
 
 
 @Component({
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 093d9d1d4..9f78ff3a8 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -113,7 +113,8 @@ import ChatThread from "@/vue/chat/message/ChatThread.vue";
 import ChatTextArea from "@/vue/chat/textarea/ChatTextArea.vue";
 import ChatShowUserTyping from "@/vue/chat/chatbox/ChatShowUserTyping.vue";
 import {isMobile} from "@/ts/utils/runtimeConsts";
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
+import type MessageHandler from "@/ts/message_handlers/MesageHandler";
+import {Subscribe} from "@/ts/utils/pubsub";
 
 
 @Component({
@@ -274,24 +275,17 @@ export default class ChatBox extends Vue {
     }
   }
 
-  created() {
-    const that = this;
-    this.handler = new class ChatBoxHandler extends MessageHandler {
-      logger = that.$logger;
-
-      protected readonly handlers: HandlerTypes<keyof ChatBoxHandler, "*"> = {
-        scroll: <HandlerType<"scroll", "*">> this.scroll,
-      };
+  @Subscribe<any>() // TODO does this work?
+  scroll() {
+    this.onEmitScroll();
+  }
 
-      scroll() {
-        that.onEmitScroll();
-      }
-    }();
-    this.$messageBus.subscribe("*", this.handler);
+  created() {
+    this.$messageBus.subscribe("*", this.scroll);
   }
 
   destroyed() {
-    this.$messageBus.unsubscribe("*", this.handler);
+    this.$messageBus.unsubscribe("*", this.scroll);
   }
 
   keyDownLoadUp(e: KeyboardEvent) {
diff --git a/frontend/src/vue/pages/ChannelSettings.vue b/frontend/src/vue/pages/ChannelSettings.vue
index b883c3795..c4798933c 100644
--- a/frontend/src/vue/pages/ChannelSettings.vue
+++ b/frontend/src/vue/pages/ChannelSettings.vue
@@ -110,9 +110,9 @@ import {ChannelsDictUIModel, CurrentUserInfoModel} from "@/ts/types/model";
 import {ApplyGrowlErr, State} from "@/ts/instances/storeInstance";
 import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
-import type {RouterNavigateMessage} from "@/ts/types/messages/innerMessages";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
+import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
 
 @Component({
   name: "ChannelSettings",
diff --git a/frontend/src/vue/pages/UserProfileInfo.vue b/frontend/src/vue/pages/UserProfileInfo.vue
index 7d3c49db0..66069d7ca 100644
--- a/frontend/src/vue/pages/UserProfileInfo.vue
+++ b/frontend/src/vue/pages/UserProfileInfo.vue
@@ -124,7 +124,7 @@ import {CurrentUserInfoModel} from "@/ts/types/model";
 
 import {currentUserInfoModelToDto} from "@/ts/types/converters";
 import AppInputDate from "@/vue/ui/AppInputDate.vue";
-import type {LogoutMessage} from "@/ts/types/messages/innerMessages";
+import {LogoutMessage} from "@/ts/types/messages/inner/logout";
 
 
 @Component({
@@ -165,6 +165,7 @@ export default class UserProfileInfo extends Vue {
     const message: LogoutMessage = {
       action: "logout",
       handler: "*",
+      data: null,
     };
     this.$messageBus.notify(message);
   }
diff --git a/frontend/src/vue/ui/AppSeparator.vue b/frontend/src/vue/ui/AppSeparator.vue
index 33aade940..0cf2bd844 100644
--- a/frontend/src/vue/ui/AppSeparator.vue
+++ b/frontend/src/vue/ui/AppSeparator.vue
@@ -5,118 +5,12 @@
     </legend>
   </fieldset>
 </template>
-import {FaceBookSignInRequest, FacebookSignInResponse} from "@common/http/auth/facebook.sign.in";
-import {GoogleSignInRequest, GoogleSignInResponse} from "@common/http/auth/google.sign.in";
-import {SignInRequest, SignInResponse} from "@common/http/auth/sign.in";
-import {SignUpRequest, SignUpResponse} from "@common/http/auth/sign.up";
-import {ValidateUserRequest, ValidateUserResponse} from "@common/http/auth/validate.user";
-import {ValidateEmailResponse, ValidateUserEmailRequest} from "@common/http/auth/validte.email";
-import {SaveFileRequest, SaveFileResponse} from "@common/http/file/save.file";
-import {AcceptTokenRequest, AcceptTokenResponse} from "@common/http/verify/accept.token";
-import {ConfirmEmailRequest, ConfirmEmailResponse} from "@common/http/verify/confirm.email";
-import {SendRestorePasswordRequest, SendRestorePasswordResponse} from "@common/http/verify/send.restore.password";
-import {VerifyTokenRequest, VerifyTokenResponse} from "@common/http/verify/verify.token";
-import {ChannelDto} from "@common/model/dto/channel.dto";
-import {FileModelDto} from "@common/model/dto/file.model.dto";
-import {GiphyDto} from "@common/model/dto/giphy.dto";
-import {LocationDto} from "@common/model/dto/location.dto";
-import {MessageModelDto} from "@common/model/dto/message.model.dto";
-import {RoomDto, RoomNoUsersDto} from "@common/model/dto/room.dto";
-import {UserDto} from "@common/model/dto/user.dto";
-import {UserProfileDto, UserProfileDtoWoImage} from "@common/model/dto/user.profile.dto";
-import {UserSettingsDto} from "@common/model/dto/user.settings.dto";
-import {Gender} from "@common/model/enum/gender";
-import {ImageType} from "@common/model/enum/image.type";
-import {MessageStatus} from "@common/model/enum/message.status";
-import {Theme} from "@common/model/enum/theme";
-import {VerificationType} from "@common/model/enum/verification.type";
-import {CaptchaRequest, OauthSessionResponse, OkResponse, SessionResponse} from "@common/model/http.base";
-import {BrowserBase, CallStatus, OpponentWsId, ReplyWebRtc, WebRtcDefaultMessage} from "@common/model/webrtc.base";
+<script lang="ts">
 import {
-  AddRoomBase, ChangeDeviceType, ChangeOnlineType,
-  ChangeUserOnlineBase,
-  MessagesResponseMessage,
-  NewRoom,
-  RoomExistedBefore
-} from "@common/model/ws.base";
-import {
-  DestroyCallConnectionBody,
-  DestroyCallConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.call.connection";
-import {
-  DestroyFileConnectionBody,
-  DestroyFileConnectionMessage
-} from "@common/ws/message/peer-connection/destroy.file.connection";
-import {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
-import {SendRtcDataBody, SendRtcDataMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {AddChannelBody, AddChannelMessage} from "@common/ws/message/room/add.channel";
-import {AddInviteBody, AddInviteMessage} from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBodyMessage, AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
-import {AddRoomBody, AddRoomMessage} from "@common/ws/message/room/add.room";
-import {CreateNewUsedMessage, CreateNewUserBody} from "@common/ws/message/room/create.new.user";
-import {DeleteChannelBody, DeleteChannelMessage} from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody, DeleteRoomMessage} from "@common/ws/message/room/delete.room";
-import {InviteUserBody, InviteUserMessage} from "@common/ws/message/room/invite.user";
-import {LeaveUserBody, LeaveUserMessage} from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody, RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody, SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
-import {SaveRoomSettingsBody, SaveRoomSettingsMessage} from "@common/ws/message/room/save.room.settings";
-import {
-  ShowITypeWsInBody,
-  ShowITypeWsInMessage,
-  ShowITypeWsOutBody,
-  ShowITypeWsOutMessage
-} from "@common/ws/message/room/show.i.type";
-import {WebRtcSetConnectionIdBody, WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
-import {NotifyCallActiveBody, NotifyCallActiveMessage} from "@common/ws/message/webrtc/notify.call.active";
-import {OfferCallBody, OfferCallMessage} from "@common/ws/message/webrtc/offer.call";
-import {OfferFileBody, OfferFileContent, OfferFileMessage} from "@common/ws/message/webrtc/offer.file";
-import {OfferBody, OfferMessage} from "@common/ws/message/webrtc/offer.message";
-import {AcceptCallBody, AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {AcceptFileBody, AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
-import {ReplyCallBody, ReplyCallMessage} from "@common/ws/message/webrtc-transfer/reply.call";
-import {ReplyFileBody, ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
-import {PingBody, PingMessage} from "@common/ws/message/ws/ping";
-import {PongBody, PongMessage} from "@common/ws/message/ws/pong";
-import {SetProfileImageBody, SetProfileImageMessage} from "@common/ws/message/ws/set.profile.image";
-import {SetSettingBody, SetSettingsMessage} from "@common/ws/message/ws/set.settings";
-import {SetUserProfileBody, SetUserProfileMessage} from "@common/ws/message/ws/set.user.profile";
-import {SetWsIdWsOutBody, SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody, UserProfileChangedMessage} from "@common/ws/message/ws/user.profile.changed";
-import {DeleteMessage, DeleteMessageBody} from "@common/ws/message/ws-message/delete.message";
-import {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutBody,
-  PrintMessageWsOutMessage
-} from "@common/ws/message/ws-message/print.message";
-import {
-  GetCountryCodeWsInBody, GetCountryCodeWsInMessage,
-  GetCountryCodeWsOutBody,
-  GetCountryCodeWsOutMessage
-} from "@common/ws/message/get.country.code";
-import {GrowlWsInBody, GrowlWsInMessage} from "@common/ws/message/growl.message";
-import {
-  SetMessageStatusWsInBody, SetMessageStatusWsInMessage,
-  SetMessageStatusWsOutBody,
-  SetMessageStatusWsOutMessage
-} from "@common/ws/message/set.message.status";
-import {
-  SyncHistoryWsInBody,
-  SyncHistoryWsInMessage,
-  SyncHistoryWsOutBody,
-  SyncHistoryWsOutMessage
-} from "@common/ws/message/sync.history";
-import {
-  DefaultWsInMessage,
-  DefaultWsOutMessage,
-  HandlerName,
-  RequestWsOutMessage,
-  ResponseWsInMessage
-} from "@common/ws/common";
-import {ALL_ROOM_ID, MAX_USERNAME_LENGTH, WS_SESSION_EXPIRED_CODE} from "@common/consts";
-
-
-import {Component, Prop, Vue} from "vue-property-decorator";
+  Component,
+  Prop,
+  Vue,
+} from "vue-property-decorator";
 
 @Component({name: "AppSeparator"})
 export default class AppSeparator extends Vue {
diff --git a/newback/src/data/transformers/out.message/add.online.user.transformer.ts b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
index 8b5b9a104..03665ad20 100644
--- a/newback/src/data/transformers/out.message/add.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
@@ -1,5 +1,5 @@
 import type {UserModel} from "@/data/model/user.model";
-import type {AddOnlineUserMessage} from "@common/ws/message/add.online.user";
+import type {AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
 
 export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
   return {
diff --git a/newback/src/data/transformers/out.message/inner.transformer.ts b/newback/src/data/transformers/out.message/inner.transformer.ts
index a1bdd9905..a4ec8bd02 100644
--- a/newback/src/data/transformers/out.message/inner.transformer.ts
+++ b/newback/src/data/transformers/out.message/inner.transformer.ts
@@ -1,6 +1,6 @@
 import {ImageType} from '@common/model/enum/image.type';
 import {GiphyDto} from '@common/model/dto/giphy.dto';
-import {PrintMessageWsOutMessage} from '@common/ws/message/print.message';
+import {PrintMessageWsOutMessage} from '@common/ws/message/ws-message/print.message';
 import type {UploadedFileModel} from "@/data/model/uploaded.file.model";
 import type {ImageModel} from "@/data/model/image.model";
 import type {MessageMentionModel} from "@/data/model/message.mention.model";
diff --git a/newback/src/data/transformers/out.message/print.message.transformer.ts b/newback/src/data/transformers/out.message/print.message.transformer.ts
index f3121b8a9..95ef5366e 100644
--- a/newback/src/data/transformers/out.message/print.message.transformer.ts
+++ b/newback/src/data/transformers/out.message/print.message.transformer.ts
@@ -1,4 +1,4 @@
-import {PrintMessageWsInMessage} from '@common/ws/message/print.message';
+import type {PrintMessageWsInMessage} from '@common/ws/message/ws-message/print.message';
 import type {ImageModel} from "@/data/model/image.model";
 import type {
   CreateModel,
diff --git a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
index 116e6b506..c8e9ae241 100644
--- a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
@@ -1,7 +1,7 @@
 import type {
   UserOnlineData,
 } from "@/data/types/internal";
-import type {RemoveOnlineUserMessage} from "@common/legacy";
+import type {RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
 import {WebSocketContextData} from "@/data/types/patch";
 
 
diff --git a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
index fd20c91f9..4aba318e7 100644
--- a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
+++ b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
@@ -7,7 +7,7 @@ import {
   getRoomsOnline,
   getTransformRoomDto,
 } from "@/data/transformers/model/room.transformer";
-import type {SetWsIdWsOutMessage} from "@common/ws/message/set.ws.id";
+import type {SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
 
 
 export function transformSetWsId(
diff --git a/newback/src/modules/api/websocket/message.service.ts b/newback/src/modules/api/websocket/message.service.ts
index d4f57c62a..3bb42ac47 100644
--- a/newback/src/modules/api/websocket/message.service.ts
+++ b/newback/src/modules/api/websocket/message.service.ts
@@ -4,9 +4,9 @@ import type {SyncHistoryWsOutBody} from "@common/ws/message/sync.history";
 import type {
   ShowITypeWsInMessage,
   ShowITypeWsOutBody,
-} from "@common/ws/message/show.i.type";
+} from "@common/ws/message/room/show.i.type";
 
-import type {PrintMessageWsOutBody} from "@common/ws/message/print.message";
+import type {PrintMessageWsOutBody} from "@common/ws/message/ws-message/print.message";
 import {
   Injectable,
   Logger,
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index 451606e76..d69051ea8 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -1,13 +1,9 @@
+import type {SyncHistoryWsInBody} from "@common/ws/message/sync.history";
 import {SyncHistoryWsOutBody} from "@common/ws/message/sync.history";
-import type {SyncHistoryWsInMessage, SyncHistoryWsInBody} from "@common/ws/message/sync.history";
-import {ShowITypeWsOutBody} from "@common/ws/message/show.i.type";
-import {PrintMessageWsOutBody} from "@common/ws/message/print.message";
-import {
-  GetCountryCodeWsOutBody,
-} from "@common/ws/message/get.country.code";
-import type {
-  GetCountryCodeWsInMessage,
-} from "@common/ws/message/get.country.code";
+import {ShowITypeWsOutBody} from "@common/ws/message/room/show.i.type";
+import {PrintMessageWsOutBody} from "@common/ws/message/ws-message/print.message";
+import type {GetCountryCodeWsInMessage,} from "@common/ws/message/get.country.code";
+import {GetCountryCodeWsOutBody,} from "@common/ws/message/get.country.code";
 import type {OnGatewayConnection} from "@nestjs/websockets";
 import {
   MessageBody,
@@ -16,13 +12,9 @@ import {
   WebSocketServer,
 } from "@nestjs/websockets";
 import {IncomingMessage} from "http";
-import {
-  WebSocket,
-} from "ws";
+import {WebSocket,} from "ws";
 import type {OnWsClose} from "@/data/types/internal";
-import {
-  SendToClientPubSubMessage,
-} from "@/data/types/internal";
+import {SendToClientPubSubMessage,} from "@/data/types/internal";
 import {
   Logger,
   UseFilters,
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index 0396841fb..c09961e89 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -13,7 +13,7 @@ import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import {transformSetWsId} from "@/data/transformers/out.message/set.ws.id.transformer";
 import {transformAddUserOnline} from "@/data/transformers/out.message/add.online.user.transformer";
 import {getLogoutMessage} from "@/data/transformers/out.message/remove.online.user.transformer";
-import type {AddOnlineUserMessage} from "@common/ws/message/add.online.user";
+import type {AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
 import type {WebSocketContextData} from "@/data/types/patch";
 
 

From 5a1193fbafd687783528eeec69074b2dc6e66fcc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 21 May 2022 16:50:53 +0300
Subject: [PATCH 126/221] save changes

---
 common/src/ws/common.ts                       | 22 +++++++++----------
 .../destroy.file.connection.ts                |  4 ++--
 .../message/peer-connection/send.rtc.data.ts  | 10 +++++++--
 frontend/src/ts/instances/routerInstance.ts   |  4 ++--
 .../ts/message_handlers/WsMessageHandler.ts   | 10 ++++-----
 frontend/src/ts/utils/pubsub.ts               | 14 +-----------
 .../src/ts/webrtc/AbstractPeerConnection.ts   |  1 -
 .../file/FileReceiveerPeerConnection.ts       |  4 ++--
 .../webrtc/file/FileSenderPeerConnection.ts   |  8 +++----
 9 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/common/src/ws/common.ts b/common/src/ws/common.ts
index 75d226309..ea3cc03d4 100644
--- a/common/src/ws/common.ts
+++ b/common/src/ws/common.ts
@@ -5,25 +5,25 @@ export interface DefaultWsInMessage<A extends string, H extends HandlerName, D>
   handler: H;
 }
 
-// if sendToServerAndAwait it used
-export interface ResponseWsInMessage <D> {
+export interface DefaultWsOutMessage<A extends string, D> {
   data: D;
-  cbBySender: string;
-  cbId: number;
+  action: A;
 }
 
-// if sendToServerAndAwait used but also other clients of this user should receive this message
-export interface MultiResponseMessage <A extends string, H extends HandlerName, D> extends ResponseWsInMessage<D>, DefaultWsInMessage<A,H,D> {
-
+export interface RequestWsOutMessage<A extends string, D> extends DefaultWsOutMessage<A, D> {
+  cbId: number;
 }
 
-export interface DefaultWsOutMessage<A extends string, D> {
+// If sendToServerAndAwait it used
+export interface ResponseWsInMessage <D> {
   data: D;
-  action: A;
+  cbBySender: string;
+  cbId: number;
 }
 
-export interface RequestWsOutMessage<A extends string, D> extends DefaultWsOutMessage<A, D> {
-  cbId: number;
+// If sendToServerAndAwait used but also other clients of this user should receive this message
+export interface MultiResponseMessage <A extends string, H extends HandlerName, D> extends ResponseWsInMessage<D>, DefaultWsInMessage<A, H, D> {
+
 }
 
 
diff --git a/common/src/ws/message/peer-connection/destroy.file.connection.ts b/common/src/ws/message/peer-connection/destroy.file.connection.ts
index da2e175bc..e23519cbf 100644
--- a/common/src/ws/message/peer-connection/destroy.file.connection.ts
+++ b/common/src/ws/message/peer-connection/destroy.file.connection.ts
@@ -1,8 +1,8 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 
 
-export interface DestroyFileConnectionBody {
+export interface DestroyFileConnectionWsInBody {
   status: "decline" | "success";
 }
 
-export type DestroyFileConnectionMessage = DefaultWsInMessage<"destroyFileConnection", "peerConnection:*", DestroyFileConnectionBody>;
+export type DestroyFileConnectionWsInMessage = DefaultWsInMessage<"destroyFileConnection", "peerConnection:*", DestroyFileConnectionWsInBody>;
diff --git a/common/src/ws/message/peer-connection/send.rtc.data.ts b/common/src/ws/message/peer-connection/send.rtc.data.ts
index b4e5467c1..04bf16c12 100644
--- a/common/src/ws/message/peer-connection/send.rtc.data.ts
+++ b/common/src/ws/message/peer-connection/send.rtc.data.ts
@@ -1,4 +1,7 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
+import type {
+  DefaultWsInMessage,
+  DefaultWsOutMessage
+} from "@common/ws/common";
 import {
   OpponentWsId,
   WebRtcDefaultMessage
@@ -8,4 +11,7 @@ import {
 export interface SendRtcDataBody extends OpponentWsId, WebRtcDefaultMessage {
   content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
 }
-export type SendRtcDataMessage = DefaultWsInMessage<"sendRtcData", "peerConnection:*", SendRtcDataBody>;
+
+export type SendRtcDataWsInMessage = DefaultWsInMessage<"sendRtcData", "peerConnection:*", SendRtcDataBody>;
+
+export type SendRtcDataWsOutMessage = DefaultWsOutMessage<"sendRtcData", any>
diff --git a/frontend/src/ts/instances/routerInstance.ts b/frontend/src/ts/instances/routerInstance.ts
index 5cda0f889..9154726a3 100644
--- a/frontend/src/ts/instances/routerInstance.ts
+++ b/frontend/src/ts/instances/routerInstance.ts
@@ -187,7 +187,7 @@ export function routerFactory(sub: Subscription, sessionHolder: SessionHolder) {
     }
   });
 
-     class RouterProcessor {
+   class RouterProcessor {
     protected readonly logger: Logger = logger;
 
     @Subscribe<LogoutMessage>()
@@ -203,7 +203,7 @@ export function routerFactory(sub: Subscription, sessionHolder: SessionHolder) {
     }
 
     @Subscribe<LoginMessage>()
-    public  login(a: LoginMessageBody) {
+    public login(a: LoginMessageBody) {
       if (!a.session) {
         throw Error(`Invalid session ${a.session}`);
       }
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index baa6134f0..4b8cd7cfb 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -51,6 +51,11 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     setMessageStatus: <HandlerType<"setMessageStatus", "ws-message">> this.setMessageStatus,
   };
 
+  public async internetAppear(m: InternetAppearMessage) {
+    this.syncMessages(); // If message was edited, or changed by server
+    this.syncHistory(); // If some messages were sent during offline
+  }
+
   /*
    * MessageRetrier uses MessageModel.id as unique identifier, do NOT use it with any types but
    * Send message, delete message, edit message, as it will have the sameId which could erase some callback
@@ -354,11 +359,6 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     }
   }
 
-  public async internetAppear(m: InternetAppearMessage) {
-    this.syncMessages(); // If message was edited, or changed by server
-    this.syncHistory(); // If some messages were sent during offline
-  }
-
   public async setMessageStatus(m: SetMessageStatusWsInMessage) {
     this.store.setMessagesStatus({
       roomId: m.roomId,
diff --git a/frontend/src/ts/utils/pubsub.ts b/frontend/src/ts/utils/pubsub.ts
index c0c9636f5..b48caa69d 100644
--- a/frontend/src/ts/utils/pubsub.ts
+++ b/frontend/src/ts/utils/pubsub.ts
@@ -3,21 +3,9 @@ import {
   HandlerName
 } from "@common/ws/common";
 
-//
-// export type PureModel<T> = {
-//   [P in keyof Omit<T, "isNewRecord" | "version"> as T[P] extends Date | number[] | boolean | number | string | undefined ? P : never]: T[P]
-// };
-//
-// export type PickByType<T, Value> = {
-//   [P in keyof T as T[P] extends Value | undefined ? P : never]: T[P]
-// };
-//
-// <TCT extends (TCT[TPN] extends TPT[TPN] ? unknown : never), TPN extends (keyof TCT & keyof TPT)>
-
-
 
 export function Subscribe<K extends DefaultWsInMessage<A, H, D>, A extends string = string, H extends HandlerName = HandlerName, D extends any = any>() {
-  return (target: any, memberName: K['action'], propertyDescriptor: PropertyDescriptor) => {
+  return (target: any, memberName: K['action'], propertyDescriptor: TypedPropertyDescriptor<((firstParameter: K["data"]) => void)> | TypedPropertyDescriptor<(() => void)>) => {
     if (!target.__handlers) {
       target.__handlers = {}
     }
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index cc89f51a3..1b3a67696 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -2,7 +2,6 @@ import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import type {
   SendRtcDataBody,
-  SendRtcDataMessage
 } from "@common/ws/message/peer-connection/send.rtc.data";
 import type {HandlerName} from "@common/ws/common";
 import type {Logger} from "lines-logger";
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index 6afc4d9d5..95cba3ccc 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,4 +1,4 @@
-import type {DestroyFileConnectionMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
+import type {DestroyFileConnectionWsInMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
 import type {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
 import type {SetReceivingFileStatus, SetReceivingFileUploaded} from "@/ts/types/types";
 import type {ReceivingFile} from "@/ts/types/model";
@@ -83,7 +83,7 @@ export default class FileReceiverPeerConnection extends FilePeerConnection {
     this.waitForAnswer();
   }
 
-  public destroyFileConnection(message: DestroyFileConnectionMessage) {
+  public destroyFileConnection(message: DestroyFileConnectionWsInMessage) {
     const payload: SetReceivingFileStatus = {
       error: null,
       status: FileTransferStatus.DECLINED_BY_OPPONENT,
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 7179e3026..646fa0faf 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,4 +1,4 @@
-import type {DestroyFileConnectionMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
+import type {DestroyFileConnectionWsInMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
 import type {AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
 import type {AddSendingFileTransfer, SetSendingFileStatus, SetSendingFileUploaded} from "@/ts/types/types";
 import type {SendingFileTransfer} from "@/ts/types/model";
@@ -11,7 +11,7 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
 import {Subscribe} from "@/ts/utils/pubsub";
 import {AcceptFileBody} from "@common/ws/message/webrtc-transfer/accept.file";
-import {DestroyFileConnectionBody} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {DestroyFileConnectionWsInBody} from "@common/ws/message/peer-connection/destroy.file.connection";
 
 
 export default class FileSenderPeerConnection extends FilePeerConnection {
@@ -148,8 +148,8 @@ export default class FileSenderPeerConnection extends FilePeerConnection {
     }
   }
 
-  @Subscribe<DestroyFileConnectionMessage>()
-  public destroyFileConnection(message: DestroyFileConnectionBody) {
+  @Subscribe<DestroyFileConnectionWsInMessage>()
+  public destroyFileConnection(message: DestroyFileConnectionWsInBody) {
     let isError = false;
     let status;
     if (message.status === "decline") {

From 1aca8cc944933643d76702f2bcc19e060abe38ec Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Sat, 21 May 2022 17:22:19 +0300
Subject: [PATCH 127/221] first directory

---
 common/src/ws/message/peer-connection/retry.file.ts       | 2 +-
 common/src/ws/message/peer-connection/send.rtc.data.ts    | 4 ++--
 common/src/ws/message/room/add.channel.ts                 | 4 ++--
 frontend/src/ts/message_handlers/RomHandler.ts            | 8 ++++----
 frontend/src/ts/message_handlers/WsHandler.ts             | 4 ++--
 frontend/src/ts/types/types.ts                            | 4 ++--
 frontend/src/ts/webrtc/AbstractPeerConnection.ts          | 6 +++---
 .../src/ts/webrtc/file/FileReceiveerPeerConnection.ts     | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/src/ws/message/peer-connection/retry.file.ts b/common/src/ws/message/peer-connection/retry.file.ts
index 92b3121d2..75a43441a 100644
--- a/common/src/ws/message/peer-connection/retry.file.ts
+++ b/common/src/ws/message/peer-connection/retry.file.ts
@@ -1,3 +1,3 @@
 import {DefaultWsInMessage} from "@common/ws/common";
 
-export type RetryFileMessage = DefaultWsInMessage<"retryFile", "peerConnection:*", {}>;
+export type RetryFileWsInMessage = DefaultWsInMessage<"retryFile", "peerConnection:*", null>;
diff --git a/common/src/ws/message/peer-connection/send.rtc.data.ts b/common/src/ws/message/peer-connection/send.rtc.data.ts
index 04bf16c12..05d1ed2df 100644
--- a/common/src/ws/message/peer-connection/send.rtc.data.ts
+++ b/common/src/ws/message/peer-connection/send.rtc.data.ts
@@ -8,10 +8,10 @@ import {
 } from "@common/model/webrtc.base";
 
 
-export interface SendRtcDataBody extends OpponentWsId, WebRtcDefaultMessage {
+export interface SendRtcDataWsInBody extends OpponentWsId, WebRtcDefaultMessage {
   content: RTCIceCandidateInit | RTCSessionDescriptionInit | {message: unknown};
 }
 
-export type SendRtcDataWsInMessage = DefaultWsInMessage<"sendRtcData", "peerConnection:*", SendRtcDataBody>;
+export type SendRtcDataWsInMessage = DefaultWsInMessage<"sendRtcData", "peerConnection:*", SendRtcDataWsInBody>;
 
 export type SendRtcDataWsOutMessage = DefaultWsOutMessage<"sendRtcData", any>
diff --git a/common/src/ws/message/room/add.channel.ts b/common/src/ws/message/room/add.channel.ts
index 3d2a24db6..92dc76139 100644
--- a/common/src/ws/message/room/add.channel.ts
+++ b/common/src/ws/message/room/add.channel.ts
@@ -3,8 +3,8 @@ import type {ChannelDto} from "@common/model/dto/channel.dto";
 import type {RoomDto} from "@common/model/dto/room.dto";
 import {NewRoom} from "@common/model/ws.base";
 
-export interface AddChannelBody extends ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
+export interface AddChannelWsInBody extends ChannelDto, Omit<RoomDto, "channelId">, NewRoom {
   channelUsers: number[];
 }
 
-export type AddChannelMessage = DefaultWsInMessage<"addChannel", "room", AddChannelBody>;
+export type AddChannelWsInMessage = DefaultWsInMessage<"addChannel", "room", AddChannelWsInBody>;
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 8f8c8c204..3af465ca8 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -1,9 +1,9 @@
 import type {ChannelDto} from "@common/model/dto/channel.dto";
 import type {RoomDto} from "@common/model/dto/room.dto";
 import type {AddRoomBase, ChangeDeviceType} from "@common/model/ws.base";
-import {AddChannelBody} from "@common/ws/message/room/add.channel";
+import {AddChannelWsInBody} from "@common/ws/message/room/add.channel";
 import type {
-  AddChannelMessage,
+  AddChannelWsInMessage,
 } from "@common/ws/message/room/add.channel";
 import {AddInviteBody} from "@common/ws/message/room/add.invite";
 import type {
@@ -150,8 +150,8 @@ export class RoomHandler {
     this.store.setOnline(message.online);
   }
 
-  @Subscribe<AddChannelMessage>()
-  public addChannel(message: AddChannelBody) {
+  @Subscribe<AddChannelWsInMessage>()
+  public addChannel(message: AddChannelWsInBody) {
     this.mutateRoomAddition(message, "room_created");
   }
 
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 5ac7cd957..0f3a40af1 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -7,7 +7,7 @@ import type {
 import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 import type {MessageStatus} from "@common/model/enum/message.status";
 import type {MessagesResponseMessage} from "@common/model/ws.base";
-import type {AddChannelMessage} from "@common/ws/message/room/add.channel";
+import type {AddChannelWsInMessage} from "@common/ws/message/room/add.channel";
 import type {AddInviteMessage} from "@common/ws/message/room/add.invite";
 import type {AddRoomMessage} from "@common/ws/message/room/add.room";
 import type {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
@@ -362,7 +362,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     });
   }
 
-  public async sendAddChannel(channelName: string, users: number[]): Promise<AddChannelMessage> {
+  public async sendAddChannel(channelName: string, users: number[]): Promise<AddChannelWsInMessage> {
     return this.messageProc.sendToServerAndAwait({
       channelName,
       users,
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 7db22359c..5d5ea4515 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -23,8 +23,8 @@ import {LoginMessage} from "@/ts/types/messages/inner/login";
 import type {PrintMessageWsInMessage} from "@common/ws/message/ws-message/print.message";
 import type {MessageModelDto} from "@common/model/dto/message.model.dto";
 import {
-  AddChannelBody,
-  AddChannelMessage
+  AddChannelWsInBody,
+  AddChannelWsInMessage
 } from "@common/ws/message/room/add.channel";
 
 
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 1b3a67696..85bb2913b 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,7 +1,7 @@
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
 import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
 import type {
-  SendRtcDataBody,
+  SendRtcDataWsInBody,
 } from "@common/ws/message/peer-connection/send.rtc.data";
 import type {HandlerName} from "@common/ws/common";
 import type {Logger} from "lines-logger";
@@ -18,7 +18,7 @@ import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
 export default abstract class AbstractPeerConnection {
   protected offerCreator: boolean = false;
 
-  protected sendRtcDataQueue: SendRtcDataBody[] = [];
+  protected sendRtcDataQueue: SendRtcDataWsInBody[] = [];
 
   protected readonly opponentWsId: string;
 
@@ -186,7 +186,7 @@ export default abstract class AbstractPeerConnection {
   // Destroy(Des)
 
   // This event comes from websocket from server, which is created by another PC
-  public async sendRtcData(message: SendRtcDataBody) {
+  public async sendRtcData(message: SendRtcDataWsInBody) {
     if (!this.connectedToRemote) {
       this.logger.warn("Putting sendrtc data event to the queue")();
       this.sendRtcDataQueue.push(message);
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index 95cba3ccc..f6e30dcff 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -1,5 +1,5 @@
 import type {DestroyFileConnectionWsInMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
-import type {RetryFileMessage} from "@common/ws/message/peer-connection/retry.file";
+import type {RetryFileWsInMessage} from "@common/ws/message/peer-connection/retry.file";
 import type {SetReceivingFileStatus, SetReceivingFileUploaded} from "@/ts/types/types";
 import type {ReceivingFile} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
@@ -94,7 +94,7 @@ export default class FileReceiverPeerConnection extends FilePeerConnection {
     this.unsubscribeAndRemoveFromParent();
   }
 
-  public retryFile(message: RetryFileMessage) {
+  public retryFile(message: RetryFileWsInMessage) {
     const payload: SetReceivingFileStatus = {
       error: null,
       status: FileTransferStatus.IN_PROGRESS,

From e683018b2165d381b5802b2b31ce9e60acdc246c Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Sat, 21 May 2022 22:11:58 +0300
Subject: [PATCH 128/221] second directory

---
 .../src/ws/message/sync/set.connection.id.ts  |  4 ---
 .../ws/message/webrtc/notify.call.active.ts   |  4 +--
 common/src/ws/message/webrtc/offer.call.ts    | 10 +++----
 common/src/ws/message/webrtc/offer.file.ts    |  8 +++---
 common/src/ws/message/webrtc/offer.message.ts |  4 +--
 frontend/src/ts/message_handlers/WsHandler.ts |  8 +++---
 frontend/src/ts/webrtc/WebRtcApi.ts           | 28 +++++++++----------
 frontend/src/ts/webrtc/call/CallHandler.ts    |  6 ++--
 8 files changed, 34 insertions(+), 38 deletions(-)
 delete mode 100644 common/src/ws/message/sync/set.connection.id.ts

diff --git a/common/src/ws/message/sync/set.connection.id.ts b/common/src/ws/message/sync/set.connection.id.ts
deleted file mode 100644
index 7c29e8943..000000000
--- a/common/src/ws/message/sync/set.connection.id.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
-import {ResponseWsInMessage} from "@common/ws/common";
-import {WebRtcDefaultMessage} from "@common/model/webrtc.base";
-
diff --git a/common/src/ws/message/webrtc/notify.call.active.ts b/common/src/ws/message/webrtc/notify.call.active.ts
index 0bf24b7c8..e4e5af81b 100644
--- a/common/src/ws/message/webrtc/notify.call.active.ts
+++ b/common/src/ws/message/webrtc/notify.call.active.ts
@@ -4,9 +4,9 @@ import {
   WebRtcDefaultMessage
 } from "@common/model/webrtc.base";
 
-export interface NotifyCallActiveBody extends WebRtcDefaultMessage, OpponentWsId {
+export interface NotifyCallActiveWsInBody extends WebRtcDefaultMessage, OpponentWsId {
   roomId: number;
   userId: number;
 }
 
-export type NotifyCallActiveMessage = DefaultWsInMessage<"notifyCallActive", "webrtc", NotifyCallActiveBody>;
+export type NotifyCallActiveWsInMessage = DefaultWsInMessage<"notifyCallActive", "webrtc", NotifyCallActiveWsInBody>;
diff --git a/common/src/ws/message/webrtc/offer.call.ts b/common/src/ws/message/webrtc/offer.call.ts
index b15eaa2f1..9c1fa618d 100644
--- a/common/src/ws/message/webrtc/offer.call.ts
+++ b/common/src/ws/message/webrtc/offer.call.ts
@@ -11,15 +11,15 @@ import type {
 } from "@common/model/webrtc.base";
 
 
-export interface OfferCallRequestBody extends BrowserBase {
+export interface OfferCallRequestWsOutBody extends BrowserBase {
   roomId: number;
 }
 
-export interface OfferCallBody extends OpponentWsId, WebRtcDefaultMessage, OfferCallRequestBody  {
+export interface OfferCallWsInBody extends OpponentWsId, WebRtcDefaultMessage, OfferCallRequestWsOutBody  {
   userId: number;
   time: number;
 }
 
-export type OfferCallMessage = DefaultWsInMessage<"offerCall", "webrtc", OfferCallBody>;
-export type OfferCallRequest = RequestWsOutMessage<"offerCall", OfferCallRequestBody>;
-export type OfferCallResponse = ResponseWsInMessage<WebRtcSetConnectionIdBody>;
+export type OfferCallWsInMessage = DefaultWsInMessage<"offerCall", "webrtc", OfferCallWsInBody>;
+export type OfferCallRequestWsOutMessage = RequestWsOutMessage<"offerCall", OfferCallRequestWsOutBody>;
+export type OfferCallResponseWsInMessage = ResponseWsInMessage<WebRtcSetConnectionIdBody>;
diff --git a/common/src/ws/message/webrtc/offer.file.ts b/common/src/ws/message/webrtc/offer.file.ts
index fee6eaa37..2defe5b91 100644
--- a/common/src/ws/message/webrtc/offer.file.ts
+++ b/common/src/ws/message/webrtc/offer.file.ts
@@ -13,7 +13,7 @@ import {RequestWsOutMessage} from "@common/ws/common";
 import {WebRtcSetConnectionIdMessage} from "@common/ws/message/sync/set.connection.id";
 
 
-export type OfferFileRequestBody = {
+export type OfferFileRequestWsOutBody = {
   roomId: number;
   threadId:number | null;
   browser: string;
@@ -21,13 +21,13 @@ export type OfferFileRequestBody = {
   size: number;
 }
 
-export type OfferFileRequest = RequestWsOutMessage<"offerFile", OfferFileRequestBody>
+export type OfferFileRequest = RequestWsOutMessage<"offerFile", OfferFileRequestWsOutBody>
 
 export type OfferFileResponse = WebRtcSetConnectionIdMessage;
 
-export interface OfferFileBody extends OfferFileRequestBody, OpponentWsId, WebRtcDefaultMessage {
+export interface OfferFileBody extends OfferFileRequestWsOutBody, OpponentWsId, WebRtcDefaultMessage {
   userId: number;
   time: number;
 }
 
-export type OfferFileMessage = MultiResponseMessage<"offerFile", "webrtc", OfferFileBody>;
+export type OfferFileResponse = MultiResponseMessage<"offerFile", "webrtc", OfferFileBody>;
diff --git a/common/src/ws/message/webrtc/offer.message.ts b/common/src/ws/message/webrtc/offer.message.ts
index d949c57cb..f678cc2f9 100644
--- a/common/src/ws/message/webrtc/offer.message.ts
+++ b/common/src/ws/message/webrtc/offer.message.ts
@@ -6,11 +6,11 @@ import {
 } from "@common/model/webrtc.base";
 
 
-export interface OfferBody extends OpponentWsId, WebRtcDefaultMessage {
+export interface OfferMessageWsInBody extends OpponentWsId, WebRtcDefaultMessage {
   content: BrowserBase;
   roomId: number;
   userId: number;
   time: number;
 }
 
-export type OfferMessage = DefaultWsInMessage<"offerMessage", "webrtc", OfferBody>;
+export type OfferMessageWsInMessage = DefaultWsInMessage<"offerMessage", "webrtc", OfferMessageWsInBody>;
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 0f3a40af1..30bb8b728 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -107,15 +107,15 @@ import type {
   OfferFileBody,
   OfferFileWsOutMessage,
 
-  OfferFileMessage,
+  OfferFileResponse,
 
   OfferFileRequest,
   OfferFileResponse,
 } from "@common/ws/message/webrtc/offer.file";
 import {RequestWsOutMessage} from "@common/ws/common";
 import type {
-  OfferCallRequest,
-  OfferCallResponse,
+  OfferCallRequestWsOutMessage,
+  OfferCallResponseWsInMessage,
 } from "@common/ws/message/webrtc/offer.call";
 import type {AcceptFileWsOutMessage} from "@common/ws/message/webrtc-transfer/accept.file";
 import type {DestroyCallConnectionWsOutMessage} from "@common/ws/message/peer-connection/destroy.call.connection";
@@ -212,7 +212,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
   }
 
   public async offerCall(roomId: number, browser: string): Promise<WebRtcSetConnectionIdBody> {
-    return this.messageProc.sendToServerAndAwait<OfferCallRequest, OfferCallResponse>({
+    return this.messageProc.sendToServerAndAwait<OfferCallRequestWsOutMessage, OfferCallResponseWsInMessage>({
       action: "offerCall",
       data: {
         roomId,
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 7f5be551e..4152b5cd6 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -1,8 +1,8 @@
-import {NotifyCallActiveBody} from "@common/ws/message/webrtc/notify.call.active";
+import {NotifyCallActiveWsInBody} from "@common/ws/message/webrtc/notify.call.active";
 import type {
-  NotifyCallActiveMessage,
+  NotifyCallActiveWsInMessage,
 } from "@common/ws/message/webrtc/notify.call.active";
-import type {OfferMessage} from "@common/ws/message/webrtc/offer.message";
+import type {OfferMessageWsInMessage} from "@common/ws/message/webrtc/offer.message";
 import type {HandlerName} from "@common/ws/common";
 import type {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
 import {
@@ -36,7 +36,7 @@ import type {VideoType} from "@/ts/types/types";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import type {MessageSenderProxy} from "@/ts/message_handlers/MessageSenderProxy";
 import type {
-  OfferFileMessage,
+  OfferFileResponse,
 } from "@common/ws/message/webrtc/offer.file";
 import {
   OfferFileBody,
@@ -44,12 +44,12 @@ import {
 import {Subscribe} from "@/ts/utils/pubsub";
 import {ChangeP2pRoomInfoMessageBody} from "@/ts/types/messages/inner/change.p2p.room.info";
 import type {
-  OfferCallMessage,
+  OfferCallWsInMessage,
 } from "@common/ws/message/webrtc/offer.call";
 import {
-  OfferCallBody,
+  OfferCallWsInBody,
 } from "@common/ws/message/webrtc/offer.call";
-import {OfferBody} from "@common/ws/message/webrtc/offer.message";
+import {OfferMessageWsInBody} from "@common/ws/message/webrtc/offer.message";
 import type {AnswerCallMessage} from "@/ts/types/messages/inner/answer.call";
 import type {DeclineCallMessage} from "@/ts/types/messages/inner/decline.call";
 import type {VideoAnswerCallMessage} from "@/ts/types/messages/inner/video.answer.call";
@@ -94,8 +94,8 @@ export default class WebRtcApi {
     this.messageSenderProxy = messageSenderProxy;
   }
 
-  @Subscribe<OfferCallMessage>()
-  public offerCall(message: OfferCallBody) {
+  @Subscribe<OfferCallWsInMessage>()
+  public offerCall(message: OfferCallWsInBody) {
     this.getCallHandler(message.roomId).initAndDisplayOffer(message);
   }
 
@@ -123,8 +123,8 @@ export default class WebRtcApi {
     this.initAndSyncMessages();
   }
 
-  @Subscribe<NotifyCallActiveMessage>()
-  public notifyCallActive(m: NotifyCallActiveBody) {
+  @Subscribe<NotifyCallActiveWsInMessage>()
+  public notifyCallActive(m: NotifyCallActiveWsInBody) {
     this.getCallHandler(m.roomId).addOpponent(m.connId, m.userId, m.opponentWsId);
   }
 
@@ -150,8 +150,8 @@ export default class WebRtcApi {
     });
   }
 
-  @Subscribe<OfferMessage>()
-  public offerMessage(message: OfferBody) {
+  @Subscribe<OfferMessageWsInMessage>()
+  public offerMessage(message: OfferMessageWsInBody) {
     this.getMessageHandler(message.roomId).acceptConnection(message);
   }
 
@@ -269,7 +269,7 @@ export default class WebRtcApi {
     }
   }
 
-  @Subscribe<OfferFileMessage>()
+  @Subscribe<OfferFileResponse>()
   public offerFile(message: OfferFileBody): void {
     const limitExceeded = message.size > MAX_ACCEPT_FILE_SIZE_WO_FS_API && !requestFileSystem;
     const payload: ReceivingFile = {
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index a949aae44..74019cc1e 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -38,9 +38,9 @@ import {Subscribe} from "@/ts/utils/pubsub";
 import type {AnswerCallMessage} from "@/ts/types/messages/inner/answer.call";
 import type {VideoAnswerCallMessage} from "@/ts/types/messages/inner/video.answer.call";
 import type {DeclineCallMessage} from "@/ts/types/messages/inner/decline.call";
-import type {OfferCallBody} from "@common/ws/message/webrtc/offer.call";
+import type {OfferCallWsInBody} from "@common/ws/message/webrtc/offer.call";
 import {
-  OfferCallMessage,
+  OfferCallWsInMessage,
 } from "@common/ws/message/webrtc/offer.call";
 import {AcceptCallBody} from "@common/ws/message/webrtc-transfer/accept.call";
 
@@ -367,7 +367,7 @@ export default class CallHandler extends FileAndCallTransfer {
     this.createCallPeerConnection(message);
   }
 
-  public initAndDisplayOffer(message: OfferCallBody) {
+  public initAndDisplayOffer(message: OfferCallWsInBody) {
     this.setCallStatus("received_offer");
     if (this.connectionId) {
       this.logger.error("Old connId still exists {}", this.connectionId)();

From 39a73c48f79ea66e21d7228624afdb8006089183 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 21 May 2022 22:27:55 +0300
Subject: [PATCH 129/221] Fixed kube conf

---
 download_content.sh        | 1 +
 kubernetes/backend.yaml    | 2 +-
 kubernetes/pv-mariadb.yaml | 1 +
 kubernetes/pv-redis.yaml   | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/download_content.sh b/download_content.sh
index 4d668bc67..1dc23c490 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -129,6 +129,7 @@ minikube_all() {
   safeRunCommand kubectl apply -f kubernetes/migrate-backend.yaml
   safeRunCommand kubectl apply -f kubernetes/backend.yaml
   safeRunCommand minikube_reload_frontend
+  safeRunCommand kubectl apply -f kubernetes/frontend.yaml
   safeRunCommand kubectl apply -f kubernetes/ingress.yaml
 }
 
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index f1e25d1f8..340d858e8 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -27,7 +27,7 @@ spec:
             port: 8888
         env:
         - name: REDIS_PUBSUB
-          value: true
+          value: 'true'
         envFrom:
         - secretRef:
             name: secret
diff --git a/kubernetes/pv-mariadb.yaml b/kubernetes/pv-mariadb.yaml
index fd71e6530..eda6d4bcf 100644
--- a/kubernetes/pv-mariadb.yaml
+++ b/kubernetes/pv-mariadb.yaml
@@ -14,6 +14,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
    name: pvc-mariadb
+   namespace: pychat
 spec:
    accessModes:
      - ReadWriteOnce
diff --git a/kubernetes/pv-redis.yaml b/kubernetes/pv-redis.yaml
index 3afe3fbaf..4616a92c5 100644
--- a/kubernetes/pv-redis.yaml
+++ b/kubernetes/pv-redis.yaml
@@ -14,6 +14,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
    name: pvc-redis
+   namespace: pychat
 spec:
    accessModes:
      - ReadWriteOnce

From abada1bbcc198c5fa2f9580b10d13525dd693804 Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Sat, 21 May 2022 22:31:43 +0300
Subject: [PATCH 130/221] third directory

---
 common/src/ws/message/room/add.invite.ts      |  4 +-
 common/src/ws/message/room/add.online.user.ts |  4 +-
 common/src/ws/message/room/add.room.ts        |  4 +-
 common/src/ws/message/room/create.new.user.ts |  4 +-
 common/src/ws/message/room/delete.channel.ts  |  4 +-
 common/src/ws/message/room/delete.room.ts     |  4 +-
 common/src/ws/message/room/invite.user.ts     |  4 +-
 common/src/ws/message/room/leave.user.ts      |  4 +-
 .../src/ws/message/room/remove.online.user.ts |  4 +-
 .../ws/message/room/save.channel.settings.ts  |  4 +-
 .../src/ws/message/room/save.room.settings.ts |  4 +-
 .../src/ts/message_handlers/RomHandler.ts     | 90 +++++++++----------
 frontend/src/ts/message_handlers/WsHandler.ts | 12 +--
 .../add.online.user.transformer.ts            |  4 +-
 .../remove.online.user.transformer.ts         |  4 +-
 .../api/websocket/websocket.service.ts        |  4 +-
 16 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/common/src/ws/message/room/add.invite.ts b/common/src/ws/message/room/add.invite.ts
index 5787b5187..8a6e906ef 100644
--- a/common/src/ws/message/room/add.invite.ts
+++ b/common/src/ws/message/room/add.invite.ts
@@ -4,6 +4,6 @@ import {
   RoomExistedBefore
 } from "@common/model/ws.base";
 
-export type AddInviteBody = AddRoomBase | RoomExistedBefore;
+export type AddInviteWsInBody = AddRoomBase | RoomExistedBefore;
 
-export type AddInviteMessage = DefaultWsInMessage<"addInvite", "room", AddInviteBody>;
+export type AddInviteWsInMessage = DefaultWsInMessage<"addInvite", "room", AddInviteWsInBody>;
diff --git a/common/src/ws/message/room/add.online.user.ts b/common/src/ws/message/room/add.online.user.ts
index e2cecd613..abafb29e5 100644
--- a/common/src/ws/message/room/add.online.user.ts
+++ b/common/src/ws/message/room/add.online.user.ts
@@ -2,8 +2,8 @@ import type {DefaultWsInMessage} from "@common/ws/common";
 import type {ChangeUserOnlineBase} from "@common/model/ws.base";
 
 
-export interface AddOnlineUserBody extends ChangeUserOnlineBase {
+export interface AddOnlineUserWsInBody extends ChangeUserOnlineBase {
   opponentWsId: string;
 }
 
-export type AddOnlineUserMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserBody>;
+export type AddOnlineUserWsInMessage = DefaultWsInMessage<"addOnlineUser", "room", AddOnlineUserWsInBody>;
diff --git a/common/src/ws/message/room/add.room.ts b/common/src/ws/message/room/add.room.ts
index 179298026..5c8c47c9d 100644
--- a/common/src/ws/message/room/add.room.ts
+++ b/common/src/ws/message/room/add.room.ts
@@ -1,9 +1,9 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import {AddRoomBase} from "@common/model/ws.base";
 
-export interface AddRoomBody extends AddRoomBase {
+export interface AddRoomWsInBody extends AddRoomBase {
   channelUsers: number[];
   channelId: number;
 }
 
-export type AddRoomMessage = DefaultWsInMessage<"addRoom", "room", AddRoomBody>;
+export type AddRoomWsInMessage = DefaultWsInMessage<"addRoom", "room", AddRoomWsInBody>;
diff --git a/common/src/ws/message/room/create.new.user.ts b/common/src/ws/message/room/create.new.user.ts
index 372f2d308..13d94f3c7 100644
--- a/common/src/ws/message/room/create.new.user.ts
+++ b/common/src/ws/message/room/create.new.user.ts
@@ -1,11 +1,11 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import {UserDto} from "@common/model/dto/user.dto";
 
-export interface CreateNewUserBody extends UserDto {
+export interface CreateNewUserWsInBody extends UserDto {
   rooms: {
     roomId: number;
     users: number[];
   }[];
 }
 
-export type CreateNewUserMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserBody>;
+export type CreateNewUserWsInMessage = DefaultWsInMessage<"createNewUser", "room", CreateNewUserWsInBody>;
diff --git a/common/src/ws/message/room/delete.channel.ts b/common/src/ws/message/room/delete.channel.ts
index 875c7bcbf..0419f2bb3 100644
--- a/common/src/ws/message/room/delete.channel.ts
+++ b/common/src/ws/message/room/delete.channel.ts
@@ -1,9 +1,9 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import type {ChannelDto} from "@common/model/dto/channel.dto";
 
-export interface DeleteChannelBody {
+export interface DeleteChannelWsInBody {
   channelId: number;
   roomIds: number[];
 }
 
-export type DeleteChannelMessage = DefaultWsInMessage<"deleteChannel", "room", DeleteChannelBody>;
+export type DeleteChannelWsInMessage = DefaultWsInMessage<"deleteChannel", "room", DeleteChannelWsInBody>;
diff --git a/common/src/ws/message/room/delete.room.ts b/common/src/ws/message/room/delete.room.ts
index 71ec63c26..f27c316fb 100644
--- a/common/src/ws/message/room/delete.room.ts
+++ b/common/src/ws/message/room/delete.room.ts
@@ -1,7 +1,7 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 
-export interface DeleteRoomBody {
+export interface DeleteRoomWsInBody {
   roomId: number;
 }
 
-export type DeleteRoomMessage = DefaultWsInMessage<"deleteRoom", "room", DeleteRoomBody>;
+export type DeleteRoomWsInMessage = DefaultWsInMessage<"deleteRoom", "room", DeleteRoomWsInBody>;
diff --git a/common/src/ws/message/room/invite.user.ts b/common/src/ws/message/room/invite.user.ts
index 7eea89e5b..b2dd3777e 100644
--- a/common/src/ws/message/room/invite.user.ts
+++ b/common/src/ws/message/room/invite.user.ts
@@ -4,8 +4,8 @@ import {
   RoomExistedBefore
 } from "@common/model/ws.base";
 
-export interface InviteUserBody extends NewRoom, RoomExistedBefore {
+export interface InviteUserWsInBody extends NewRoom, RoomExistedBefore {
   roomId: number;
   users: number[];
 }
-export type InviteUserMessage = DefaultWsInMessage<"inviteUser", "room", InviteUserBody>;
+export type InviteUserWsInMessage = DefaultWsInMessage<"inviteUser", "room", InviteUserWsInBody>;
diff --git a/common/src/ws/message/room/leave.user.ts b/common/src/ws/message/room/leave.user.ts
index d51b472e7..e18c1dc73 100644
--- a/common/src/ws/message/room/leave.user.ts
+++ b/common/src/ws/message/room/leave.user.ts
@@ -1,9 +1,9 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 
-export interface LeaveUserBody {
+export interface LeaveUserWsInBody {
   roomId: number;
   userId: number;
   users: number[];
 }
 
-export type LeaveUserMessage = DefaultWsInMessage<"leaveUser", "room", LeaveUserBody>;
+export type LeaveUserWsInMessage = DefaultWsInMessage<"leaveUser", "room", LeaveUserWsInBody>;
diff --git a/common/src/ws/message/room/remove.online.user.ts b/common/src/ws/message/room/remove.online.user.ts
index 44bd951aa..c2be6f3e1 100644
--- a/common/src/ws/message/room/remove.online.user.ts
+++ b/common/src/ws/message/room/remove.online.user.ts
@@ -1,6 +1,6 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import {ChangeUserOnlineBase} from "@common/model/ws.base";
 
-export type RemoveOnlineUserBody = ChangeUserOnlineBase;
+export type RemoveOnlineUserWsInBody = ChangeUserOnlineBase;
 
-export type RemoveOnlineUserMessage = DefaultWsInMessage<"removeOnlineUser", "room", RemoveOnlineUserBody>;
+export type RemoveOnlineUserWsInMessage = DefaultWsInMessage<"removeOnlineUser", "room", RemoveOnlineUserWsInBody>;
diff --git a/common/src/ws/message/room/save.channel.settings.ts b/common/src/ws/message/room/save.channel.settings.ts
index f17d4ab94..eb87765f4 100644
--- a/common/src/ws/message/room/save.channel.settings.ts
+++ b/common/src/ws/message/room/save.channel.settings.ts
@@ -1,11 +1,11 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import type {ChannelDto} from "@common/model/dto/channel.dto";
 
-export interface SaveChannelSettingsBody extends ChannelDto {
+export interface SaveChannelSettingsWsInBody extends ChannelDto {
   notifications: boolean;
   volume: number;
   p2p: boolean;
   userId: number;
 }
 
-export type SaveChannelSettingsMessage = DefaultWsInMessage<"saveChannelSettings", "room", SaveChannelSettingsBody>;
+export type SaveChannelSettingsWsInMessage = DefaultWsInMessage<"saveChannelSettings", "room", SaveChannelSettingsWsInBody>;
diff --git a/common/src/ws/message/room/save.room.settings.ts b/common/src/ws/message/room/save.room.settings.ts
index 2e235a853..e88ad4786 100644
--- a/common/src/ws/message/room/save.room.settings.ts
+++ b/common/src/ws/message/room/save.room.settings.ts
@@ -1,5 +1,5 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import type {RoomNoUsersDto} from "@common/model/dto/room.dto";
 
-export type SaveRoomSettingsBody = RoomNoUsersDto;
-export type SaveRoomSettingsMessage = DefaultWsInMessage<"saveRoomSettings", "room", SaveRoomSettingsBody>;
+export type SaveRoomSettingsWsInBody = RoomNoUsersDto;
+export type SaveRoomSettingsWsInMessage = DefaultWsInMessage<"saveRoomSettings", "room", SaveRoomSettingsWsInBody>;
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 3af465ca8..8b7f43c5c 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -5,45 +5,45 @@ import {AddChannelWsInBody} from "@common/ws/message/room/add.channel";
 import type {
   AddChannelWsInMessage,
 } from "@common/ws/message/room/add.channel";
-import {AddInviteBody} from "@common/ws/message/room/add.invite";
+import {AddInviteWsInBody} from "@common/ws/message/room/add.invite";
 import type {
-  AddInviteMessage,
+  AddInviteWsInMessage,
 } from "@common/ws/message/room/add.invite";
-import {AddOnlineUserBody} from "@common/ws/message/room/add.online.user";
+import {AddOnlineUserWsInBody} from "@common/ws/message/room/add.online.user";
 import type {
-  AddOnlineUserMessage,
+  AddOnlineUserWsInMessage,
 } from "@common/ws/message/room/add.online.user";
-import {AddRoomBody} from "@common/ws/message/room/add.room";
+import {AddRoomWsInBody} from "@common/ws/message/room/add.room";
 import type {
-  AddRoomMessage,
+  AddRoomWsInMessage,
 } from "@common/ws/message/room/add.room";
-import {DeleteChannelBody} from "@common/ws/message/room/delete.channel";
+import {DeleteChannelWsInBody} from "@common/ws/message/room/delete.channel";
 import type {
-  DeleteChannelMessage,
+  DeleteChannelWsInMessage,
 } from "@common/ws/message/room/delete.channel";
-import {DeleteRoomBody} from "@common/ws/message/room/delete.room";
+import {DeleteRoomWsInBody} from "@common/ws/message/room/delete.room";
 import type {
-  DeleteRoomMessage,
+  DeleteRoomWsInMessage,
 } from "@common/ws/message/room/delete.room";
-import {InviteUserBody} from "@common/ws/message/room/invite.user";
+import {InviteUserWsInBody} from "@common/ws/message/room/invite.user";
 import type {
-  InviteUserMessage,
+  InviteUserWsInMessage,
 } from "@common/ws/message/room/invite.user";
-import {LeaveUserBody} from "@common/ws/message/room/leave.user";
+import {LeaveUserWsInBody} from "@common/ws/message/room/leave.user";
 import type {
-  LeaveUserMessage,
+  LeaveUserWsInMessage,
 } from "@common/ws/message/room/leave.user";
-import {RemoveOnlineUserBody} from "@common/ws/message/room/remove.online.user";
+import {RemoveOnlineUserWsInBody} from "@common/ws/message/room/remove.online.user";
 import type {
-  RemoveOnlineUserMessage,
+  RemoveOnlineUserWsInMessage,
 } from "@common/ws/message/room/remove.online.user";
-import {SaveChannelSettingsBody} from "@common/ws/message/room/save.channel.settings";
+import {SaveChannelSettingsWsInBody} from "@common/ws/message/room/save.channel.settings";
 import type {
-  SaveChannelSettingsMessage,
+  SaveChannelSettingsWsInMessage,
 } from "@common/ws/message/room/save.channel.settings";
 import type {
-  SaveRoomSettingsBody,
-  SaveRoomSettingsMessage
+  SaveRoomSettingsWsInBody,
+  SaveRoomSettingsWsInMessage
 } from "@common/ws/message/room/save.room.settings";
 
 import type {ChangeP2pRoomInfoMessage} from "@/ts/types/messages/inner/change.p2p.room.info";
@@ -84,8 +84,8 @@ import {
   ShowITypeWsInMessage
 } from "@common/ws/message/room/show.i.type";
 import {
-  CreateNewUserBody,
-  CreateNewUserMessage
+  CreateNewUserWsInBody,
+  CreateNewUserWsInMessage
 } from "@common/ws/message/room/create.new.user";
 
 
@@ -115,8 +115,8 @@ export class RoomHandler {
     this.audioPlayer = audioPlayer;
   }
 
-  @Subscribe<LeaveUserMessage>()
-  public leaveUser(message: LeaveUserBody) {
+  @Subscribe<LeaveUserWsInMessage>()
+  public leaveUser(message: LeaveUserWsInBody) {
     if (this.store.roomsDict[message.roomId]) {
       const m: SetRoomsUsers = {
         roomId: message.roomId,
@@ -137,13 +137,13 @@ export class RoomHandler {
     }
   }
 
-  @Subscribe<AddRoomMessage>()
-  public addRoom(message: AddRoomBody) {
+  @Subscribe<AddRoomWsInMessage>()
+  public addRoom(message: AddRoomWsInBody) {
     this.mutateRoomAddition(message, "room_created");
   }
 
-  @Subscribe<RemoveOnlineUserMessage>()
-  public removeOnlineUser(message: RemoveOnlineUserBody) {
+  @Subscribe<RemoveOnlineUserWsInMessage>()
+  public removeOnlineUser(message: RemoveOnlineUserWsInBody) {
     if (message.online[message.userId].length === 0) {
       this.addChangeOnlineEntry(message.userId, message.time, "gone offline");
     }
@@ -155,8 +155,8 @@ export class RoomHandler {
     this.mutateRoomAddition(message, "room_created");
   }
 
-  @Subscribe<InviteUserMessage>()
-  public inviteUser(message: InviteUserBody) {
+  @Subscribe<InviteUserWsInMessage>()
+  public inviteUser(message: InviteUserWsInBody) {
     this.store.setRoomsUsers({
       roomId: message.roomId,
       users: message.users,
@@ -174,13 +174,13 @@ export class RoomHandler {
     this.notifyDevicesChanged(null, message.roomId, "someone_joined");
   }
 
-  @Subscribe<AddInviteMessage>()
-  public addInvite(message: AddInviteBody) {
+  @Subscribe<AddInviteWsInMessage>()
+  public addInvite(message: AddInviteWsInBody) {
     this.mutateRoomAddition(message, "invited");
   }
 
-  @Subscribe<CreateNewUserMessage>()
-  public createNewUser(message: CreateNewUserBody) {
+  @Subscribe<CreateNewUserWsInMessage>()
+  public createNewUser(message: CreateNewUserWsInBody) {
     const newVar: UserModel = convertUser(message, null);
     this.store.addUser(newVar);
     message.rooms.forEach(({roomId, users}) => {
@@ -201,8 +201,8 @@ export class RoomHandler {
     });
   }
 
-  @Subscribe<AddOnlineUserMessage>()
-  public addOnlineUser(message: AddOnlineUserBody) {
+  @Subscribe<AddOnlineUserWsInMessage>()
+  public addOnlineUser(message: AddOnlineUserWsInBody) {
     if (message.online[message.userId].length === 1) {
       // Exactly 1 device is now offline, so that new that appeared is the first one
       this.addChangeOnlineEntry(message.userId, message.time, "appeared online");
@@ -219,8 +219,8 @@ export class RoomHandler {
     this.sub.notify(payload);
   }
 
-  @Subscribe<SaveChannelSettingsMessage>()
-  public saveChannelSettings(message: SaveChannelSettingsBody) {
+  @Subscribe<SaveChannelSettingsWsInMessage>()
+  public saveChannelSettings(message: SaveChannelSettingsWsInBody) {
     if (!this.store.channelsDict[message.id]) {
       this.logger.error("Unable to find channel to edit {} to kick user, available are {}", message.id, Object.keys(this.store.channelsDict))();
     } else {
@@ -235,8 +235,8 @@ export class RoomHandler {
     }
   }
 
-  @Subscribe<DeleteChannelMessage>()
-  public deleteChannel(message: DeleteChannelBody) {
+  @Subscribe<DeleteChannelWsInMessage>()
+  public deleteChannel(message: DeleteChannelWsInBody) {
     this.store.deleteChannel(message.channelId);
     message.roomIds.forEach((id) => {
       this.doRoomDelete(id);
@@ -253,8 +253,8 @@ export class RoomHandler {
     }
   }
 
-  @Subscribe<SaveRoomSettingsMessage>()
-  public saveRoomSettings(message: SaveRoomSettingsBody) {
+  @Subscribe<SaveRoomSettingsWsInMessage>()
+  public saveRoomSettings(message: SaveRoomSettingsWsInBody) {
     const oldRoom = this.store.roomsDict[message.id];
     if (!oldRoom) {
       this.logger.error("Unable to find channel to edit {} to kick user, available are {}", message.id, Object.keys(this.store.roomsDict))();
@@ -268,8 +268,8 @@ export class RoomHandler {
     }
   }
 
-  @Subscribe<DeleteRoomMessage>()
-  public deleteRoom(message: DeleteRoomBody) {
+  @Subscribe<DeleteRoomWsInMessage>()
+  public deleteRoom(message: DeleteRoomWsInBody) {
     this.doRoomDelete(message.roomId);
   }
 
@@ -375,7 +375,7 @@ export class RoomHandler {
 
   private mutateRoomAddition(message: AddRoomBase, type: "invited" | "room_created") {
     if (message.channelId) {
-      // As (Omit<AddRoomMessage, 'action'> & {action: 'addChannel'})
+      // As (Omit<AddRoomWsInMessage, 'action'> & {action: 'addChannel'})
       const channelDict: ChannelModel = getChannelDict(message as any);
       this.store.addChannel(channelDict);
     }
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 30bb8b728..81eba752f 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -8,9 +8,9 @@ import type {UserSettingsDto} from "@common/model/dto/user.settings.dto";
 import type {MessageStatus} from "@common/model/enum/message.status";
 import type {MessagesResponseMessage} from "@common/model/ws.base";
 import type {AddChannelWsInMessage} from "@common/ws/message/room/add.channel";
-import type {AddInviteMessage} from "@common/ws/message/room/add.invite";
-import type {AddRoomMessage} from "@common/ws/message/room/add.room";
-import type {SaveChannelSettingsMessage} from "@common/ws/message/room/save.channel.settings";
+import type {AddInviteWsInMessage} from "@common/ws/message/room/add.invite";
+import type {AddRoomWsInMessage} from "@common/ws/message/room/add.room";
+import type {SaveChannelSettingsWsInMessage} from "@common/ws/message/room/save.channel.settings";
 import type {ShowITypeWsOutMessage} from "@common/ws/message/room/show.i.type";
 import type {
   WebRtcSetConnectionIdBody,
@@ -333,7 +333,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     });
   }
 
-  public async sendAddRoom(name: string | null, p2p: boolean, volume: number, notifications: boolean, users: number[], channelId: number | null): Promise<AddRoomMessage> {
+  public async sendAddRoom(name: string | null, p2p: boolean, volume: number, notifications: boolean, users: number[], channelId: number | null): Promise<AddRoomWsInMessage> {
     return this.messageProc.sendToServerAndAwait({
       users,
       name,
@@ -397,7 +397,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     channelCreatorId: number,
     volume: number,
     notifications: boolean,
-  ): Promise<SaveChannelSettingsMessage> {
+  ): Promise<SaveChannelSettingsWsInMessage> {
     return this.messageProc.sendToServerAndAwait({
       action: "saveChannelSettings",
       channelId,
@@ -408,7 +408,7 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     });
   }
 
-  public async inviteUser(roomId: number, users: number[]): Promise<AddInviteMessage> {
+  public async inviteUser(roomId: number, users: number[]): Promise<AddInviteWsInMessage> {
     return this.messageProc.sendToServerAndAwait({
       roomId,
       users,
diff --git a/newback/src/data/transformers/out.message/add.online.user.transformer.ts b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
index 03665ad20..46f1b669b 100644
--- a/newback/src/data/transformers/out.message/add.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/add.online.user.transformer.ts
@@ -1,7 +1,7 @@
 import type {UserModel} from "@/data/model/user.model";
-import type {AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import type {AddOnlineUserWsInMessage} from "@common/ws/message/room/add.online.user";
 
-export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserMessage {
+export function transformAddUserOnline(online: Record<number, string[]>, user: UserModel, opponentWsId: string): AddOnlineUserWsInMessage {
   return {
     action: "addOnlineUser",
     handler: "room",
diff --git a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
index c8e9ae241..3b77dd574 100644
--- a/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
+++ b/newback/src/data/transformers/out.message/remove.online.user.transformer.ts
@@ -1,11 +1,11 @@
 import type {
   UserOnlineData,
 } from "@/data/types/internal";
-import type {RemoveOnlineUserMessage} from "@common/ws/message/room/remove.online.user";
+import type {RemoveOnlineUserWsInMessage} from "@common/ws/message/room/remove.online.user";
 import {WebSocketContextData} from "@/data/types/patch";
 
 
-export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserMessage {
+export function getLogoutMessage(online: UserOnlineData, lastTimeOnline: number, context: WebSocketContextData, time: number): RemoveOnlineUserWsInMessage {
   return {
     data: {
       online,
diff --git a/newback/src/modules/api/websocket/websocket.service.ts b/newback/src/modules/api/websocket/websocket.service.ts
index c09961e89..e12c556a3 100644
--- a/newback/src/modules/api/websocket/websocket.service.ts
+++ b/newback/src/modules/api/websocket/websocket.service.ts
@@ -13,7 +13,7 @@ import {PubsubService} from "@/modules/shared/pubsub/pubsub.service";
 import {transformSetWsId} from "@/data/transformers/out.message/set.ws.id.transformer";
 import {transformAddUserOnline} from "@/data/transformers/out.message/add.online.user.transformer";
 import {getLogoutMessage} from "@/data/transformers/out.message/remove.online.user.transformer";
-import type {AddOnlineUserMessage} from "@common/ws/message/room/add.online.user";
+import type {AddOnlineUserWsInMessage} from "@common/ws/message/room/add.online.user";
 import type {WebSocketContextData} from "@/data/types/patch";
 
 
@@ -64,7 +64,7 @@ export class WebsocketService {
     this.logger.log(`User #${user.id} ${user.username} subscribed to ${JSON.stringify(channelsToListen)}`, "ws");
     context.sendToClient(response);
     this.pubsubService.subscribe(context, ...channelsToListen);
-    const data: AddOnlineUserMessage = transformAddUserOnline(online, user, id);
+    const data: AddOnlineUserWsInMessage = transformAddUserOnline(online, user, id);
     await this.pubsubService.emit(
       {
         handler: "sendToClient",

From 27d199a79e83eaa3eb4d41a81a88fd1017d3cf73 Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Sat, 21 May 2022 22:50:26 +0300
Subject: [PATCH 131/221] fourth directory

---
 .../ws/message/webrtc-transfer/accept.call.ts    |  4 ++--
 .../ws/message/webrtc-transfer/accept.file.ts    |  7 ++++---
 .../src/ws/message/webrtc-transfer/reply.call.ts |  4 ++--
 .../src/ws/message/webrtc-transfer/reply.file.ts |  4 ++--
 frontend/src/ts/webrtc/call/CallHandler.ts       | 16 ++++++++--------
 frontend/src/ts/webrtc/file/FileHandler.ts       |  4 ++--
 .../ts/webrtc/file/FileSenderPeerConnection.ts   |  8 ++++----
 7 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/common/src/ws/message/webrtc-transfer/accept.call.ts b/common/src/ws/message/webrtc-transfer/accept.call.ts
index 434677a44..f2b68f6db 100644
--- a/common/src/ws/message/webrtc-transfer/accept.call.ts
+++ b/common/src/ws/message/webrtc-transfer/accept.call.ts
@@ -4,7 +4,7 @@ import {
   WebRtcDefaultMessage
 } from "@common/model/webrtc.base";
 
-export interface AcceptCallBody extends OpponentWsId, WebRtcDefaultMessage {
+export interface AcceptCallWsInBody extends OpponentWsId, WebRtcDefaultMessage {
 
 }
-export type AcceptCallMessage = DefaultWsInMessage<"acceptCall", "webrtcTransfer:*", AcceptCallBody>;
+export type AcceptCallWsInMessage = DefaultWsInMessage<"acceptCall", "webrtcTransfer:*", AcceptCallWsInBody>;
diff --git a/common/src/ws/message/webrtc-transfer/accept.file.ts b/common/src/ws/message/webrtc-transfer/accept.file.ts
index f8ab61262..705107d5e 100644
--- a/common/src/ws/message/webrtc-transfer/accept.file.ts
+++ b/common/src/ws/message/webrtc-transfer/accept.file.ts
@@ -5,11 +5,12 @@ import {
 import {WebRtcDefaultMessage} from "@common/model/webrtc.base";
 
 
-export interface AcceptFileBody extends WebRtcDefaultMessage {
+export interface AcceptFileWsInBody extends WebRtcDefaultMessage {
   received: number;
 }
 
+export type AcceptFileWsOutBody = AcceptFileWsInBody;
 
-export type AcceptFileMessage = DefaultWsInMessage<"acceptFile", "peerConnection:*", AcceptFileBody>;
+export type AcceptFileWsInMessage = DefaultWsInMessage<"acceptFile", "peerConnection:*", AcceptFileWsInBody>;
 
-export type AcceptFileWsOutMessage = DefaultWsOutMessage<"acceptFile", AcceptFileBody>
+export type AcceptFileWsOutMessage = DefaultWsOutMessage<"acceptFile", AcceptFileWsOutBody>
diff --git a/common/src/ws/message/webrtc-transfer/reply.call.ts b/common/src/ws/message/webrtc-transfer/reply.call.ts
index 711336613..b28a07817 100644
--- a/common/src/ws/message/webrtc-transfer/reply.call.ts
+++ b/common/src/ws/message/webrtc-transfer/reply.call.ts
@@ -1,6 +1,6 @@
 import {DefaultWsInMessage} from "@common/ws/common";
 import {ReplyWebRtc} from "@common/model/webrtc.base";
 
-export type ReplyCallBody = ReplyWebRtc;
+export type ReplyCallWsInBody = ReplyWebRtc;
 
-export type ReplyCallMessage = DefaultWsInMessage<"replyCall", "webrtcTransfer:*", ReplyCallBody>;
+export type ReplyCallWsInMessage = DefaultWsInMessage<"replyCall", "webrtcTransfer:*", ReplyCallWsInBody>;
diff --git a/common/src/ws/message/webrtc-transfer/reply.file.ts b/common/src/ws/message/webrtc-transfer/reply.file.ts
index 82e7ba1df..675b6cc87 100644
--- a/common/src/ws/message/webrtc-transfer/reply.file.ts
+++ b/common/src/ws/message/webrtc-transfer/reply.file.ts
@@ -1,6 +1,6 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import type {ReplyWebRtc} from "@common/model/webrtc.base";
 
-export type ReplyFileBody = ReplyWebRtc;
+export type ReplyFileWsInBody = ReplyWebRtc;
 
-export type ReplyFileMessage = DefaultWsInMessage<"replyFile", "webrtcTransfer:*", ReplyFileBody>;
+export type ReplyFileWsInMessage = DefaultWsInMessage<"replyFile", "webrtcTransfer:*", ReplyFileWsInBody>;
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 74019cc1e..9098f6ab3 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -1,8 +1,8 @@
 import type {CallStatus} from "@common/model/webrtc.base";
-import type {AcceptCallMessage} from "@common/ws/message/webrtc-transfer/accept.call";
-import {ReplyCallBody} from "@common/ws/message/webrtc-transfer/reply.call";
+import type {AcceptCallWsInMessage} from "@common/ws/message/webrtc-transfer/accept.call";
+import {ReplyCallWsInBody} from "@common/ws/message/webrtc-transfer/reply.call";
 import type {
-  ReplyCallMessage,
+  ReplyCallWsInMessage,
 } from "@common/ws/message/webrtc-transfer/reply.call";
 import type {ChangeStreamMessage} from "@/ts/types/messages/inner/change.stream";
 import {
@@ -42,7 +42,7 @@ import type {OfferCallWsInBody} from "@common/ws/message/webrtc/offer.call";
 import {
   OfferCallWsInMessage,
 } from "@common/ws/message/webrtc/offer.call";
-import {AcceptCallBody} from "@common/ws/message/webrtc-transfer/accept.call";
+import {AcceptCallWsInBody} from "@common/ws/message/webrtc-transfer/accept.call";
 
 
 export default class CallHandler extends FileAndCallTransfer {
@@ -99,8 +99,8 @@ export default class CallHandler extends FileAndCallTransfer {
     return this.connectionId;
   }
 
-  @Subscribe<AcceptCallMessage>()
-  public acceptCall(message: AcceptCallBody) {
+  @Subscribe<AcceptCallWsInMessage>()
+  public acceptCall(message: AcceptCallWsInBody) {
     if (this.callStatus !== "received_offer") { // If we're call initiator
       if (!this.connectionId) {
         throw Error("Conn is is null");
@@ -362,8 +362,8 @@ export default class CallHandler extends FileAndCallTransfer {
     }
   }
 
-  @Subscribe<ReplyCallMessage>()
-  public replyCall(message: ReplyCallBody) {
+  @Subscribe<ReplyCallWsInMessage>()
+  public replyCall(message: ReplyCallWsInBody) {
     this.createCallPeerConnection(message);
   }
 
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 23c33abc5..a2c9b5568 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,4 +1,4 @@
-import type {ReplyFileMessage} from "@common/ws/message/webrtc-transfer/reply.file";
+import type {ReplyFileWsInMessage} from "@common/ws/message/webrtc-transfer/reply.file";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
@@ -33,7 +33,7 @@ export default class FileHandler extends FileAndCallTransfer {
     this.store.addSendingFile(payload);
   }
 
-  public replyFile(message: ReplyFileMessage) {
+  public replyFile(message: ReplyFileWsInMessage) {
     this.logger.debug("got mes {}", message)();
     new FileSenderPeerConnection(this.roomId, message.connId, message.opponentWsId, this.wsHandler, this.store, this.file, message.userId, this.sub);
   }
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 646fa0faf..f64d3f7df 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -1,5 +1,5 @@
 import type {DestroyFileConnectionWsInMessage} from "@common/ws/message/peer-connection/destroy.file.connection";
-import type {AcceptFileMessage} from "@common/ws/message/webrtc-transfer/accept.file";
+import type {AcceptFileWsInMessage} from "@common/ws/message/webrtc-transfer/accept.file";
 import type {AddSendingFileTransfer, SetSendingFileStatus, SetSendingFileUploaded} from "@/ts/types/types";
 import type {SendingFileTransfer} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
@@ -10,7 +10,7 @@ import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
 import {Subscribe} from "@/ts/utils/pubsub";
-import {AcceptFileBody} from "@common/ws/message/webrtc-transfer/accept.file";
+import {AcceptFileWsInBody} from "@common/ws/message/webrtc-transfer/accept.file";
 import {DestroyFileConnectionWsInBody} from "@common/ws/message/peer-connection/destroy.file.connection";
 
 
@@ -74,8 +74,8 @@ export default class FileSenderPeerConnection extends FilePeerConnection {
     }
   }
 
-  @Subscribe<AcceptFileMessage>()
-  public acceptFile(message: AcceptFileBody) {
+  @Subscribe<AcceptFileWsInMessage>()
+  public acceptFile(message: AcceptFileWsInBody) {
     this.offset = message.received;
     this.createPeerConnection();
     const ssfs: SetSendingFileStatus = {

From 8999f9b27ca3cc8a047cee0e124afdf76b4f4750 Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Sat, 21 May 2022 23:46:05 +0300
Subject: [PATCH 132/221] fifth directory

---
 .../ws/message/ws-message/delete.message.ts   |  4 ++--
 common/src/ws/message/ws/ping.ts              |  4 ++--
 common/src/ws/message/ws/set.profile.image.ts |  4 ++--
 .../src/ws/message/ws/user.profile.changed.ts |  4 ++--
 frontend/src/ts/message_handlers/WsHandler.ts | 24 +++++++++----------
 .../ts/message_handlers/WsMessageHandler.ts   |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/src/ws/message/ws-message/delete.message.ts b/common/src/ws/message/ws-message/delete.message.ts
index d47064112..8e46f4784 100644
--- a/common/src/ws/message/ws-message/delete.message.ts
+++ b/common/src/ws/message/ws-message/delete.message.ts
@@ -1,10 +1,10 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import {UserDto} from "@common/model/dto/user.dto";
 
-export interface DeleteMessageBody {
+export interface DeleteMessageWsInBody {
   roomId: number;
   id: number;
   edited: number;
 }
 
-export type DeleteMessage = DefaultWsInMessage<"deleteMessage", "ws-message", DeleteMessageBody>;
+export type DeleteMessageWsInMessage = DefaultWsInMessage<"deleteMessage", "ws-message", DeleteMessageWsInBody>;
diff --git a/common/src/ws/message/ws/ping.ts b/common/src/ws/message/ws/ping.ts
index 25eeafb43..927025b5d 100644
--- a/common/src/ws/message/ws/ping.ts
+++ b/common/src/ws/message/ws/ping.ts
@@ -1,6 +1,6 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 
-export interface PingBody {
+export interface PingWsInBody {
   time: string;
 }
-export type PingMessage = DefaultWsInMessage<"ping", "ws", PingBody>;
+export type PingWsInMessage = DefaultWsInMessage<"ping", "ws", PingWsInBody>;
diff --git a/common/src/ws/message/ws/set.profile.image.ts b/common/src/ws/message/ws/set.profile.image.ts
index 67cd841df..b73108f9c 100644
--- a/common/src/ws/message/ws/set.profile.image.ts
+++ b/common/src/ws/message/ws/set.profile.image.ts
@@ -1,6 +1,6 @@
 import {DefaultWsInMessage} from "@common/ws/common";
 
-export interface SetProfileImageBody {
+export interface SetProfileImageWsInBody {
   url: string;
 }
-export type SetProfileImageMessage = DefaultWsInMessage<"setProfileImage", "ws", SetProfileImageBody>;
+export type SetProfileImageWsInMessage = DefaultWsInMessage<"setProfileImage", "ws", SetProfileImageWsInBody>;
diff --git a/common/src/ws/message/ws/user.profile.changed.ts b/common/src/ws/message/ws/user.profile.changed.ts
index 46a825dd1..2d1ae201f 100644
--- a/common/src/ws/message/ws/user.profile.changed.ts
+++ b/common/src/ws/message/ws/user.profile.changed.ts
@@ -1,5 +1,5 @@
 import type {DefaultWsInMessage} from "@common/ws/common";
 import type {UserDto} from "@common/model/dto/user.dto";
 
-export type UserProfileChangedBody = UserDto;
-export type UserProfileChangedMessage = DefaultWsInMessage<"userProfileChanged", "ws", UserProfileChangedBody>;
+export type UserProfileChangedWsInBody = UserDto;
+export type UserProfileChangedWsInMessage = DefaultWsInMessage<"userProfileChanged", "ws", UserProfileChangedWsInBody>;
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 81eba752f..c0865ecd0 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -16,10 +16,10 @@ import type {
   WebRtcSetConnectionIdBody,
   WebRtcSetConnectionIdMessage,
 } from "@common/ws/message/sync/set.connection.id";
-import type {PingMessage} from "@common/ws/message/ws/ping";
-import {SetProfileImageBody} from "@common/ws/message/ws/set.profile.image";
+import type {PingWsInMessage} from "@common/ws/message/ws/ping";
+import {SetProfileImageWsInBody} from "@common/ws/message/ws/set.profile.image";
 import type {
-  SetProfileImageMessage,
+  SetProfileImageWsInMessage,
 } from "@common/ws/message/ws/set.profile.image";
 import {
   SetSettingBody,
@@ -32,9 +32,9 @@ import type {
 import type {SetUserProfileMessage, SetUserProfileWsOutMessage} from "@common/ws/message/ws/set.user.profile";
 import type {SetWsIdWsOutMessage,
   SetWsIdWsInMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedBody} from "@common/ws/message/ws/user.profile.changed";
+import {UserProfileChangedWsInBody} from "@common/ws/message/ws/user.profile.changed";
 import type {
-  UserProfileChangedMessage,
+  UserProfileChangedWsInMessage,
 } from "@common/ws/message/ws/user.profile.changed";
 import type {
   PrintMessageWsInMessage,
@@ -98,7 +98,7 @@ import {
   SetWsIdBody,
 } from "@common/ws/message/ws/set.ws.id";
 import {Gender} from "@common/model/enum/gender";
-import {PingBody} from "@common/ws/message/ws/ping";
+import {PingWsInBody} from "@common/ws/message/ws/ping";
 import type {
   PongWsInMessage,
   PongWsOutMessage,
@@ -597,8 +597,8 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     this.store.setUserInfo(a);
   }
 
-  @Subscribe<SetProfileImageMessage>()
-  public setProfileImage(m: SetProfileImageBody) {
+  @Subscribe<SetProfileImageWsInMessage>()
+  public setProfileImage(m: SetProfileImageWsInBody) {
     this.setUserImage(m.url);
   }
 
@@ -641,14 +641,14 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
     }
   }
 
-  @Subscribe<UserProfileChangedMessage>()
-  public userProfileChanged(message: UserProfileChangedBody) {
+  @Subscribe<UserProfileChangedWsInMessage>()
+  public userProfileChanged(message: UserProfileChangedWsInBody) {
     this.store.setUser(message);
   }
 
 
-  @Subscribe<PingMessage>()
-  public ping(message: PingBody) {
+  @Subscribe<PingWsInMessage>()
+  public ping(message: PingWsInBody) {
     this.startNoPingTimeout();
     this.sendToServer<PongWsOutMessage>({
       action: "pong",
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 4b8cd7cfb..b070deb72 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -4,7 +4,7 @@ import type {MessageModelDto} from "@common/model/dto/message.model.dto";
 import {ImageType} from "@common/model/enum/image.type";
 import {MessageStatus} from "@common/model/enum/message.status";
 import type {MessagesResponseMessage} from "@common/model/ws.base";
-import type {DeleteMessage} from "@common/ws/message/ws-message/delete.message";
+import type {DeleteMessageWsInMessage} from "@common/ws/message/ws-message/delete.message";
 import type {PrintMessageWsInMessage} from "@common/ws/message/ws-message/print.message";
 import type {SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
 import type {SyncHistoryWsInMessage} from "@common/ws/message/sync.history";
@@ -297,7 +297,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     });
   }
 
-  public deleteMessage(inMessage: DeleteMessage) {
+  public deleteMessage(inMessage: DeleteMessageWsInMessage) {
     let message: MessageModel = this.store.roomsDict[inMessage.roomId].messages[inMessage.id];
     if (!message) {
       this.logger.warn("Unable to find message {} to delete it", inMessage)();

From f10722d649c23de6aadd2eff771f200c6119804a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 02:22:07 +0300
Subject: [PATCH 133/221] Added kube cert

---
 download_content.sh          | 23 +++++++++++++++++++++--
 kubernetes/.gitignore        |  1 +
 kubernetes/cert-manager.yaml | 34 ++++++++++++++++++++++++++++++++++
 kubernetes/ingress.yaml      |  7 ++++++-
 kubernetes/secret.yaml       |  2 +-
 5 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 kubernetes/.gitignore
 create mode 100644 kubernetes/cert-manager.yaml

diff --git a/download_content.sh b/download_content.sh
index 1dc23c490..3377ef9fe 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -116,6 +116,25 @@ minikube_delete_all() {
   kubectl delete -f kubernetes/namespace.yaml --wait=true
 }
 
+minikube_nginx() {
+  qphn.eUnHF6FRD7
+  helm repo add stable https://charts.helm.sh/stable
+  helm install nginx-ingress stable/nginx-ingress --set controller.publishService.enabled=true
+}
+minikube_certificate() {
+  # Profile → API Tokens → Create Token.  https://dash.cloudflare.com/profile/api-tokens Permissions: Zone — DNS — Edit, Zone — Zone — Read; Zone Resources: Include — All Zones
+  kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml
+  helm repo add jetstack https://charts.jetstack.io
+  helm repo update
+  helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f -
+  kubectl apply -f kubernetes/cf-secret.yaml
+  kubectl apply -f kubernetes/cert-manager.yaml
+  # helm --namespace cert-manager delete cert-manager
+  # kubectl delete namespace cert-manager
+  # kubectl delete -f https://github.com/jetstack/cert-manager/releases/download/v1.8.0/cert-manager.crds.yaml
+  # kubectl delete apiservice v1beta1.webhook.cert-manager.io
+}
+
 minikube_all() {
   safeRunCommand kubectl apply -f kubernetes/namespace.yaml
   safeRunCommand kubectl apply -f kubernetes/pv-photo.yaml
@@ -125,10 +144,10 @@ minikube_all() {
   safeRunCommand kubectl apply -f kubernetes/secret.yaml
   safeRunCommand kubectl apply -f kubernetes/mariadb.yaml
   safeRunCommand kubectl apply -f kubernetes/redis.yaml
-  safeRunCommand minikube_reload_backend
+  #safeRunCommand minikube_reload_backend
   safeRunCommand kubectl apply -f kubernetes/migrate-backend.yaml
   safeRunCommand kubectl apply -f kubernetes/backend.yaml
-  safeRunCommand minikube_reload_frontend
+  #safeRunCommand minikube_reload_frontend
   safeRunCommand kubectl apply -f kubernetes/frontend.yaml
   safeRunCommand kubectl apply -f kubernetes/ingress.yaml
 }
diff --git a/kubernetes/.gitignore b/kubernetes/.gitignore
new file mode 100644
index 000000000..772cb9afd
--- /dev/null
+++ b/kubernetes/.gitignore
@@ -0,0 +1 @@
+cf-secret.yaml
diff --git a/kubernetes/cert-manager.yaml b/kubernetes/cert-manager.yaml
new file mode 100644
index 000000000..656f69414
--- /dev/null
+++ b/kubernetes/cert-manager.yaml
@@ -0,0 +1,34 @@
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: letsencrypt-prod
+spec:
+  acme:
+    email: deathangel908@gmail.com
+    server: https://acme-v02.api.letsencrypt.org/directory
+    privateKeySecretRef:
+      name: letsencrypt-prod
+    solvers:
+    - dns01:
+        cloudflare:
+          email: deathangel908@gmail.com
+          apiTokenSecretRef:
+            name: cloudflare-api-token-secret
+            key: api-token
+---
+
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: pychat-domain
+  namespace: default
+spec:
+  secretName: pychat-tls
+  issuerRef:
+    name: letsencrypt-prod
+
+  duration: 2160h # 90d
+  renewBefore: 720h # 30d before SSL will expire, renew it
+  dnsNames:
+    - "pychat.org"
+    - "*.pychat.org"
diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml
index 85fea57a2..9e1e61211 100644
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/ingress.yaml
@@ -1,13 +1,18 @@
+# helm repo add stable https://charts.helm.sh/stable
+# helm install nginx-ingress stable/nginx-ingress --set controller.publishService.enabled=true
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    cert-manager.io/issuer: "letsencrypt-prod"
   name: ingress
   namespace: pychat
 spec:
   tls:
   - hosts:
     - pychat.org
-    secretName: certificate
+    secretName: pychat-tls
   defaultBackend:
     service:
       name: frontend-service
diff --git a/kubernetes/secret.yaml b/kubernetes/secret.yaml
index 144672ee3..a866b47e1 100644
--- a/kubernetes/secret.yaml
+++ b/kubernetes/secret.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls
 metadata:
-  name: certificate
+  name: self-signed-certificate
   namespace: pychat
 data:
   tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K

From 014d1382862284ad87b53ff76527fc1549aa0b8e Mon Sep 17 00:00:00 2001
From: anastasia-savi <104596018+anastasia-savi@users.noreply.github.com>
Date: Sun, 22 May 2022 14:02:31 +0300
Subject: [PATCH 134/221] change subscribe

---
 .../src/ts/message_handlers/WsMessageHandler.ts     | 13 +++++++------
 frontend/src/ts/utils/pubsub.ts                     |  7 ++++++-
 frontend/src/ts/webrtc/AbstractPeerConnection.ts    |  3 +++
 frontend/src/ts/webrtc/call/CallPeerConnection.ts   |  9 ---------
 frontend/src/ts/webrtc/file/FileHandler.ts          |  6 +++++-
 .../ts/webrtc/file/FileReceiveerPeerConnection.ts   | 11 ++++++-----
 .../src/ts/webrtc/file/FileSenderPeerConnection.ts  |  3 ---
 .../src/ts/webrtc/message/MessagePeerConnection.ts  |  8 ++++----
 8 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index b070deb72..f3a7e0fb2 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -38,17 +38,18 @@ import {LAST_SYNCED, MESSAGES_PER_SEARCH} from "@/ts/utils/consts";
 import {convertMessageModelDtoToModel} from "@/ts/types/converters";
 import {checkIfIdIsMissing, getMissingIds} from "@/ts/utils/pureFunctions";
 import type Subscription from "@/ts/classes/Subscription";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {DeleteMessageWsInBody} from "@common/ws/message/ws-message/delete.message";
+import {SetMessageStatusWsInBody} from "@common/ws/message/set.message.status";
 
 
 export default class WsMessageHandler extends MessageHandler implements MessageSender {
   protected readonly logger: Logger;
 
   protected readonly handlers: HandlerTypes<keyof WsMessageHandler, "ws-message"> = {
-    deleteMessage: <HandlerType<"deleteMessage", "ws-message">> this.deleteMessage,
     editMessage: <HandlerType<"editMessage", "ws-message">> this.editMessage,
     printMessage: <HandlerType<"printMessage", "ws-message">> this.printMessage,
     internetAppear: <HandlerType<"internetAppear", HandlerName>> this.internetAppear,
-    setMessageStatus: <HandlerType<"setMessageStatus", "ws-message">> this.setMessageStatus,
   };
 
   public async internetAppear(m: InternetAppearMessage) {
@@ -296,8 +297,8 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       roomId,
     });
   }
-
-  public deleteMessage(inMessage: DeleteMessageWsInMessage) {
+ @Subscribe<DeleteMessageWsInMessage>()
+  public deleteMessage(inMessage: DeleteMessageWsInBody) {
     let message: MessageModel = this.store.roomsDict[inMessage.roomId].messages[inMessage.id];
     if (!message) {
       this.logger.warn("Unable to find message {} to delete it", inMessage)();
@@ -358,8 +359,8 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       await this.loadMessages(message.roomId, [message.parentMessage!]);
     }
   }
-
-  public async setMessageStatus(m: SetMessageStatusWsInMessage) {
+  @Subscribe<SetMessageStatusWsInMessage>()
+  public async setMessageStatus(m: SetMessageStatusWsInBody) {
     this.store.setMessagesStatus({
       roomId: m.roomId,
       status: m.status,
diff --git a/frontend/src/ts/utils/pubsub.ts b/frontend/src/ts/utils/pubsub.ts
index b48caa69d..0be946337 100644
--- a/frontend/src/ts/utils/pubsub.ts
+++ b/frontend/src/ts/utils/pubsub.ts
@@ -5,7 +5,12 @@ import {
 
 
 export function Subscribe<K extends DefaultWsInMessage<A, H, D>, A extends string = string, H extends HandlerName = HandlerName, D extends any = any>() {
-  return (target: any, memberName: K['action'], propertyDescriptor: TypedPropertyDescriptor<((firstParameter: K["data"]) => void)> | TypedPropertyDescriptor<(() => void)>) => {
+  return (target: any, memberName: K['action'], propertyDescriptor:
+      TypedPropertyDescriptor<((firstParameter: K["data"]) => void)>
+      | TypedPropertyDescriptor<(() => void)>
+      | TypedPropertyDescriptor<(() => Promise<void>)>
+      | TypedPropertyDescriptor<((firstParameter: K["data"]) => Promise<void>)>
+  ) => {
     if (!target.__handlers) {
       target.__handlers = {}
     }
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 85bb2913b..db0768613 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -13,6 +13,8 @@ import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {SendRtcDataWsInMessage} from "@common/ws/message/peer-connection/send.rtc.data";
 
 
 export default abstract class AbstractPeerConnection {
@@ -186,6 +188,7 @@ export default abstract class AbstractPeerConnection {
   // Destroy(Des)
 
   // This event comes from websocket from server, which is created by another PC
+  @Subscribe<SendRtcDataWsInMessage>()
   public async sendRtcData(message: SendRtcDataWsInBody) {
     if (!this.connectedToRemote) {
       this.logger.warn("Putting sendrtc data event to the queue")();
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 71959a4df..818b23a08 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -24,15 +24,6 @@ import {DestroyCallConnectionWsInMessage} from "@common/ws/message/peer-connecti
 
 
 export default abstract class CallPeerConnection extends AbstractPeerConnection {
-  protected readonly handlers: HandlerTypes<keyof CallPeerConnection, "peerConnection:*"> = {
-    destroy: <HandlerType<"destroy", DestroyPeerConnectionMessage>> this.destroy,
-    login: <HandlerType<"login", LoginMessage>> this.login,
-    streamChanged: <HandlerType<"streamChanged", "peerConnection:*">> this.streamChanged,
-    connectToRemote: <HandlerType<"connectToRemote", "peerConnection:*">> this.connectToRemote,
-    sendRtcData: <HandlerType<"sendRtcData", "peerConnection:*">> this.sendRtcData,
-    destroyCallConnection: <HandlerType<"destroyCallConnection", "peerConnection:*">> this.destroyCallConnection,
-  };
-
   private audioProcessor: any;
 
   // Ontrack can be triggered multiple time, so call this in order to prevent updaing store multiple time
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index a2c9b5568..7c3000629 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -6,6 +6,8 @@ import FileSenderPeerConnection from "@/ts/webrtc/file/FileSenderPeerConnection"
 import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {FileAndCallTransfer} from "@/ts/webrtc/FileAndCallTransfer";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {ReplyFileWsInBody} from "@common/ws/message/webrtc-transfer/reply.file";
 
 
 export default class FileHandler extends FileAndCallTransfer {
@@ -33,7 +35,9 @@ export default class FileHandler extends FileAndCallTransfer {
     this.store.addSendingFile(payload);
   }
 
-  public replyFile(message: ReplyFileWsInMessage) {
+
+  @Subscribe<ReplyFileWsInMessage>()
+  public replyFile(message: ReplyFileWsInBody) {
     this.logger.debug("got mes {}", message)();
     new FileSenderPeerConnection(this.roomId, message.connId, message.opponentWsId, this.wsHandler, this.store, this.file, message.userId, this.sub);
   }
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index f6e30dcff..a88958891 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -10,16 +10,15 @@ import {MAX_ACCEPT_FILE_SIZE_WO_FS_API, MAX_BUFFER_SIZE} from "@/ts/utils/consts
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {DestroyFileConnectionWsInBody} from "@common/ws/message/peer-connection/destroy.file.connection";
 
 
 export default class FileReceiverPeerConnection extends FilePeerConnection {
   protected readonly handlers: HandlerTypes<keyof FileReceiverPeerConnection, "peerConnection:*"> = {
-    sendRtcData: <HandlerType<"sendRtcData", "peerConnection:*">> this.sendRtcData,
-    retryFile: <HandlerType<"retryFile", "peerConnection:*">> this.retryFile,
     retryFileReply: <HandlerType<"retryFileReply", "peerConnection:*">> this.retryFileReply,
     acceptFileReply: <HandlerType<"acceptFileReply", "peerConnection:*">> this.acceptFileReply,
     declineFileReply: <HandlerType<"declineFileReply", "peerConnection:*">> this.declineFileReply,
-    destroyFileConnection: <HandlerType<"destroyFileConnection", "peerConnection:*">> this.destroyFileConnection,
   };
 
   private readonly fileSize: number;
@@ -83,7 +82,8 @@ export default class FileReceiverPeerConnection extends FilePeerConnection {
     this.waitForAnswer();
   }
 
-  public destroyFileConnection(message: DestroyFileConnectionWsInMessage) {
+  @Subscribe<DestroyFileConnectionWsInMessage>()
+  public destroyFileConnection(message: DestroyFileConnectionWsInBody) {
     const payload: SetReceivingFileStatus = {
       error: null,
       status: FileTransferStatus.DECLINED_BY_OPPONENT,
@@ -94,7 +94,8 @@ export default class FileReceiverPeerConnection extends FilePeerConnection {
     this.unsubscribeAndRemoveFromParent();
   }
 
-  public retryFile(message: RetryFileWsInMessage) {
+  @Subscribe<RetryFileWsInMessage>()
+  public retryFile() {
     const payload: SetReceivingFileStatus = {
       error: null,
       status: FileTransferStatus.IN_PROGRESS,
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index f64d3f7df..6f5cd5af3 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -16,9 +16,6 @@ import {DestroyFileConnectionWsInBody} from "@common/ws/message/peer-connection/
 
 export default class FileSenderPeerConnection extends FilePeerConnection {
   protected readonly handlers: HandlerTypes<keyof FileSenderPeerConnection, "peerConnection:*"> = {
-    destroyFileConnection: <HandlerType<"destroyFileConnection", "peerConnection:*">> this.destroyFileConnection,
-    acceptFile: <HandlerType<"acceptFile", "peerConnection:*">> this.acceptFile,
-    sendRtcData: <HandlerType<"sendRtcData", "peerConnection:*">> this.sendRtcData,
     declineSending: <HandlerType<"declineSending", "peerConnection:*">> this.declineSending,
   };
 
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 76464db29..cef6bb7d1 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -28,13 +28,14 @@ import {messageModelToP2p, p2pMessageToModel} from "@/ts/types/converters";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Subscription from "@/ts/classes/Subscription";
+import {Subscribe} from "@/ts/utils/pubsub";
+import {SetMessageStatusWsInBody, SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
 
 
 export default abstract class MessagePeerConnection extends AbstractPeerConnection implements MessageSupplier {
   connectedToRemote: boolean = true;
 
   protected readonly handlers: HandlerTypes<keyof MessagePeerConnection, "peerConnection:*"> = {
-    sendRtcData: <HandlerType<"sendRtcData", "peerConnection:*">> this.sendRtcData,
     checkDestroy: <HandlerType<"checkDestroy", "peerConnection:*">> this.checkDestroy,
     syncP2pMessage: <HandlerType<"syncP2pMessage", "peerConnection:*">> this.syncP2pMessage,
     sendSetMessagesStatus: <HandlerType<"sendSetMessagesStatus", "peerConnection:*">> this.sendSetMessagesStatus,
@@ -45,7 +46,6 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
   private readonly p2pHandlers: P2PHandlerTypes<keyof MessagePeerConnection> = {
     exchangeMessageInfoRequest: <P2PHandlerType<"exchangeMessageInfoRequest">> this.exchangeMessageInfoRequest,
     sendNewP2PMessage: <P2PHandlerType<"sendNewP2PMessage">> this.sendNewP2PMessage,
-    setMessageStatus: <P2PHandlerType<"setMessageStatus">> this.setMessageStatus,
   };
 
   private readonly messageProc: P2PMessageProcessor;
@@ -102,8 +102,8 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
       messagesIds: payload.messageIds,
     });
   }
-
-  public async setMessageStatus(m: SetMessageStatusRequest) {
+  @Subscribe<SetMessageStatusWsInMessage>()
+  public async setMessageStatus(m: SetMessageStatusWsInBody) {
     this.store.setMessagesStatus({
       roomId: this.roomId,
       status: m.status,

From 428c6ee34bff8814de62956f8aef8267bd947aab Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 14:22:28 +0300
Subject: [PATCH 135/221] ingress.yaml

---
 download_content.sh     | 6 +++---
 kubernetes/ingress.yaml | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/download_content.sh b/download_content.sh
index 3377ef9fe..ff1986674 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -117,9 +117,9 @@ minikube_delete_all() {
 }
 
 minikube_nginx() {
-  qphn.eUnHF6FRD7
-  helm repo add stable https://charts.helm.sh/stable
-  helm install nginx-ingress stable/nginx-ingress --set controller.publishService.enabled=true
+   helm repo add stable https://charts.helm.sh/stable
+   helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+   helm install nginx-ingress ingress-nginx/ingress-nginx
 }
 minikube_certificate() {
   # Profile → API Tokens → Create Token.  https://dash.cloudflare.com/profile/api-tokens Permissions: Zone — DNS — Edit, Zone — Zone — Read; Zone Resources: Include — All Zones
diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml
index 9e1e61211..60ff013a5 100644
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/ingress.yaml
@@ -1,14 +1,12 @@
-# helm repo add stable https://charts.helm.sh/stable
-# helm install nginx-ingress stable/nginx-ingress --set controller.publishService.enabled=true
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.class: nginx
     cert-manager.io/issuer: "letsencrypt-prod"
   name: ingress
   namespace: pychat
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - pychat.org

From 5da52759361fa0db0b4bde70283faf7b56fff366 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 14:25:35 +0300
Subject: [PATCH 136/221] Fixed namespace

---
 kubernetes/cert-manager.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/cert-manager.yaml b/kubernetes/cert-manager.yaml
index 656f69414..30efb6c60 100644
--- a/kubernetes/cert-manager.yaml
+++ b/kubernetes/cert-manager.yaml
@@ -21,7 +21,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: pychat-domain
-  namespace: default
+  namespace: pychat
 spec:
   secretName: pychat-tls
   issuerRef:

From 470257fab11c06f977595e1b3ad83d5edac963e8 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 15:39:10 +0300
Subject: [PATCH 137/221] Deployed pychat.org

---
 README.md                                     | 50 +++++++++++++++++++
 download_content.sh                           |  2 +-
 kubernetes/backend-secret.yaml                | 10 ++++
 kubernetes/backend.yaml                       |  2 +-
 kubernetes/cert-manager.yaml                  |  1 +
 kubernetes/mariadb.yaml                       |  2 +-
 kubernetes/migrate-backend.yaml               |  2 +-
 ...cret.yaml => self-signed-certificate.yaml} | 12 -----
 8 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100644 kubernetes/backend-secret.yaml
 rename kubernetes/{secret.yaml => self-signed-certificate.yaml} (97%)

diff --git a/README.md b/README.md
index 99d0f4e5e..adb8b552c 100644
--- a/README.md
+++ b/README.md
@@ -513,6 +513,56 @@ In order to setup continuous delivery via github:
 Cmnd_Alias RESTART_TORNADO = /usr/bin/systemctl restart tornado
 http ALL=(ALL) NOPASSWD: RESTART_TORNADO
 ``` 
+# Kubernetes example with [linode](https://www.linode.com/).
+ 1. Go to linode dashboard, kubernetes -> create cluster, if it's not created yet.
+ 2. After provisioning has finished, download `kubectl-config.yaml` from the linode dashboard and place it either at `~/.kube/config` or do export KUBECONFIG=/file/path . Verify that you can access the cluster with `kubectl get nodes`
+ 3. Install nginx controller:
+ - Download chart repo and chart `helm repo add stable https://charts.helm.sh/stable`
+ - `helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx`
+ - Installing ingress controller: `helm install nginx-ingress ingress-nginx/ingress-nginx`. You should see load-banancer on your admin dashboard now.
+ - Specify load-balancer ip address in your DNS provider.
+ 4. If you don't have ssl certificate, lets use letsencrypt and certmanager to generate it for us.
+ 4.1 Install cert-manager
+ - kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml
+ - helm repo add jetstack https://charts.jetstack.io
+ - helm repo update
+ - helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f -
+ 4.2 Generate cloudflare token
+ - In clodflare dashboard: Profile → API Tokens → Create Token.  https://dash.cloudflare.com/profile/api-tokens Permissions: Zone — DNS — Edit, Zone — Zone — Read; Zone Resources: Include — All Zones
+ - put token into `kubernetes/cf-secret-yaml`
+```yaml
+ apiVersion: v1
+kind: Secret
+metadata:
+  name: cloudflare-api-token-secret
+  namespace: pychat
+type: Opaque
+stringData:
+  api-token: cf-api-token
+```
+ - `kubectl apply -f kubernetes/namespace.yaml`
+ - `kubectl apply -f kubernetes/cf-secret.yaml`
+ - `kubectl apply -f kubernetes/cert-manager.yaml`
+ 4.3 Verify certificate
+ - Check that it's created `kubectl get secret pychat-tls -o yaml -n pychat`
+ - save it to file: `echo base64certfrom-tls.cert |base64 -d > lol.cert`
+ - Should give your domain `openssl x509 -in ./lol.cert  -noout -text
+ 5. Build images and upload it to docker registry:
+  - `docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .` 
+  - `docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend .` 
+ 6. Setup kubernetes env:
+  - `kubectl apply -f kubernetes/pv-photo.yaml`
+  - `kubectl apply -f kubernetes/pv-redis.yaml`
+  - `kubectl apply -f kubernetes/pv-mariadb.yaml`
+  - `kubectl apply -f kubernetes/config-map.yaml`
+  - `kubectl apply -f kubernetes/backend-secret.yaml`
+  - `kubectl apply -f kubernetes/mariadb.yaml`
+  - `kubectl apply -f kubernetes/redis.yaml`
+  - `kubectl apply -f kubernetes/migrate-backend.yaml`
+  - `kubectl apply -f kubernetes/backend.yaml`
+  - `kubectl apply -f kubernetes/frontend.yaml`
+  - `kubectl apply -f kubernetes/ingress.yaml`
+
 
 # TODO
 * teleport smileys https://vuejsdevelopers.com/2020/03/16/vue-js-tutorial/#teleporting-content
diff --git a/download_content.sh b/download_content.sh
index ff1986674..3275a9aee 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -141,7 +141,7 @@ minikube_all() {
   safeRunCommand kubectl apply -f kubernetes/pv-redis.yaml
   safeRunCommand kubectl apply -f kubernetes/pv-mariadb.yaml
   safeRunCommand kubectl apply -f kubernetes/config-map.yaml
-  safeRunCommand kubectl apply -f kubernetes/secret.yaml
+  safeRunCommand kubectl apply -f kubernetes/backend-secret.yaml
   safeRunCommand kubectl apply -f kubernetes/mariadb.yaml
   safeRunCommand kubectl apply -f kubernetes/redis.yaml
   #safeRunCommand minikube_reload_backend
diff --git a/kubernetes/backend-secret.yaml b/kubernetes/backend-secret.yaml
new file mode 100644
index 000000000..4543042b7
--- /dev/null
+++ b/kubernetes/backend-secret.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: backend-secret
+  namespace: pychat
+stringData:
+  MYSQL_ROOT_PASSWORD: pypass
+  MYSQL_PASSWORD: pypass
+  MYSQL_USER: pychat
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index 340d858e8..5694c7e52 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -30,7 +30,7 @@ spec:
           value: 'true'
         envFrom:
         - secretRef:
-            name: secret
+            name: backend-secret
         - configMapRef:
             name: config-map
         volumeMounts:
diff --git a/kubernetes/cert-manager.yaml b/kubernetes/cert-manager.yaml
index 30efb6c60..f2cb12af0 100644
--- a/kubernetes/cert-manager.yaml
+++ b/kubernetes/cert-manager.yaml
@@ -2,6 +2,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: letsencrypt-prod
+  namespace: pychat
 spec:
   acme:
     email: deathangel908@gmail.com
diff --git a/kubernetes/mariadb.yaml b/kubernetes/mariadb.yaml
index 5f17f4975..d11a8665f 100644
--- a/kubernetes/mariadb.yaml
+++ b/kubernetes/mariadb.yaml
@@ -32,7 +32,7 @@ spec:
           value: utf8mb4_general_ci
         envFrom:
         - secretRef:
-            name: secret
+            name: backend-secret
         - configMapRef:
             name: config-map
         volumeMounts:
diff --git a/kubernetes/migrate-backend.yaml b/kubernetes/migrate-backend.yaml
index edea7ebc1..aea09ecb0 100644
--- a/kubernetes/migrate-backend.yaml
+++ b/kubernetes/migrate-backend.yaml
@@ -12,7 +12,7 @@ spec:
         image: deathangel908/pychat-backend
         envFrom:
         - secretRef:
-            name: secret
+            name: backend-secret
         - configMapRef:
             name: config-map
         command: ["yarn",  "migrate"]
diff --git a/kubernetes/secret.yaml b/kubernetes/self-signed-certificate.yaml
similarity index 97%
rename from kubernetes/secret.yaml
rename to kubernetes/self-signed-certificate.yaml
index a866b47e1..1b890074d 100644
--- a/kubernetes/secret.yaml
+++ b/kubernetes/self-signed-certificate.yaml
@@ -1,15 +1,3 @@
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: secret
-  namespace: pychat
-data:
-  MYSQL_ROOT_PASSWORD: cHlwYXNz
-  MYSQL_PASSWORD: cHlwYXNz
-  MYSQL_USER: cHljaGF0
----
-
 apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls

From 123b0801371e89e440e7ab2c4336ce4dcfe419e1 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 16:17:03 +0300
Subject: [PATCH 138/221] Fixed node versions

---
 .github/workflows/frontend.yml                |  2 +-
 .github/workflows/newback.yml                 |  2 +-
 common/.nvmrc                                 |  2 +-
 common/package.json                           |  2 +-
 frontend/.nvmrc                               |  2 +-
 frontend/package.json                         |  3 +
 frontend/src/ts/message_handlers/WsHandler.ts | 86 ++++++-------------
 .../ts/message_handlers/WsMessageHandler.ts   | 21 ++---
 frontend/src/ts/types/model.ts                |  4 +
 kubernetes/DockerfileBackend                  |  2 +-
 kubernetes/DockerfileFrontend                 |  2 +-
 newback/.nvmrc                                |  2 +-
 newback/package.json                          |  2 +-
 13 files changed, 51 insertions(+), 81 deletions(-)

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 244d4099d..baf75aa66 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: '14.17'
+          node-version: 'v16.15'
       - name: Cache multiple paths
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/newback.yml b/.github/workflows/newback.yml
index df101ef39..382ab0ac6 100644
--- a/.github/workflows/newback.yml
+++ b/.github/workflows/newback.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: 'v16.14'
+          node-version: 'v16.15'
       - name: Cache multiple paths
         uses: actions/cache@v2
         with:
diff --git a/common/.nvmrc b/common/.nvmrc
index 89eb257ef..04c9e2bf6 100644
--- a/common/.nvmrc
+++ b/common/.nvmrc
@@ -1 +1 @@
-v16.14
+v16.15
diff --git a/common/package.json b/common/package.json
index 948dba0e9..df7f33c97 100644
--- a/common/package.json
+++ b/common/package.json
@@ -11,7 +11,7 @@
     "lint:fix": "eslint --fix --ext .ts src"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=16.0.0 <17"
   },
   "dependencies": {
     "lines-logger": "^2.1.2",
diff --git a/frontend/.nvmrc b/frontend/.nvmrc
index 898c8715b..04c9e2bf6 100644
--- a/frontend/.nvmrc
+++ b/frontend/.nvmrc
@@ -1 +1 @@
-14.17
+v16.15
diff --git a/frontend/package.json b/frontend/package.json
index 50e1d58f7..830acb790 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -24,6 +24,9 @@
   "bugs": {
     "url": "https://github.com/akoidan/pychat/issues"
   },
+  "engines": {
+    "node": ">=16.0.0 <17"
+  },
   "homepage": "https://github.com/akoidan/pychat#readme",
   "devDependencies": {
     "@babel/types": "^7.17.0",
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index c0865ecd0..b83355e49 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -12,37 +12,30 @@ import type {AddInviteWsInMessage} from "@common/ws/message/room/add.invite";
 import type {AddRoomWsInMessage} from "@common/ws/message/room/add.room";
 import type {SaveChannelSettingsWsInMessage} from "@common/ws/message/room/save.channel.settings";
 import type {ShowITypeWsOutMessage} from "@common/ws/message/room/show.i.type";
-import type {
-  WebRtcSetConnectionIdBody,
-  WebRtcSetConnectionIdMessage,
-} from "@common/ws/message/sync/set.connection.id";
+
 import type {PingWsInMessage} from "@common/ws/message/ws/ping";
+import {PingWsInBody} from "@common/ws/message/ws/ping";
+import type {SetProfileImageWsInMessage} from "@common/ws/message/ws/set.profile.image";
 import {SetProfileImageWsInBody} from "@common/ws/message/ws/set.profile.image";
-import type {
-  SetProfileImageWsInMessage,
-} from "@common/ws/message/ws/set.profile.image";
-import {
-  SetSettingBody,
-} from "@common/ws/message/ws/set.settings";
 import type {
   SetSettingsMessage,
-
   SetSettingsWsOutMessage,
 } from "@common/ws/message/ws/set.settings";
-import type {SetUserProfileMessage, SetUserProfileWsOutMessage} from "@common/ws/message/ws/set.user.profile";
-import type {SetWsIdWsOutMessage,
-  SetWsIdWsInMessage} from "@common/ws/message/ws/set.ws.id";
-import {UserProfileChangedWsInBody} from "@common/ws/message/ws/user.profile.changed";
+import {SetSettingBody} from "@common/ws/message/ws/set.settings";
 import type {
-  UserProfileChangedWsInMessage,
-} from "@common/ws/message/ws/user.profile.changed";
+  SetUserProfileMessage,
+  SetUserProfileWsOutMessage,
+} from "@common/ws/message/ws/set.user.profile";
+import {SetUserProfileBody} from "@common/ws/message/ws/set.user.profile";
+import type {SetWsIdWsInMessage} from "@common/ws/message/ws/set.ws.id";
+import {SetWsIdBody} from "@common/ws/message/ws/set.ws.id";
+import type {UserProfileChangedWsInMessage} from "@common/ws/message/ws/user.profile.changed";
+import {UserProfileChangedWsInBody} from "@common/ws/message/ws/user.profile.changed";
 import type {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutMessage,
-} from "@common/ws/message/ws-message/print.message";
-import type {GetCountryCodeWsInMessage,
+  GetCountryCodeWsInBody,
+  GetCountryCodeWsInMessage,
   GetCountryCodeWsOutMessage,
-  GetCountryCodeWsInBody} from "@common/ws/message/get.country.code";
+} from "@common/ws/message/get.country.code";
 import type {SetMessageStatusWsOutMessage} from "@common/ws/message/set.message.status";
 import type {
   SyncHistoryWsInMessage,
@@ -54,11 +47,6 @@ import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.app
 import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
 import type {PubSetRoomsMessage} from "@/ts/types/messages/inner/pub.set.rooms";
 
-import type {ShowITypeWsOutMessage} from "@common/ws/message/show.i.type";
-import type {
-  PrintMessageWsInMessage,
-  PrintMessageWsOutMessage,
-} from "@common/ws/message/print.message";
 import {
   CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT,
   CONNECTION_RETRY_TIME,
@@ -71,7 +59,6 @@ import type {
   LogLevel,
 } from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
 import type {
   CurrentUserInfoWoImage,
   CurrentUserSettingsModel,
@@ -93,39 +80,28 @@ import {WsMessageProcessor} from "@/ts/message_handlers/WsMessageProcessor";
 
 import type Subscription from "@/ts/classes/Subscription";
 import {Subscribe} from "@/ts/utils/pubsub";
-import {SetUserProfileBody} from "@common/ws/message/ws/set.user.profile";
-import {
-  SetWsIdBody,
-} from "@common/ws/message/ws/set.ws.id";
-import {Gender} from "@common/model/enum/gender";
-import {PingWsInBody} from "@common/ws/message/ws/ping";
 import type {
   PongWsInMessage,
   PongWsOutMessage,
 } from "@common/ws/message/ws/pong";
 import type {
-  OfferFileBody,
-  OfferFileWsOutMessage,
-
-  OfferFileResponse,
-
   OfferFileRequest,
   OfferFileResponse,
 } from "@common/ws/message/webrtc/offer.file";
-import {RequestWsOutMessage} from "@common/ws/common";
 import type {
   OfferCallRequestWsOutMessage,
   OfferCallResponseWsInMessage,
 } from "@common/ws/message/webrtc/offer.call";
 import type {AcceptFileWsOutMessage} from "@common/ws/message/webrtc-transfer/accept.file";
 import type {DestroyCallConnectionWsOutMessage} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {WsState} from "@/ts/types/model";
+import type {WebRtcSetConnectionIdBody} from "@common/model/webrtc.base";
+import type {PrintMessageWsInMessage,
+  PrintMessageWsOutMessage,
+  PrintMessageWsOutBody} from "@common/ws/message/ws-message/print.message";
 
 
-enum WsState {
-  NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
-}
-
-export default class WsHandler extends MessageHandler implements MessageSupplier {
+export default class WsHandler implements MessageSupplier {
   protected readonly logger: Logger;
 
   /*
@@ -288,25 +264,11 @@ export default class WsHandler extends MessageHandler implements MessageSupplier
   }
 
   public async sendPrintMessage(
-    content: string,
-    roomId: number,
-    files: number[],
-    id: number,
-    timeDiff: number,
-    parentMessage: number | null,
-    tags: Record<string, number>,
-    giphies: GiphyDto[],
+    data: PrintMessageWsOutBody,
   ): Promise<PrintMessageWsInMessage> {
-    return this.messageProc.sendToServerAndAwait<PrintMessageWsOutMessage, "printMessage">({
-      files,
-      id,
-      timeDiff,
+    return this.messageProc.sendToServerAndAwait<PrintMessageWsOutMessage, PrintMessageWsInMessage>({
       action: "printMessage",
-      content,
-      tags,
-      parentMessage,
-      roomId,
-      giphies,
+      data,
     });
   }
 
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index f3a7e0fb2..3d76b2f57 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -11,7 +11,6 @@ import type {SyncHistoryWsInMessage} from "@common/ws/message/sync.history";
 import type {HandlerName} from "@common/ws/common";
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 
-import type {PrintMessageWsInMessage} from "@common/ws/message/print.message";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Api from "@/ts/message_handlers/Api";
 import MessageHandler from "@/ts/message_handlers/MesageHandler";
@@ -194,16 +193,16 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
     const fileIds: number[] = this.getFileIdsFromMessage(storeMessage);
     const giphies: GiphyDto[] = this.getGiphiesFromMessage(storeMessage);
     if (storeMessage.id < 0 && storeMessage.content) {
-      const a: PrintMessageWsInMessage = await this.ws.sendPrintMessage(
-        storeMessage.content,
+      const a: PrintMessageWsInMessage = await this.ws.sendPrintMessage({
+        content: storeMessage.content,
         roomId,
-        fileIds,
-        storeMessage.id,
-        Date.now() - storeMessage.time,
-        storeMessage.parentMessage,
-        {...storeMessage.tags},
+        files: fileIds,
+        id: storeMessage.id,
+        timeDiff: Date.now() - storeMessage.time,
+        parentMessage: storeMessage.parentMessage,
+        tags: {...storeMessage.tags},
         giphies,
-      );
+      });
       const rmMes: RoomMessageIds = {
         messageId: storeMessage.id,
         roomId: storeMessage.roomId,
@@ -297,7 +296,8 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       roomId,
     });
   }
- @Subscribe<DeleteMessageWsInMessage>()
+
+  @Subscribe<DeleteMessageWsInMessage>()
   public deleteMessage(inMessage: DeleteMessageWsInBody) {
     let message: MessageModel = this.store.roomsDict[inMessage.roomId].messages[inMessage.id];
     if (!message) {
@@ -359,6 +359,7 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
       await this.loadMessages(message.roomId, [message.parentMessage!]);
     }
   }
+
   @Subscribe<SetMessageStatusWsInMessage>()
   public async setMessageStatus(m: SetMessageStatusWsInBody) {
     this.store.setMessagesStatus({
diff --git a/frontend/src/ts/types/model.ts b/frontend/src/ts/types/model.ts
index 92ebbe0d8..7b5447089 100644
--- a/frontend/src/ts/types/model.ts
+++ b/frontend/src/ts/types/model.ts
@@ -8,6 +8,10 @@ export enum GrowlType {
   SUCCESS = "col-success", INFO = "col-info", ERROR = "col-error",
 }
 
+export enum WsState {
+  NOT_INITED, TRIED_TO_CONNECT, CONNECTION_IS_LOST, CONNECTED,
+}
+
 export interface GrowlModel {
   id: number;
   html: string;
diff --git a/kubernetes/DockerfileBackend b/kubernetes/DockerfileBackend
index 42d73b3b4..c0fdef46d 100644
--- a/kubernetes/DockerfileBackend
+++ b/kubernetes/DockerfileBackend
@@ -3,7 +3,7 @@
 # https://stackoverflow.com/a/49478889/3872976
 # minikube tunnel service/backend-service
 # chrome http://192.168.49.2:30002/
-FROM node:16.15.0-alpine3.15
+FROM node:16.15-alpine3.15
 
 ENV NODE_CONFIG_TS_ENV=production
 WORKDIR /usr/src/newback
diff --git a/kubernetes/DockerfileFrontend b/kubernetes/DockerfileFrontend
index 697181f78..a208fd807 100644
--- a/kubernetes/DockerfileFrontend
+++ b/kubernetes/DockerfileFrontend
@@ -2,7 +2,7 @@
 # docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .
 # https://stackoverflow.com/a/49478889/3872976
 # minikube tunnel service/backend-service
-FROM node:14.17-alpine3.14 as builder
+FROM node:16.15-alpine3.15 as builder
 
 WORKDIR /usr/src/frontend
 # for yarn install to clone via git in package.json
diff --git a/newback/.nvmrc b/newback/.nvmrc
index 89eb257ef..04c9e2bf6 100644
--- a/newback/.nvmrc
+++ b/newback/.nvmrc
@@ -1 +1 @@
-v16.14
+v16.15
diff --git a/newback/package.json b/newback/package.json
index 791265fcc..dcdfc4329 100644
--- a/newback/package.json
+++ b/newback/package.json
@@ -20,7 +20,7 @@
     "db:flush:all": "yarn create:database && yarn migrate && yarn create:migrate:prod"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=16.0.0 <17"
   },
   "dependencies": {
     "@nestjs-modules/mailer": "^1.6.1",

From 7224e241b58480d2eb6b76fab0497c9e7e413480 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 18:54:00 +0300
Subject: [PATCH 139/221] Changed pull policy for remote

---
 .excludeMAIN            | 1 +
 kubernetes/backend.yaml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.excludeMAIN b/.excludeMAIN
index 9739d6f4b..7606e33fc 100644
--- a/.excludeMAIN
+++ b/.excludeMAIN
@@ -20,6 +20,7 @@ backend/chat/production.py
 backend/chat/settings.py
 backend/photos/*
 kubernetes/cf-secret.yaml
+kubernetes/oldbackend-secret.yaml
 !backend/photos/.gitkeep
 newback/photos/*
 !newback/photos/.gitkeep
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index 5694c7e52..28ce9b4ba 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -17,7 +17,8 @@ spec:
     spec:
       containers:
       - name: backend
-        imagePullPolicy: IfNotPresent
+        # change this to IfNotPresent
+        imagePullPolicy: Always
         image: deathangel908/pychat-backend
         ports:
         - containerPort: 8888

From 04e0bd319657f0640e3f868311f7be2cfae38008 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 19:18:10 +0300
Subject: [PATCH 140/221] kube

---
 kubernetes/.gitignore   | 1 -
 kubernetes/backend.yaml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 kubernetes/.gitignore

diff --git a/kubernetes/.gitignore b/kubernetes/.gitignore
deleted file mode 100644
index 772cb9afd..000000000
--- a/kubernetes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cf-secret.yaml
diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index 28ce9b4ba..22d50c407 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: backend
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: backend

From 5b031c99b090b57a0ed07036a1a48f527551d8fa Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 19:40:07 +0300
Subject: [PATCH 141/221] Added static host url

---
 kubernetes/frontend.yaml |  3 ++-
 kubernetes/ingress.yaml  | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/kubernetes/frontend.yaml b/kubernetes/frontend.yaml
index f6faf62ff..173ec55f4 100644
--- a/kubernetes/frontend.yaml
+++ b/kubernetes/frontend.yaml
@@ -17,7 +17,8 @@ spec:
     spec:
       containers:
       - name: frontend
-        imagePullPolicy: IfNotPresent
+        # change to IfNotPresent for minikube
+        imagePullPolicy: Always
         image: deathangel908/pychat-frontend
         ports:
         - containerPort: 80
diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml
index 60ff013a5..02f2f025e 100644
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/ingress.yaml
@@ -11,12 +11,24 @@ spec:
   - hosts:
     - pychat.org
     secretName: pychat-tls
+  - hosts:
+    - static.pychat.org
+    secretName: pychat-tls
   defaultBackend:
     service:
       name: frontend-service
       port:
         number: 80
   rules:
+ - host: static.pychat.org
+    http:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: frontend-service
+            port:
+              number: 80
   - host: pychat.org
     http:
       paths:

From 73ff4babfbd4eec6a5e0628cd42db25824c992f3 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 19:47:59 +0300
Subject: [PATCH 142/221] Fixed ingress but doesnt work yet

---
 kubernetes/ingress.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml
index 02f2f025e..48ebb854d 100644
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/ingress.yaml
@@ -20,8 +20,9 @@ spec:
       port:
         number: 80
   rules:
- - host: static.pychat.org
+  - host: static.pychat.org
     http:
+      paths:
       - path: /
         pathType: Prefix
         backend:

From 6690cff911980d7c5aa6480d2bc5855db0a981aa Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 19:52:27 +0300
Subject: [PATCH 143/221] fix

---
 kubernetes/ingress.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml
index 48ebb854d..a8d5fd766 100644
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/ingress.yaml
@@ -10,8 +10,6 @@ spec:
   tls:
   - hosts:
     - pychat.org
-    secretName: pychat-tls
-  - hosts:
     - static.pychat.org
     secretName: pychat-tls
   defaultBackend:

From 534c95fad51e927e570991946094db351d78e468 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 20:22:06 +0300
Subject: [PATCH 144/221] Added shared volume

---
 kubernetes/frontend.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kubernetes/frontend.yaml b/kubernetes/frontend.yaml
index 173ec55f4..315a4bd8d 100644
--- a/kubernetes/frontend.yaml
+++ b/kubernetes/frontend.yaml
@@ -26,6 +26,13 @@ spec:
           httpGet:
             path: /
             port: 80
+        volumeMounts:
+          - mountPath: "/srv/http/photo"
+            name: photo
+      volumes:
+        - name: photo
+          persistentVolumeClaim:
+            claimName: pvc-photo
 ---
 apiVersion: v1
 kind: Service

From c73cd5ed86abf1d0e8095e11f45529be7d9be086 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 20:23:05 +0300
Subject: [PATCH 145/221] blah

---
 kubernetes/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/frontend.yaml b/kubernetes/frontend.yaml
index 315a4bd8d..3f6ee0b79 100644
--- a/kubernetes/frontend.yaml
+++ b/kubernetes/frontend.yaml
@@ -27,7 +27,7 @@ spec:
             path: /
             port: 80
         volumeMounts:
-          - mountPath: "/srv/http/photo"
+          - mountPath: "/srv/http/photos"
             name: photo
       volumes:
         - name: photo

From e796317254042fe209a5d0739500eede5047ba08 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 20:33:27 +0300
Subject: [PATCH 146/221] Fixed returning photo

---
 kubernetes/backend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
index 22d50c407..08ccfe8dd 100644
--- a/kubernetes/backend.yaml
+++ b/kubernetes/backend.yaml
@@ -35,7 +35,7 @@ spec:
         - configMapRef:
             name: config-map
         volumeMounts:
-          - mountPath: "/usr/src/newback/photo"
+          - mountPath: "/usr/src/newback/photos"
             name: photo
       volumes:
         - name: photo

From 3fccaba494a7b7aeff1125169576f080634dee4f Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 22 May 2022 21:07:12 +0300
Subject: [PATCH 147/221] removed ssh build into rpi

---
 .github/workflows/backend.yml  | 25 ---------------------
 .github/workflows/frontend.yml | 41 ----------------------------------
 README.md                      |  2 --
 3 files changed, 68 deletions(-)
 delete mode 100644 .github/workflows/backend.yml
 delete mode 100644 .github/workflows/frontend.yml

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
deleted file mode 100644
index b395fe35e..000000000
--- a/.github/workflows/backend.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: BE:pychat.org
-
-on:
-  push:
-    branches: [ master ]
-    paths: 
-      - 'backend/**'
-
-jobs:
-  update_backend:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Setup ssh
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.ID_RSA }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -p ${{ secrets.PORT }} ${{ secrets.HOST }} >> ~/.ssh/known_hosts
-      - name: Update master branch
-        run: ssh ${{ secrets.SSH_USER }}@${{ secrets.HOST }} -p ${{ secrets.PORT }} "cd /srv/http/pychat/backend && git pull"
-      - name: Update database
-        run: ssh ${{ secrets.SSH_USER }}@${{ secrets.HOST }} -p ${{ secrets.PORT }} "cd /srv/http/pychat/backend && ./.venv/bin/python ./manage.py makemigrations && ./.venv/bin/python ./manage.py migrate"
-      - name: Restart tornado service
-        run: ssh ${{ secrets.SSH_USER }}@${{ secrets.HOST }} -p ${{ secrets.PORT }} "sudo /usr/bin/systemctl restart tornado"
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
deleted file mode 100644
index baf75aa66..000000000
--- a/.github/workflows/frontend.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: FE:pychat.org
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'frontend/**'
-
-jobs:
-  upload-frontend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2-beta
-        with:
-          node-version: 'v16.15'
-      - name: Cache multiple paths
-        uses: actions/cache@v2
-        with:
-          path: |
-            frontend/node_modules
-            frontend/yarn-cache
-          key: ${{ runner.os }}-${{ hashFiles('frontend/yarn.lock') }}
-      - name: Install npm dependencies
-        run: |
-          cd frontend 
-          yarn config set cache-folder `pwd`/yarn-cache
-          yarn install --frozen-lockfile
-      - name: Build static files
-        run: cd frontend && mv build/pychat.org.json build/production.json && yarn build
-
-      - name: Setup ssh
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.ID_RSA }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -p ${{ secrets.PORT }} ${{ secrets.HOST }} >> ~/.ssh/known_hosts
-      - name: Copy static files to destination server
-        run: |
-          cd frontend
-          tar c dist/ | ssh ${{ secrets.SSH_USER }}@${{ secrets.HOST }} -p ${{ secrets.PORT }} "rm -rf /srv/http/pychat/frontend/dist && tar x -C /srv/http/pychat/frontend/"
diff --git a/README.md b/README.md
index adb8b552c..629525531 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
 [![Docker](https://github.com/akoidan/pychat/actions/workflows/docker.yml/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions/workflows/docker.yml)
-[![Upload Frontend pychat.org](https://github.com/akoidan/pychat/workflows/FE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3AFE%3Apychat.org)
-[![Refresh backend pychat.org](https://github.com/akoidan/pychat/workflows/BE:pychat.org/badge.svg?branch=master)](https://github.com/akoidan/pychat/actions?query=workflow%3ABE%3Apychat.org)
 [![Newbackend test](https://github.com/akoidan/pychat/workflows/NEWBE:pychat.org/badge.svg)](https://github.com/akoidan/pychat/actions)
 [![Codecov](https://codecov.io/gh/akoidan/pychat/branch/nestjs/graph/badge.svg?token=aQlNwbpTIw)](https://codecov.io/gh/akoidan/pychat)
 # Live demo: [pychat.org](https://pychat.org/), [video](https://www.youtube.com/watch?v=m6sJ-blTidg)

From f7208c70f31ffe5cebbd5888aad8cee976fae172 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 23 May 2022 22:26:35 +0300
Subject: [PATCH 148/221] Refactored some messsages

---
 .dockerignore                                     |  1 +
 common/src/ws/message/room/add.room.ts            | 12 +++++++++++-
 frontend/src/ts/message_handlers/MessageHelper.ts |  4 +++-
 frontend/src/ts/message_handlers/WsHandler.ts     | 12 ++++--------
 frontend/src/ts/types/messages/inner/scroll.ts    |  3 +++
 frontend/src/ts/types/messages/inner/sync.p2p.ts  |  2 +-
 .../messages/peer-connection/accept.file.reply.ts |  4 ++--
 .../messages/peer-connection/check.destroy.ts     |  3 +++
 frontend/src/ts/utils/htmlApi.ts                  |  4 +++-
 frontend/src/ts/webrtc/AbstractPeerConnection.ts  |  3 ++-
 frontend/src/ts/webrtc/FileAndCallTransfer.ts     | 10 +++++++++-
 frontend/src/ts/webrtc/call/CallHandler.ts        |  1 -
 frontend/src/ts/webrtc/call/CallPeerConnection.ts |  7 ++++---
 .../ts/webrtc/call/CallSenderPeerConnection.ts    |  7 +++++--
 frontend/src/ts/webrtc/file/FileHandler.ts        |  4 ----
 .../ts/webrtc/file/FileReceiveerPeerConnection.ts | 12 +++++++-----
 .../ts/webrtc/file/FileSenderPeerConnection.ts    |  5 ++---
 .../ts/webrtc/message/MessagePeerConnection.ts    | 15 +++++++++++----
 .../ts/webrtc/message/MessageTransferHandler.ts   |  4 ++--
 frontend/src/vue/chat/chatbox/ChatBox.vue         | 10 ++++------
 frontend/src/vue/pages/ChannelSettings.vue        |  6 ++++--
 frontend/src/vue/parts/CreateRoom.vue             | 14 ++++++++------
 .../out.message/set.ws.id.transformer.ts          |  4 ++--
 .../modules/api/websocket/websocket.gateway.ts    | 12 +++++-------
 24 files changed, 96 insertions(+), 63 deletions(-)
 create mode 100644 frontend/src/ts/types/messages/inner/scroll.ts
 create mode 100644 frontend/src/ts/types/messages/peer-connection/check.destroy.ts

diff --git a/.dockerignore b/.dockerignore
index 6ee5f01ff..266c0e25c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,6 +7,7 @@
 !newback/tsconfig.build.json
 !newback/tsconfig.json
 !newback/src
+!backup.sh
 !common/src
 !kubernetes
 !frontend/src
diff --git a/common/src/ws/message/room/add.room.ts b/common/src/ws/message/room/add.room.ts
index 5c8c47c9d..579f630d7 100644
--- a/common/src/ws/message/room/add.room.ts
+++ b/common/src/ws/message/room/add.room.ts
@@ -1,4 +1,4 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
+import type {DefaultWsInMessage, DefaultWsOutMessage} from "@common/ws/common";
 import {AddRoomBase} from "@common/model/ws.base";
 
 export interface AddRoomWsInBody extends AddRoomBase {
@@ -6,4 +6,14 @@ export interface AddRoomWsInBody extends AddRoomBase {
   channelId: number;
 }
 
+export interface AddRoomWsOutBody {
+  name: string | null;
+  p2p: boolean;
+  volume: number;
+  notifications: boolean;
+  users: number[];
+  channelId: number | null;
+}
+
 export type AddRoomWsInMessage = DefaultWsInMessage<"addRoom", "room", AddRoomWsInBody>;
+export type AddRoomWsOutMessage = DefaultWsOutMessage<"addRoom", AddRoomWsOutBody>;
diff --git a/frontend/src/ts/message_handlers/MessageHelper.ts b/frontend/src/ts/message_handlers/MessageHelper.ts
index a806fb28d..01d7bb6b7 100644
--- a/frontend/src/ts/message_handlers/MessageHelper.ts
+++ b/frontend/src/ts/message_handlers/MessageHelper.ts
@@ -8,6 +8,7 @@ import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {resolveMediaUrl} from "@/ts/utils/htmlApi";
 import type Subscription from "@/ts/classes/Subscription";
+import type {ScrollInnerSystemMessage} from "@/ts/types/messages/inner/scroll";
 
 export class MessageHelper {
   private readonly logger: Logger;
@@ -37,9 +38,10 @@ export class MessageHelper {
   }
 
   public processAnyMessage() {
-    this.messageBus.notify({
+    this.messageBus.notify<ScrollInnerSystemMessage>({
       action: "scroll",
       handler: "*",
+      data: null,
     });
   }
 
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index b83355e49..21895661e 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -9,7 +9,7 @@ import type {MessageStatus} from "@common/model/enum/message.status";
 import type {MessagesResponseMessage} from "@common/model/ws.base";
 import type {AddChannelWsInMessage} from "@common/ws/message/room/add.channel";
 import type {AddInviteWsInMessage} from "@common/ws/message/room/add.invite";
-import type {AddRoomWsInMessage} from "@common/ws/message/room/add.room";
+import type {AddRoomWsInMessage, AddRoomWsInBody} from "@common/ws/message/room/add.room";
 import type {SaveChannelSettingsWsInMessage} from "@common/ws/message/room/save.channel.settings";
 import type {ShowITypeWsOutMessage} from "@common/ws/message/room/show.i.type";
 
@@ -99,6 +99,7 @@ import type {WebRtcSetConnectionIdBody} from "@common/model/webrtc.base";
 import type {PrintMessageWsInMessage,
   PrintMessageWsOutMessage,
   PrintMessageWsOutBody} from "@common/ws/message/ws-message/print.message";
+import {AddRoomWsOutBody} from "@common/ws/message/room/add.room";
 
 
 export default class WsHandler implements MessageSupplier {
@@ -295,15 +296,10 @@ export default class WsHandler implements MessageSupplier {
     });
   }
 
-  public async sendAddRoom(name: string | null, p2p: boolean, volume: number, notifications: boolean, users: number[], channelId: number | null): Promise<AddRoomWsInMessage> {
+  public async sendAddRoom(data: AddRoomWsOutBody): Promise<AddRoomWsInBody> {
     return this.messageProc.sendToServerAndAwait({
-      users,
-      name,
-      p2p,
-      channelId,
+      data,
       action: "addRoom",
-      volume,
-      notifications,
     });
   }
 
diff --git a/frontend/src/ts/types/messages/inner/scroll.ts b/frontend/src/ts/types/messages/inner/scroll.ts
new file mode 100644
index 000000000..3d51616bd
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/scroll.ts
@@ -0,0 +1,3 @@
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+
+export type ScrollInnerSystemMessage = DefaultInnerSystemMessage<"scroll", "*", null>;
diff --git a/frontend/src/ts/types/messages/inner/sync.p2p.ts b/frontend/src/ts/types/messages/inner/sync.p2p.ts
index 4cc43f2fa..a8e9d2717 100644
--- a/frontend/src/ts/types/messages/inner/sync.p2p.ts
+++ b/frontend/src/ts/types/messages/inner/sync.p2p.ts
@@ -3,4 +3,4 @@ import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 export interface SyncP2PMessageBody {
   id: number;
 }
-export type SyncP2PMessage = DefaultInnerSystemMessage<"syncP2pMessage", "peerConnection:*", SyncP2PMessageBody>;
+export type SyncP2PInnerSystemMessage = DefaultInnerSystemMessage<"syncP2pMessage", "peerConnection:*", SyncP2PMessageBody>;
diff --git a/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts b/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
index 26c95a2ed..9b59699f0 100644
--- a/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
+++ b/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
@@ -1,3 +1,3 @@
-import type {DefaultWsInMessage} from "@common/ws/common";
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
-export type AcceptFileReply = DefaultWsInMessage<"acceptFileReply", "peerConnection:*", null>;
+export type CheckDestroyInnerSystemMessage = DefaultInnerSystemMessage<"checkDestroy", "peerConnection:*", null>;
diff --git a/frontend/src/ts/types/messages/peer-connection/check.destroy.ts b/frontend/src/ts/types/messages/peer-connection/check.destroy.ts
new file mode 100644
index 000000000..f27cf6765
--- /dev/null
+++ b/frontend/src/ts/types/messages/peer-connection/check.destroy.ts
@@ -0,0 +1,3 @@
+import {DeclineSendingMessage} from "@/ts/types/messages/peer-connection/decline.sending";
+
+DeclineSendingMessage
diff --git a/frontend/src/ts/utils/htmlApi.ts b/frontend/src/ts/utils/htmlApi.ts
index 408ca6bd4..782440fde 100644
--- a/frontend/src/ts/utils/htmlApi.ts
+++ b/frontend/src/ts/utils/htmlApi.ts
@@ -13,6 +13,7 @@ import {MEDIA_API_URL, webpSupported} from "@/ts/utils/runtimeConsts";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GIFObject} from "giphy-api";
 import type Subscription from "@/ts/classes/Subscription";
+import type {ScrollInnerSystemMessage} from "@/ts/types/messages/inner/scroll";
 
 
 const tmpCanvasContext: CanvasRenderingContext2D = document.createElement("canvas").getContext("2d")!; // TODO why is it not safe?
@@ -401,9 +402,10 @@ export function setImageFailEvents(e: HTMLElement, bus: Subscription) {
         this.className += " failed";
       };
       img.onload = function() {
-        bus.notify({
+        bus.notify<ScrollInnerSystemMessage>({
           action: "scroll",
           handler: "*",
+          data: null,
         });
       };
     }(r[i]));
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index db0768613..2d2c51b75 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -15,6 +15,7 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
 import {Subscribe} from "@/ts/utils/pubsub";
 import {SendRtcDataWsInMessage} from "@common/ws/message/peer-connection/send.rtc.data";
+import {ConnectToRemoteMessageBody} from "@/ts/types/messages/inner/connect.to.remote";
 
 
 export default abstract class AbstractPeerConnection {
@@ -97,7 +98,7 @@ export default abstract class AbstractPeerConnection {
     this.sub.notify(message);
   }
 
-  public createPeerConnection(arg?: ConnectToRemoteMessage) {
+  public createPeerConnection(arg?: ConnectToRemoteMessageBody) {
     this.logger.log("Creating RTCPeerConnection with config {} {}", WEBRTC_RUNTIME_CONFIG, this.pc_constraints)();
     if (!window.RTCPeerConnection) {
       throw Error("Your browser doesn't support RTCPeerConnection");
diff --git a/frontend/src/ts/webrtc/FileAndCallTransfer.ts b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
index b368952a9..5897cc9de 100644
--- a/frontend/src/ts/webrtc/FileAndCallTransfer.ts
+++ b/frontend/src/ts/webrtc/FileAndCallTransfer.ts
@@ -1,8 +1,16 @@
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
 import Subscription from "@/ts/classes/Subscription";
+import type {
+  CheckTransferDestroyMessage,
+} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {
+  CheckTransferDestroyBody,
+} from "@/ts/types/messages/inner/check.transfer.destroy";
+import {Subscribe} from "@/ts/utils/pubsub";
 
 export abstract class FileAndCallTransfer extends BaseTransferHandler {
-  public checkTransferDestroy(payload: CheckTransferDestroyMessage) {
+  @Subscribe<CheckTransferDestroyMessage>()
+  public checkTransferDestroy(payload: CheckTransferDestroyBody) {
     this.logger.log("Checkign destroy")();
     if (this.connectionId && this.sub.getNumberOfSubscribers(Subscription.allPeerConnectionsForTransfer(this.connectionId)) === 0) {
       this.onDestroy();
diff --git a/frontend/src/ts/webrtc/call/CallHandler.ts b/frontend/src/ts/webrtc/call/CallHandler.ts
index 9098f6ab3..02d10120c 100644
--- a/frontend/src/ts/webrtc/call/CallHandler.ts
+++ b/frontend/src/ts/webrtc/call/CallHandler.ts
@@ -60,7 +60,6 @@ export default class CallHandler extends FileAndCallTransfer {
     return this.store.roomsDict[this.roomId].callInfo;
   }
 
-  @Subscribe<CheckTransferDestroyMessage>()
   public checkTransferDestroy(payload: CheckTransferDestroyBody) {
     this.removeOpponent(payload.wsOpponentId);
     super.checkTransferDestroy(payload);
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 818b23a08..9f4ad9a16 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -21,6 +21,7 @@ import {ConnectToRemoteMessageBody} from "@/ts/types/messages/inner/connect.to.r
 import {LoginMessage} from "@/ts/types/messages/inner/login";
 import {Subscribe} from "@/ts/utils/pubsub";
 import {DestroyCallConnectionWsInMessage} from "@common/ws/message/peer-connection/destroy.call.connection";
+import {ChangeStreamMessageBody} from "@/ts/types/messages/inner/change.stream";
 
 
 export default abstract class CallPeerConnection extends AbstractPeerConnection {
@@ -94,7 +95,7 @@ export default abstract class CallPeerConnection extends AbstractPeerConnection
   }
 
 
-  public connectToRemote(stream: ConnectToRemoteMessage) {
+  public connectToRemote(stream: ConnectToRemoteMessageBody) {
     this.logger.log("Connect to remote")();
     this.store.roomsDict[this.roomId].callInfo.calls[this.opponentWsId].connected = true;
     this.connectedToRemote = true;
@@ -120,7 +121,7 @@ export default abstract class CallPeerConnection extends AbstractPeerConnection
     }
   }
 
-  public createPeerConnection(event: ConnectToRemoteMessage) {
+  public createPeerConnection(event: ConnectToRemoteMessageBody) {
     super.createPeerConnection();
 
     if (this.streamTrackApi === "stream") {
@@ -148,7 +149,7 @@ export default abstract class CallPeerConnection extends AbstractPeerConnection
     this.changeStreams(event.stream);
   }
 
-  public streamChanged(payload: ChangeStreamMessage) {
+  public streamChanged(payload: ChangeStreamMessageBody) {
     this.logger.log("onStreamChanged {}", payload)();
     if (this.pc) {
       this.changeStreams(payload.newStream);
diff --git a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
index 8da221e45..21f6822bc 100644
--- a/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallSenderPeerConnection.ts
@@ -1,9 +1,12 @@
-import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
+import type {
+  ConnectToRemoteMessage,
+  ConnectToRemoteMessageBody
+} from "@/ts/types/messages/inner/connect.to.remote";
 import CallPeerConnection from "@/ts/webrtc/call/CallPeerConnection";
 
 
 export default class CallSenderPeerConnection extends CallPeerConnection {
-  public async connectToRemote(stream: ConnectToRemoteMessage) {
+  public async connectToRemote(stream: ConnectToRemoteMessageBody) {
     super.connectToRemote(stream);
     await this.createOffer();
   }
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 7c3000629..435d45a39 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -11,10 +11,6 @@ import {ReplyFileWsInBody} from "@common/ws/message/webrtc-transfer/reply.file";
 
 
 export default class FileHandler extends FileAndCallTransfer {
-  protected readonly handlers: HandlerTypes<keyof FileHandler, "webrtcTransfer:*"> = {
-    replyFile: <HandlerType<"replyFile", "webrtcTransfer:*">> this.replyFile,
-    checkTransferDestroy: <HandlerType<"checkTransferDestroy", "webrtcTransfer:*">> this.checkTransferDestroy,
-  };
 
   private readonly file: File;
 
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index a88958891..a97dda689 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -12,14 +12,12 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type Subscription from "@/ts/classes/Subscription";
 import {Subscribe} from "@/ts/utils/pubsub";
 import {DestroyFileConnectionWsInBody} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {RetryFileReply} from "@/ts/types/messages/peer-connection/retry.file.reply";
+import {AcceptFileReply} from "@/ts/types/messages/peer-connection/accept.file.reply";
+import {DeclineFileReply} from "@/ts/types/messages/peer-connection/decline.file.reply";
 
 
 export default class FileReceiverPeerConnection extends FilePeerConnection {
-  protected readonly handlers: HandlerTypes<keyof FileReceiverPeerConnection, "peerConnection:*"> = {
-    retryFileReply: <HandlerType<"retryFileReply", "peerConnection:*">> this.retryFileReply,
-    acceptFileReply: <HandlerType<"acceptFileReply", "peerConnection:*">> this.acceptFileReply,
-    declineFileReply: <HandlerType<"declineFileReply", "peerConnection:*">> this.declineFileReply,
-  };
 
   private readonly fileSize: number;
 
@@ -46,6 +44,7 @@ export default class FileReceiverPeerConnection extends FilePeerConnection {
     return this.store.roomsDict[this.roomId].receivingFiles[this.connectionId];
   }
 
+  @Subscribe<RetryFileReply>()
   public retryFileReply() {
     const now = Date.now();
     if (now - this.retryFileSend > 5000) {
@@ -54,6 +53,7 @@ export default class FileReceiverPeerConnection extends FilePeerConnection {
     }
   }
 
+  @Subscribe<DeclineFileReply>()
   public declineFileReply() {
     this.wsHandler.destroyFileConnection(this.connectionId, "decline");
     const rf: SetReceivingFileStatus = {
@@ -65,6 +65,8 @@ export default class FileReceiverPeerConnection extends FilePeerConnection {
     this.unsubscribeAndRemoveFromParent();
   }
 
+
+  @Subscribe<AcceptFileReply>()
   public async acceptFileReply() {
     try {
       await this.initFileSystemApi();
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index 6f5cd5af3..e7b3f4325 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -12,12 +12,10 @@ import type Subscription from "@/ts/classes/Subscription";
 import {Subscribe} from "@/ts/utils/pubsub";
 import {AcceptFileWsInBody} from "@common/ws/message/webrtc-transfer/accept.file";
 import {DestroyFileConnectionWsInBody} from "@common/ws/message/peer-connection/destroy.file.connection";
+import {DeclineSendingMessage} from "@/ts/types/messages/peer-connection/decline.sending";
 
 
 export default class FileSenderPeerConnection extends FilePeerConnection {
-  protected readonly handlers: HandlerTypes<keyof FileSenderPeerConnection, "peerConnection:*"> = {
-    declineSending: <HandlerType<"declineSending", "peerConnection:*">> this.declineSending,
-  };
 
   private readonly file: File;
 
@@ -169,6 +167,7 @@ export default class FileSenderPeerConnection extends FilePeerConnection {
     this.store.setSendingFileStatus(payload);
   }
 
+  @Subscribe<DeclineSendingMessage>()
   public declineSending() {
     this.unsubscribeAndRemoveFromParent();
     const ssfs: SetSendingFileStatus = {
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index cef6bb7d1..e456fb48d 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,6 +1,9 @@
 import {MessageStatus} from "@common/model/enum/message.status";
 import type {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import type {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import type {
+  SyncP2PInnerSystemMessage,
+  SyncP2PMessageBody
+} from "@/ts/types/messages/inner/sync.p2p";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 import type WsHandler from "@/ts/message_handlers/WsHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
@@ -30,13 +33,14 @@ import loggerFactory from "@/ts/instances/loggerFactory";
 import type Subscription from "@/ts/classes/Subscription";
 import {Subscribe} from "@/ts/utils/pubsub";
 import {SetMessageStatusWsInBody, SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
+import {CheckDestroyInnerSystemMessage} from "@/ts/types/messages/peer-connection/accept.file.reply";
+import {SendSetMessagesStatusMessageBody} from "@/ts/types/messages/inner/send.set.messages.status";
 
 
 export default abstract class MessagePeerConnection extends AbstractPeerConnection implements MessageSupplier {
   connectedToRemote: boolean = true;
 
   protected readonly handlers: HandlerTypes<keyof MessagePeerConnection, "peerConnection:*"> = {
-    checkDestroy: <HandlerType<"checkDestroy", "peerConnection:*">> this.checkDestroy,
     syncP2pMessage: <HandlerType<"syncP2pMessage", "peerConnection:*">> this.syncP2pMessage,
     sendSetMessagesStatus: <HandlerType<"sendSetMessagesStatus", "peerConnection:*">> this.sendSetMessagesStatus,
   };
@@ -89,7 +93,8 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     return this.store.roomsDict[this.roomId];
   }
 
-  public async sendSetMessagesStatus(payload: SendSetMessagesStatusMessage) {
+  @Subscribe<SendSetMessagesStatusMessage>()
+  public async sendSetMessagesStatus(payload: SendSetMessagesStatusMessageBody) {
     const responseToRequest: SetMessageStatusRequest = {
       action: "setMessageStatus",
       messagesIds: payload.messageIds,
@@ -151,7 +156,8 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     this.messageProc.sendToServer(response);
   }
 
-  public async syncP2pMessage(payload: SyncP2PMessage) {
+  @Subscribe<SyncP2PInnerSystemMessage>()
+  public async syncP2pMessage(payload: SyncP2PMessageBody) {
     if (this.isChannelOpened) {
       this.logger.debug("Syncing message {}", payload.id)();
       const message: SendNewP2PMessage = {
@@ -176,6 +182,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     }
   }
 
+  @Subscribe<CheckDestroyInnerSystemMessage>()
   public checkDestroy() {
 
     /*
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index e41e5ec74..555c2c23d 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -1,6 +1,6 @@
 import {MessageStatus} from "@common/model/enum/message.status";
 import type {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
-import type {SyncP2PMessage} from "@/ts/types/messages/inner/sync.p2p";
+import type {SyncP2PInnerSystemMessage} from "@/ts/types/messages/inner/sync.p2p";
 import BaseTransferHandler from "@/ts/webrtc/BaseTransferHandler";
 import type {MessageSender, UserIdConn} from "@/ts/types/types";
 import type {RoomModel} from "@/ts/types/model";
@@ -60,7 +60,7 @@ export default class MessageTransferHandler extends BaseTransferHandler implemen
   async syncMessage(roomId: number, messageId: number): Promise<void> {
     this.messageHelper.processAnyMessage();
     if (this.state === "ready") {
-      const payload: SyncP2PMessage = {
+      const payload: SyncP2PInnerSystemMessage = {
         action: "syncP2pMessage",
         handler: Subscription.allPeerConnectionsForTransfer(this.connectionId!),
         id: messageId,
diff --git a/frontend/src/vue/chat/chatbox/ChatBox.vue b/frontend/src/vue/chat/chatbox/ChatBox.vue
index 9f78ff3a8..60ea440a8 100644
--- a/frontend/src/vue/chat/chatbox/ChatBox.vue
+++ b/frontend/src/vue/chat/chatbox/ChatBox.vue
@@ -113,8 +113,8 @@ import ChatThread from "@/vue/chat/message/ChatThread.vue";
 import ChatTextArea from "@/vue/chat/textarea/ChatTextArea.vue";
 import ChatShowUserTyping from "@/vue/chat/chatbox/ChatShowUserTyping.vue";
 import {isMobile} from "@/ts/utils/runtimeConsts";
-import type MessageHandler from "@/ts/message_handlers/MesageHandler";
 import {Subscribe} from "@/ts/utils/pubsub";
+import {ScrollInnerSystemMessage} from "@/ts/types/messages/inner/scroll";
 
 
 @Component({
@@ -164,8 +164,6 @@ export default class ChatBox extends Vue {
   @Ref()
   private readonly chatboxSearch!: HTMLElement;
 
-  private handler!: MessageHandler;
-
   public get id() {
     return this.room.id;
   }
@@ -275,17 +273,17 @@ export default class ChatBox extends Vue {
     }
   }
 
-  @Subscribe<any>() // TODO does this work?
+  @Subscribe<ScrollInnerSystemMessage>()
   scroll() {
     this.onEmitScroll();
   }
 
   created() {
-    this.$messageBus.subscribe("*", this.scroll);
+    this.$messageBus.subscribe("*", this);
   }
 
   destroyed() {
-    this.$messageBus.unsubscribe("*", this.scroll);
+    this.$messageBus.unsubscribe("*", this);
   }
 
   keyDownLoadUp(e: KeyboardEvent) {
diff --git a/frontend/src/vue/pages/ChannelSettings.vue b/frontend/src/vue/pages/ChannelSettings.vue
index c4798933c..970095ebe 100644
--- a/frontend/src/vue/pages/ChannelSettings.vue
+++ b/frontend/src/vue/pages/ChannelSettings.vue
@@ -112,7 +112,7 @@ import AppSubmit from "@/vue/ui/AppSubmit.vue";
 import PickUser from "@/vue/parts/PickUser.vue";
 import AppInputRange from "@/vue/ui/AppInputRange.vue";
 import AppCheckbox from "@/vue/ui/AppCheckbox.vue";
-import {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
+import type {RouterNavigateMessage} from "@/ts/types/messages/inner/router.navigate";
 
 @Component({
   name: "ChannelSettings",
@@ -229,7 +229,9 @@ export default class ChannelSettings extends Vue {
     const message1: RouterNavigateMessage = {
       handler: "router",
       action: "navigate",
-      to: `/chat/${ALL_ROOM_ID}`,
+      data: {
+        to: `/chat/${ALL_ROOM_ID}`,
+      },
     };
     this.$messageBus.notify(message1);
   }
diff --git a/frontend/src/vue/parts/CreateRoom.vue b/frontend/src/vue/parts/CreateRoom.vue
index 350e6c98a..5d8037bfc 100644
--- a/frontend/src/vue/parts/CreateRoom.vue
+++ b/frontend/src/vue/parts/CreateRoom.vue
@@ -131,12 +131,14 @@ export default class CreateRoom extends Vue {
       throw Error("Please add user");
     }
     const e = await this.$ws.sendAddRoom(
-      this.roomName ? this.roomName : null,
-      this.isPublic ? false : this.p2p,
-      this.sound,
-      !this.p2p && this.notifications,
-      this.currentUsers,
-      this.parentChannelId ? this.parentChannelId : null,
+      {
+        users: this.currentUsers,
+        name: this.roomName ? this.roomName : null,
+        p2p: this.isPublic ? false : this.p2p,
+        channelId: this.parentChannelId ? this.parentChannelId : null,
+        volume: this.sound,
+        notifications: !this.p2p && this.notifications,
+      },
     );
     this.$router.replace(`/chat/${e.id}`);
   }
diff --git a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
index 4aba318e7..1a836727e 100644
--- a/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
+++ b/newback/src/data/transformers/out.message/set.ws.id.transformer.ts
@@ -7,7 +7,7 @@ import {
   getRoomsOnline,
   getTransformRoomDto,
 } from "@/data/transformers/model/room.transformer";
-import type {SetWsIdWsOutMessage} from "@common/ws/message/ws/set.ws.id";
+import {SetWsIdWsInMessage} from "@common/ws/message/ws/set.ws.id";
 
 
 export function transformSetWsId(
@@ -21,7 +21,7 @@ export function transformSetWsId(
     user,
     time,
   }: TransformSetWsIdDataParams
-): SetWsIdWsOutMessage {
+): SetWsIdWsInMessage {
   const roomsOnlineDict = getRoomsOnline(allUsersInTheseRooms);
   return {
     action: "setWsId",
diff --git a/newback/src/modules/api/websocket/websocket.gateway.ts b/newback/src/modules/api/websocket/websocket.gateway.ts
index d69051ea8..6d8ea23a9 100644
--- a/newback/src/modules/api/websocket/websocket.gateway.ts
+++ b/newback/src/modules/api/websocket/websocket.gateway.ts
@@ -2,8 +2,7 @@ import type {SyncHistoryWsInBody} from "@common/ws/message/sync.history";
 import {SyncHistoryWsOutBody} from "@common/ws/message/sync.history";
 import {ShowITypeWsOutBody} from "@common/ws/message/room/show.i.type";
 import {PrintMessageWsOutBody} from "@common/ws/message/ws-message/print.message";
-import type {GetCountryCodeWsInMessage,} from "@common/ws/message/get.country.code";
-import {GetCountryCodeWsOutBody,} from "@common/ws/message/get.country.code";
+import type {GetCountryCodeWsInBody} from "@common/ws/message/get.country.code";
 import type {OnGatewayConnection} from "@nestjs/websockets";
 import {
   MessageBody,
@@ -12,9 +11,9 @@ import {
   WebSocketServer,
 } from "@nestjs/websockets";
 import {IncomingMessage} from "http";
-import {WebSocket,} from "ws";
+import {WebSocket} from "ws";
 import type {OnWsClose} from "@/data/types/internal";
-import {SendToClientPubSubMessage,} from "@/data/types/internal";
+import {SendToClientPubSubMessage} from "@/data/types/internal";
 import {
   Logger,
   UseFilters,
@@ -107,9 +106,8 @@ export class WebsocketGateway implements OnGatewayConnection, OnWsClose, NestGat
 
   @SubscribeMessage("getCountryCode")
   public async getCountryCode(
-    @MessageBody() data: GetCountryCodeWsOutBody,
-      @WsContext() context: WebSocketContextData
-  ): Promise<GetCountryCodeWsInMessage["data"]> {
+    @WsContext() context: WebSocketContextData
+  ): Promise<GetCountryCodeWsInBody> {
     return this.wsDataService.getCountryCodes(context);
   }
 }

From ef8825a54848e417bbbe343e673f0cc19c389625 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 24 May 2022 11:39:50 +0300
Subject: [PATCH 149/221] Fixed spacing

---
 frontend/src/ts/types/messages/p2p/index.ts   | 5 +++++
 frontend/src/ts/types/messages/p2pMessages.ts | 1 -
 kubernetes/pv-mariadb.yaml                    | 4 ++--
 kubernetes/pv-photo.yaml                      | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/ts/types/messages/p2p/index.ts

diff --git a/frontend/src/ts/types/messages/p2p/index.ts b/frontend/src/ts/types/messages/p2p/index.ts
new file mode 100644
index 000000000..4441959c0
--- /dev/null
+++ b/frontend/src/ts/types/messages/p2p/index.ts
@@ -0,0 +1,5 @@
+export interface DefaultP2pMessage<A extends string> {
+  action: A;
+  resolveCbId?: number;
+  cbId?: number;
+}
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index e36cb997b..4425d55b2 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -15,7 +15,6 @@ export type P2PHandlerTypes<K extends string> = {
 
 export interface DefaultP2pMessage<A extends string> extends DefaultMessage<A> {
   resolveCbId?: number; // If this callback id is present, resolve it
-
 }
 
 
diff --git a/kubernetes/pv-mariadb.yaml b/kubernetes/pv-mariadb.yaml
index eda6d4bcf..faf22b941 100644
--- a/kubernetes/pv-mariadb.yaml
+++ b/kubernetes/pv-mariadb.yaml
@@ -6,7 +6,7 @@ spec:
   accessModes:
     - ReadWriteOnce
   capacity:
-    storage: 1Gi
+    storage: 2Gi
   hostPath:
     path: /data/mariadb
 ---
@@ -20,4 +20,4 @@ spec:
      - ReadWriteOnce
    resources:
      requests:
-       storage: 1Gi
+       storage: 2Gi
diff --git a/kubernetes/pv-photo.yaml b/kubernetes/pv-photo.yaml
index 14fc2fc25..8f4595375 100644
--- a/kubernetes/pv-photo.yaml
+++ b/kubernetes/pv-photo.yaml
@@ -6,7 +6,7 @@ spec:
   accessModes:
     - ReadWriteMany
   capacity:
-    storage: 5Gi
+    storage: 15Gi
   hostPath:
     path: /data/photo
 ---
@@ -20,6 +20,6 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: 5Gi
+      storage: 15Gi
   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
   volumeName: pv-photo

From 07a46dfca1cd552bf9c17422cb65b016d53b09ca Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 28 May 2022 10:00:08 +0300
Subject: [PATCH 150/221] Refactored WsHandler and MesageProcessor

---
 frontend/.eslintrc.json                       |   1 +
 .../AbstractMessageProcessor.ts               |  18 +-
 .../message_handlers/P2PMessageProcessor.ts   |   2 +
 frontend/src/ts/message_handlers/WsHandler.ts | 180 +----------------
 .../ts/message_handlers/WsMessageProcessor.ts | 188 +++++++++++++++++-
 .../messages/inner/send.set.message.status.ts |  11 +
 .../messages/p2p/confirm.message.status.ts    |   3 +
 .../messages/p2p/exchange.message.info.ts     |  24 +++
 frontend/src/ts/types/messages/p2p/index.ts   |  20 +-
 .../types/messages/p2p/set.message.status.ts  |   8 +
 frontend/src/ts/types/messages/p2pMessages.ts |  26 +--
 frontend/src/ts/types/types.ts                |   5 -
 frontend/src/ts/utils/pubsub.ts               |  15 ++
 .../webrtc/message/MessagePeerConnection.ts   |  70 ++++---
 .../webrtc/message/MessageTransferHandler.ts  |  12 +-
 15 files changed, 315 insertions(+), 268 deletions(-)
 create mode 100644 frontend/src/ts/types/messages/inner/send.set.message.status.ts
 create mode 100644 frontend/src/ts/types/messages/p2p/confirm.message.status.ts
 create mode 100644 frontend/src/ts/types/messages/p2p/exchange.message.info.ts
 create mode 100644 frontend/src/ts/types/messages/p2p/set.message.status.ts

diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
index 6f4dc42d5..9920d157f 100644
--- a/frontend/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -57,6 +57,7 @@
     "@typescript-eslint/no-non-null-assertion": 0,
     "@typescript-eslint/no-unused-vars-experimental": 0, // doesn't work with vue
     "@typescript-eslint/no-type-alias": 0,
+    "@typescript-eslint/no-parameter-properties": 0,
     "@typescript-eslint/no-magic-numbers": [
       "error",
       {
diff --git a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
index 8d7c1d174..5651660c0 100644
--- a/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/AbstractMessageProcessor.ts
@@ -7,11 +7,9 @@ import type {
 } from "@common/ws/common";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import type {MessageSupplier} from "@/ts/types/types";
-import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 
-export default class AbstractMessageProcessor {
+export default abstract class AbstractMessageProcessor {
   protected readonly callBacks: Record<number, {resolve: Function; reject: Function}> = {};
 
   protected readonly logger: Logger;
@@ -23,17 +21,11 @@ export default class AbstractMessageProcessor {
    */
   protected uniquePositiveMessageId: number = 0;
 
-  protected readonly target: MessageSupplier;
-
-  protected readonly store: DefaultStore;
-
   private readonly loggerIn: Logger;
 
   private readonly loggerOut: Logger;
 
-  public constructor(target: MessageSupplier, store: DefaultStore, label: string) {
-    this.target = target;
-    this.store = store;
+  public constructor(label: string) {
     this.loggerIn = loggerFactory.getLoggerColor(`${label}:in`, "#4c002b");
     this.loggerOut = loggerFactory.getLoggerColor(`${label}:out`, "#4c002b");
     this.logger = loggerFactory.getLoggerColor("mes-proc", "#4c002b");
@@ -60,16 +52,18 @@ export default class AbstractMessageProcessor {
         resolve,
         reject,
       };
-      const isSent = this.target.sendRawTextToServer(jsonMessage);
+      const isSent = this.sendRawTextToServer(jsonMessage);
       if (isSent) {
         this.logData(this.loggerOut, jsonMessage, message)();
       }
     });
   }
 
+  abstract sendRawTextToServer(data: string): boolean;
+
   sendToServer<D>(message: DefaultWsOutMessage<string, D>): boolean {
     const jsonMessage = this.getJsonMessage(message);
-    const isSent = this.target.sendRawTextToServer(jsonMessage);
+    const isSent = this.sendRawTextToServer(jsonMessage);
     if (isSent) {
       this.logData(this.loggerOut, jsonMessage, message)();
     }
diff --git a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
index 5e887c989..21a74b431 100644
--- a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
@@ -11,4 +11,6 @@ export class P2PMessageProcessor extends AbstractMessageProcessor {
     }
     return false;
   }
+
+  abstract sendRawTextToServer(data: string): boolean;
 }
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsHandler.ts
index 21895661e..ae15e3745 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsHandler.ts
@@ -100,6 +100,7 @@ import type {PrintMessageWsInMessage,
   PrintMessageWsOutMessage,
   PrintMessageWsOutBody} from "@common/ws/message/ws-message/print.message";
 import {AddRoomWsOutBody} from "@common/ws/message/room/add.room";
+import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 
 
 export default class WsHandler implements MessageSupplier {
@@ -113,60 +114,23 @@ export default class WsHandler implements MessageSupplier {
 
   private pingTimeoutFunction: number | null = null;
 
-  private ws: WebSocket | null = null;
-
-  private noServerPingTimeout: any;
-
   private readonly store: DefaultStore;
 
   private readonly sessionHolder: SessionHolder;
 
-  private listenWsTimeout: number | null = null;
-
-  private readonly API_URL: string;
-
   private readonly messageProc: WsMessageProcessor;
 
-  private wsState: WsState = WsState.NOT_INITED;
-
-  /*
-   * This.dom = {
-   *   onlineStatus: $('onlineStatus'),
-   *   onlineClass: 'online',
-   *   offlineClass: OFFLINE_CLASS
-   * };
-   * private progressInterval = {}; TODO this was commented along with usage, check if it breaks anything
-   */
-  private wsConnectionId = "";
-
   private readonly sub: Subscription;
 
   public constructor(API_URL: string, sessionHolder: SessionHolder, store: DefaultStore, sub: Subscription) {
-    super();
     this.sub = sub;
     this.sub.subscribe("ws", this);
-    this.API_URL = API_URL;
-    this.messageProc = new WsMessageProcessor(this, store, "ws", sub);
+    this.messageProc = new WsMessageProcessor(API_URL, store, "ws", sub);
     this.logger = loggerFactory.getLoggerColor("ws", "#4c002b");
     this.sessionHolder = sessionHolder;
     this.store = store;
   }
 
-  private get wsUrl() {
-    return `${this.API_URL}?id=${this.wsConnectionId}&sessionId=${this.sessionHolder.session}`;
-  }
-
-  sendRawTextToServer(message: string): boolean {
-    if (this.isWsOpen()) {
-      this.ws!.send(message);
-      return true;
-    }
-    return false;
-  }
-
-  public getWsConnectionId() {
-    return this.wsConnectionId;
-  }
 
   public async getCountryCode(): Promise<GetCountryCodeWsInBody> {
     return this.messageProc.sendToServerAndAwait<GetCountryCodeWsOutMessage, GetCountryCodeWsInMessage>({
@@ -374,56 +338,9 @@ export default class WsHandler implements MessageSupplier {
     });
   }
 
-  public async startListening(): Promise<void> {
-    return new Promise((resolve, reject) => {
-      this.logger.log("Starting webSocket")();
-      if (!this.listenWsTimeout && !this.ws) {
-        this.ws = new WebSocket(this.wsUrl);
-        this.ws.onmessage = this.onWsMessage.bind(this);
-        this.ws.onclose = (e) => {
-          setTimeout(() => {
-            reject(Error("Cannot connect to websocket"));
-          });
-          this.onWsClose(e);
-        };
-        this.ws.onopen = () => {
-          setTimeout(resolve);
-          this.onWsOpen();
-        };
-      } else {
-        resolve();
-      }
-    });
-  }
 
   public pingServer() {
     this.sendToServer({action: "ping"}, true);
-
-    /*
-     * TODO not used
-     * this.answerPong();
-     * this.pingTimeoutFunction = setTimeout(() => {
-     *   this.logger.error('Force closing socket coz pong time out')();
-     *   this.ws.close(1000, 'Ping timeout');
-     * }, PING_CLOSE_JS_DELAY);
-     *
-     */
-  }
-
-  @Subscribe<LogoutMessage>()
-  public logout() {
-    const info = [];
-    if (this.listenWsTimeout) {
-      this.listenWsTimeout = null;
-      info.push("purged timeout");
-    }
-    if (this.ws) {
-      this.ws.onclose = null;
-      info.push("closed ws");
-      this.ws.close();
-      this.ws = null;
-    }
-    this.logger.debug("Finished ws: {}", info.join(", "))();
   }
 
   public async sendDeleteRoom(roomId: number) {
@@ -479,9 +396,7 @@ export default class WsHandler implements MessageSupplier {
     });
   }
 
-  public isWsOpen() {
-    return this.ws?.readyState === WebSocket.OPEN;
-  }
+
 
   public sendRtcData(content: RTCIceCandidate | RTCSessionDescriptionInit, connId: string, opponentWsId: string) {
     this.sendToServer({
@@ -567,7 +482,7 @@ export default class WsHandler implements MessageSupplier {
 
   @Subscribe<SetWsIdWsInMessage>()
   public async setWsId(message: SetWsIdBody) {
-    this.wsConnectionId = message.opponentWsId;
+    this.messageProc.setWsConnectionId(message.opponentWsId);
     this.setUserInfo(message.profile);
     this.setUserSettings(message.settings);
     this.setUserImage(message.profile.thumbnail);
@@ -607,7 +522,7 @@ export default class WsHandler implements MessageSupplier {
 
   @Subscribe<PingWsInMessage>()
   public ping(message: PingWsInBody) {
-    this.startNoPingTimeout();
+    this.messageProc.startNoPingTimeout();
     this.sendToServer<PongWsOutMessage>({
       action: "pong",
       data: {
@@ -683,79 +598,8 @@ export default class WsHandler implements MessageSupplier {
    * }
    */
 
-  private onWsOpen() {
-    this.setStatus(true);
-    this.startNoPingTimeout();
-    this.wsState = WsState.CONNECTED;
-    this.logger.debug("Connection has been established")();
-  }
-
-  private onWsMessage(message: MessageEvent) {
-    const data = this.messageProc.parseMessage(message.data);
-    if (data) {
-      this.messageProc.handleMessage(data);
-    }
-  }
-
-  private setStatus(isOnline: boolean) {
-    this.store.setIsOnline(isOnline);
-    this.logger.debug("Setting online to {}", isOnline)();
-  }
-
-  private onWsClose(e: CloseEvent) {
-    this.logger.log("Got onclose event")();
-    this.ws = null;
-    this.setStatus(false);
-    // Tornado drops connection if exception occurs during processing an event we send from WsHandler
-    this.messageProc.onDropConnection(e.code === 1006 ? "Server error" : "Connection to server is lost");
 
-    /*
-     * For (let k in this.progressInterval) {
-     *   this.hideGrowlProgress(k);
-     * }
-     */
-    if (this.noServerPingTimeout) {
-      clearTimeout(this.noServerPingTimeout);
-      this.noServerPingTimeout = null;
-    }
-    const reason = e.reason || e;
-    if (e.code === WS_SESSION_EXPIRED_CODE) {
-      const message = `Server has forbidden request because '${reason}'. Logging out...`;
-      this.logger.error("onWsClose {}", message)();
-      this.store.growlError(message);
-      const message1: LogoutMessage = {
-        action: "logout",
-        handler: "*",
-      };
-      this.sub.notify(message1);
-      return;
-    } else if (this.wsState === WsState.NOT_INITED) {
-      // This.store.growlError( 'Can\'t establish connection with server');
-      this.logger.warn("Chat server is down because {}", reason)();
-      this.wsState = WsState.TRIED_TO_CONNECT;
-    } else if (this.wsState === WsState.CONNECTED) {
-      // This.store.growlError( `Connection to chat server has been lost, because ${reason}`);
-      this.logger.error(
-        "Connection to WebSocket has failed because \"{}\". Trying to reconnect every {}ms",
-        e.reason,
-        CONNECTION_RETRY_TIME,
-      )();
-    }
-    if (this.wsState !== WsState.TRIED_TO_CONNECT) {
-      this.wsState = WsState.CONNECTION_IS_LOST;
-    }
-    // Try to reconnect in 10 seconds
-    this.listenWsTimeout = window.setTimeout(() => {
-      this.listenWS();
-    }, CONNECTION_RETRY_TIME);
-  }
 
-  private listenWS() {
-    this.ws = new WebSocket(this.wsUrl);
-    this.ws.onmessage = this.onWsMessage.bind(this);
-    this.ws.onclose = this.onWsClose.bind(this);
-    this.ws.onopen = this.onWsOpen.bind(this);
-  }
 
   private sendToServer<T extends DefaultWsOutMessage<string, any>>(messageRequest: T, skipGrowl = false): boolean {
     const isSent = this.messageProc.sendToServer<T>(messageRequest);
@@ -765,17 +609,5 @@ export default class WsHandler implements MessageSupplier {
     return isSent;
   }
 
-  private startNoPingTimeout() {
-    if (this.noServerPingTimeout) {
-      clearTimeout(this.noServerPingTimeout);
-      this.logger.debug("Clearing noServerPingTimeout")();
-      this.noServerPingTimeout = null;
-    }
-    this.noServerPingTimeout = setTimeout(() => {
-      if (this.ws) {
-        this.logger.error("Force closing socket coz server didn't ping us")();
-        this.ws.close(1000, "Sever didn't ping us");
-      }
-    }, CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT);
-  }
+
 }
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index c0f6bcaf7..daae19a0a 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -2,16 +2,152 @@ import type {GrowlWsInMessage} from "@common/ws/message/growl.message";
 import type {ResponseWsInMessage} from "@common/ws/common";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type Subscription from "@/ts/classes/Subscription";
-import type {MessageSupplier} from "@/ts/types/types";
+import {
+  CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT,
+  CONNECTION_RETRY_TIME,
+} from "@/ts/utils/consts";
+import {Subscribe} from "@/ts/utils/pubsub";
+import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
+import {WS_SESSION_EXPIRED_CODE} from "@common/consts";
+import {WsState} from "@/ts/types/model";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
+import {SessionHolder} from "@/ts/types/types";
 
 
 export class WsMessageProcessor extends AbstractMessageProcessor {
-  private readonly sub: Subscription;
+  private wsState: WsState = WsState.NOT_INITED;
 
-  public constructor(target: MessageSupplier, store: DefaultStore, label: string, sub: Subscription) {
-    super(target, store, label);
-    this.sub = sub;
+  private listenWsTimeout: number | null = null;
+
+  private ws: WebSocket | null = null;
+
+  private noServerPingTimeout: number | null = null;
+
+  private readonly wsConnectionId = "";
+
+  public constructor(
+    private readonly apiUrl: string,
+    private readonly sub: Subscription,
+    private readonly store: DefaultStore,
+    private readonly sessionHolder: SessionHolder,
+  ) {
+    super("ws");
+  }
+
+  private onWsClose(e: CloseEvent) {
+    this.logger.log("Got onclose event")();
+    this.ws = null;
+    this.setStatus(false);
+    // Tornado drops connection if exception occurs during processing an event we send from WsHandler
+    this.onDropConnection(e.code === 1006 ? "Server error" : "Connection to server is lost");
+
+    /*
+     * For (let k in this.progressInterval) {
+     *   this.hideGrowlProgress(k);
+     * }
+     */
+    if (this.noServerPingTimeout) {
+      clearTimeout(this.noServerPingTimeout);
+      this.noServerPingTimeout = null;
+    }
+    const reason = e.reason || e;
+    if (e.code === WS_SESSION_EXPIRED_CODE) {
+      const message = `Server has forbidden request because '${reason}'. Logging out...`;
+      this.logger.error("onWsClose {}", message)();
+      this.store.growlError(message);
+      const message1: LogoutMessage = {
+        action: "logout",
+        handler: "*",
+      };
+      this.sub.notify(message1);
+      return;
+    } else if (this.wsState === WsState.NOT_INITED) {
+      // This.store.growlError( 'Can\'t establish connection with server');
+      this.logger.warn("Chat server is down because {}", reason)();
+      this.wsState = WsState.TRIED_TO_CONNECT;
+    } else if (this.wsState === WsState.CONNECTED) {
+      // This.store.growlError( `Connection to chat server has been lost, because ${reason}`);
+      this.logger.error(
+        "Connection to WebSocket has failed because \"{}\". Trying to reconnect every {}ms",
+        e.reason,
+        CONNECTION_RETRY_TIME,
+      )();
+    }
+    if (this.wsState !== WsState.TRIED_TO_CONNECT) {
+      this.wsState = WsState.CONNECTION_IS_LOST;
+    }
+    // Try to reconnect in 10 seconds
+    this.listenWsTimeout = window.setTimeout(() => {
+      this.listenWS();
+    }, CONNECTION_RETRY_TIME);
+  }
+
+  private setStatus(isOnline: boolean) {
+    this.store.setIsOnline(isOnline);
+    this.logger.debug("Setting online to {}", isOnline)();
+  }
+
+  private onWsOpen() {
+    this.setStatus(true);
+    this.startNoPingTimeout();
+    this.wsState = WsState.CONNECTED;
+    this.logger.debug("Connection has been established")();
+  }
+
+  private listenWS() {
+    this.ws = new WebSocket(this.wsUrl);
+    this.ws.onmessage = this.onWsMessage.bind(this);
+    this.ws.onclose = this.onWsClose.bind(this);
+    this.ws.onopen = this.onWsOpen.bind(this);
+  }
+
+  private onWsMessage(message: MessageEvent) {
+    const data = this.parseMessage(message.data);
+    if (data) {
+      this.handleMessage(data);
+    }
+  }
+
+  @Subscribe<LogoutMessage>()
+  public logout() {
+    const info = [];
+    if (this.listenWsTimeout) {
+      this.listenWsTimeout = null;
+      info.push("purged timeout");
+    }
+    if (this.ws) {
+      this.ws.onclose = null;
+      info.push("closed ws");
+      this.ws.close();
+      this.ws = null;
+    }
+    this.logger.debug("Finished ws: {}", info.join(", "))();
+  }
+
+  private startNoPingTimeout() {
+    if (this.noServerPingTimeout) {
+      clearTimeout(this.noServerPingTimeout);
+      this.logger.debug("Clearing noServerPingTimeout")();
+      this.noServerPingTimeout = null;
+    }
+    this.noServerPingTimeout = setTimeout(() => {
+      if (this.ws) {
+        this.logger.error("Force closing socket coz server didn't ping us")();
+        this.ws.close(1000, "Sever didn't ping us");
+      }
+    }, CLIENT_NO_SERVER_PING_CLOSE_TIMEOUT) as unknown as number;
+  }
+
+  sendRawTextToServer(message: string): boolean {
+    if (this.isWsOpen()) {
+      this.ws!.send(message);
+      return true;
+    }
+    return false;
+  }
+
+  public isWsOpen() {
+    return this.ws?.readyState === WebSocket.OPEN;
   }
 
   public handleMessage<D>(data: unknown) {
@@ -19,7 +155,7 @@ export class WsMessageProcessor extends AbstractMessageProcessor {
     const growlErrorMessage: GrowlWsInMessage = data as GrowlWsInMessage;
     if (responseWsInMessage.cbId &&
       this.callBacks[responseWsInMessage.cbId] &&
-      (!responseWsInMessage.cbBySender || responseWsInMessage.cbBySender === this.target.getWsConnectionId())
+      (!responseWsInMessage.cbBySender || responseWsInMessage.cbBySender === this.wsConnectionId)
     ) {
       this.logger.debug("resolving cb")();
       if (growlErrorMessage.action === "growlError") {
@@ -28,14 +164,46 @@ export class WsMessageProcessor extends AbstractMessageProcessor {
         this.callBacks[responseWsInMessage.cbId].resolve(responseWsInMessage.data);
       }
       delete this.callBacks[responseWsInMessage.cbId];
-    } else if (growlErrorMessage.action === "growlError") {
-      // GrowlError is used only in case above, so this is just a fallback that will never happen
-      this.store.growlError((data as unknown as GrowlWsInMessage).data.error);
     } else {
-      this.sub.notify(data);
+      this.sub.notify(responseWsInMessage);
     }
   }
 
+  private get wsUrl() {
+    return `${this.apiUrl}?id=${this.wsConnectionId}&sessionId=${this.sessionHolder.session}`;
+  }
+
+  setWsConnectionId(id: string) {
+    return this.wsConnectionId;
+  }
+
+  public getWsConnectionId() {
+    return this.wsConnectionId;
+  }
+
+
+  public async startListening(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      this.logger.log("Starting webSocket")();
+      if (!this.listenWsTimeout && !this.ws) {
+        this.ws = new WebSocket(this.wsUrl);
+        this.ws.onmessage = this.onWsMessage.bind(this);
+        this.ws.onclose = (e) => {
+          setTimeout(() => {
+            reject(Error("Cannot connect to websocket"));
+          });
+          this.onWsClose(e);
+        };
+        this.ws.onopen = () => {
+          setTimeout(resolve);
+          this.onWsOpen();
+        };
+      } else {
+        resolve();
+      }
+    });
+  }
+
   /*
    * TODO
    * public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | null | ResponseWsInMessage<D> {
diff --git a/frontend/src/ts/types/messages/inner/send.set.message.status.ts b/frontend/src/ts/types/messages/inner/send.set.message.status.ts
new file mode 100644
index 000000000..05a9b6e8e
--- /dev/null
+++ b/frontend/src/ts/types/messages/inner/send.set.message.status.ts
@@ -0,0 +1,11 @@
+import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
+import type {MessageStatus} from "@common/model/enum/message.status";
+
+export interface SendSetMessagesStatusInnerSystemBody {
+  messageIds: number[];
+  status: MessageStatus;
+}
+
+export interface SendSetMessagesStatusInnerSystemMessage extends DefaultInnerSystemMessage<"sendSetMessagesStatus", "peerConnection:*", SendSetMessagesStatusInnerSystemBody> {
+  allowZeroSubscribers: true;
+}
diff --git a/frontend/src/ts/types/messages/p2p/confirm.message.status.ts b/frontend/src/ts/types/messages/p2p/confirm.message.status.ts
new file mode 100644
index 000000000..6b1216825
--- /dev/null
+++ b/frontend/src/ts/types/messages/p2p/confirm.message.status.ts
@@ -0,0 +1,3 @@
+import {DefaultP2pMessage} from "@/ts/types/messages/p2p";
+
+export type ConfirmSetMessageStatusP2pMessage = DefaultP2pMessage<"confirmSetMessageStatusRequest", null>;
diff --git a/frontend/src/ts/types/messages/p2p/exchange.message.info.ts b/frontend/src/ts/types/messages/p2p/exchange.message.info.ts
new file mode 100644
index 000000000..c7333f938
--- /dev/null
+++ b/frontend/src/ts/types/messages/p2p/exchange.message.info.ts
@@ -0,0 +1,24 @@
+import {MessageStatus} from "@common/model/enum/message.status";
+import {
+  DefaultP2pMessage,
+  DefaultRequestP2pMessage,
+  DefaultRequestResponseP2pMessage
+} from "@/ts/types/messages/p2p";
+import {MessagesInfo} from "@/ts/types/messages/p2pDto";
+
+export interface SetMessageStatusP2pBody {
+  status: MessageStatus;
+  messagesIds: number[];
+}
+
+export interface ExchangeMessageInfo1P2pBody {
+  messagesInfo: MessagesInfo;
+}
+
+export interface ExchangeMessageInfo2P2pBody {
+  messagesInfo: MessagesInfo;
+}
+
+export type ExchangeMessageInfo1RequestP2pMessage = DefaultRequestP2pMessage<"exchangeMessageInfo", ExchangeMessageInfo1P2pBody>;
+
+export type ExchangeMessageInfo2 = DefaultRequestResponseP2pMessage<>;
diff --git a/frontend/src/ts/types/messages/p2p/index.ts b/frontend/src/ts/types/messages/p2p/index.ts
index 4441959c0..2951024f9 100644
--- a/frontend/src/ts/types/messages/p2p/index.ts
+++ b/frontend/src/ts/types/messages/p2p/index.ts
@@ -1,5 +1,19 @@
-export interface DefaultP2pMessage<A extends string> {
+export interface DefaultP2pMessage<A extends string, D> {
   action: A;
-  resolveCbId?: number;
-  cbId?: number;
+  data: D;
+}
+
+export interface DefaultRequestP2pMessage<A extends string, D> extends DefaultP2pMessage<A, D> {
+  cbId: number;
+}
+
+export interface DefaultResponseP2pMessage<D> {
+  data: D;
+  resolveCbId: number;
+}
+
+export interface DefaultRequestResponseP2pMessage<D> {
+  data: D;
+  resolveCbId: number;
+  cbId: number;
 }
diff --git a/frontend/src/ts/types/messages/p2p/set.message.status.ts b/frontend/src/ts/types/messages/p2p/set.message.status.ts
new file mode 100644
index 000000000..07a3ccf2b
--- /dev/null
+++ b/frontend/src/ts/types/messages/p2p/set.message.status.ts
@@ -0,0 +1,8 @@
+import {MessageStatus} from "@common/model/enum/message.status";
+import {DefaultRequestP2pMessage} from "@/ts/types/messages/p2p";
+
+export interface SetMessageStatusP2pBody {
+  status: MessageStatus;
+  messagesIds: number[];
+}
+export type SetMessageStatusP2pMessage = DefaultRequestP2pMessage<"setMessageStatus", SetMessageStatusP2pBody>;
diff --git a/frontend/src/ts/types/messages/p2pMessages.ts b/frontend/src/ts/types/messages/p2pMessages.ts
index 4425d55b2..ac902d914 100644
--- a/frontend/src/ts/types/messages/p2pMessages.ts
+++ b/frontend/src/ts/types/messages/p2pMessages.ts
@@ -4,29 +4,6 @@
  * this file should do it
  */
 import type {MessageStatus} from "@common/model/enum/message.status";
-import type {MessageP2pDto, MessagesInfo} from "@/ts/types/messages/p2pDto";
-
-
-export type P2PHandlerType<A extends string> = (a: DefaultP2pMessage<A>) => Promise<void> | void;
-
-export type P2PHandlerTypes<K extends string> = {
-  [Key in K]?: P2PHandlerType<Key>
-};
-
-export interface DefaultP2pMessage<A extends string> extends DefaultMessage<A> {
-  resolveCbId?: number; // If this callback id is present, resolve it
-}
-
-
-export interface ExchangeMessageInfoResponse3 extends DefaultP2pMessage<"exchangeMessageInfoResponse3">, CallBackMessage {
-}
-
-export interface SetMessageStatusRequest extends DefaultP2pMessage<"setMessageStatus">, CallBackMessage {
-  status: MessageStatus;
-  messagesIds: number[];
-}
-
-export type ConfirmSetMessageStatusRequest = DefaultP2pMessage<"confirmSetMessageStatusRequest">;
 
 export interface ExchangeMessageInfoResponse extends DefaultP2pMessage<"exchangeMessageInfoResponse">, CallBackMessage {
   messages: MessageP2pDto[];
@@ -48,3 +25,6 @@ export interface SendNewP2PMessage extends DefaultP2pMessage<"sendNewP2PMessage"
 export interface ConfirmReceivedP2pMessage extends DefaultP2pMessage<"confirmReceivedP2pMessage"> {
   status?: MessageStatus;
 }
+
+export interface ExchangeMessageInfoResponse3 extends DefaultP2pMessage<"exchangeMessageInfoResponse3">, CallBackMessage {
+}
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 5d5ea4515..7410c4286 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -174,11 +174,6 @@ export interface RoomMessagesIds {
   roomId: number;
 }
 
-export interface MessageSupplier {
-  sendRawTextToServer(message: string): boolean;
-
-  getWsConnectionId(): string;
-}
 
 export interface IStorage {
   // GetIds(cb: SingleParamCB<object>);
diff --git a/frontend/src/ts/utils/pubsub.ts b/frontend/src/ts/utils/pubsub.ts
index 0be946337..ac6a633e9 100644
--- a/frontend/src/ts/utils/pubsub.ts
+++ b/frontend/src/ts/utils/pubsub.ts
@@ -2,6 +2,7 @@ import {
   DefaultWsInMessage,
   HandlerName
 } from "@common/ws/common";
+import {DefaultP2pMessage} from "@/ts/types/messages/p2p";
 
 
 export function Subscribe<K extends DefaultWsInMessage<A, H, D>, A extends string = string, H extends HandlerName = HandlerName, D extends any = any>() {
@@ -17,3 +18,17 @@ export function Subscribe<K extends DefaultWsInMessage<A, H, D>, A extends strin
     target.__handlers[memberName] = memberName;
   };
 }
+
+export function P2PSubscribe<K extends DefaultP2pMessage<A, D>, A extends string = string, D extends any = any>() {
+  return (target: any, memberName: K['action'], propertyDescriptor:
+      TypedPropertyDescriptor<((firstParameter: K["data"]) => void)>
+      | TypedPropertyDescriptor<(() => void)>
+      | TypedPropertyDescriptor<(() => Promise<void>)>
+      | TypedPropertyDescriptor<((firstParameter: K["data"]) => Promise<void>)>
+  ) => {
+    if (!target.__p2p_handlers) {
+      target.__p2p_handlers = {}
+    }
+    target.__p2p_handlers[memberName] = memberName;
+  };
+}
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index e456fb48d..f1f44464b 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -10,19 +10,6 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {MessageSupplier} from "@/ts/types/types";
 import {P2PMessageProcessor} from "@/ts/message_handlers/P2PMessageProcessor";
 
-import type {
-  ConfirmReceivedP2pMessage,
-  ConfirmSetMessageStatusRequest,
-  DefaultP2pMessage,
-  ExchangeMessageInfoRequest,
-  ExchangeMessageInfoResponse,
-  ExchangeMessageInfoResponse2,
-  ExchangeMessageInfoResponse3,
-  P2PHandlerType,
-  P2PHandlerTypes,
-  SendNewP2PMessage,
-  SetMessageStatusRequest,
-} from "@/ts/types/messages/p2pMessages";
 import type {MessageModel, RoomModel} from "@/ts/types/model";
 import {MessageStatusInner} from "@/ts/types/model";
 import type {MessageP2pDto, MessagesInfo} from "@/ts/types/messages/p2pDto";
@@ -31,10 +18,23 @@ import {messageModelToP2p, p2pMessageToModel} from "@/ts/types/converters";
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type Subscription from "@/ts/classes/Subscription";
-import {Subscribe} from "@/ts/utils/pubsub";
+import {
+  P2PSubscribe,
+  Subscribe
+} from "@/ts/utils/pubsub";
 import {SetMessageStatusWsInBody, SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
 import {CheckDestroyInnerSystemMessage} from "@/ts/types/messages/peer-connection/accept.file.reply";
 import {SendSetMessagesStatusMessageBody} from "@/ts/types/messages/inner/send.set.messages.status";
+import {
+  SendSetMessagesStatusInnerSystemBody,
+  SendSetMessagesStatusInnerSystemMessage
+} from "@/ts/types/messages/inner/send.set.message.status";
+import {SetMessageStatusP2pMessage} from "@/ts/types/messages/p2p/set.message.status";
+import {
+  ExchangeMessageInfo1RequestP2pBody,
+  ExchangeMessageInfo1RequestP2pMessage
+} from "@/ts/types/messages/p2p/exchange.message.info";
+import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 
 
 export default abstract class MessagePeerConnection extends AbstractPeerConnection implements MessageSupplier {
@@ -52,7 +52,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     sendNewP2PMessage: <P2PHandlerType<"sendNewP2PMessage">> this.sendNewP2PMessage,
   };
 
-  private readonly messageProc: P2PMessageProcessor;
+  private readonly messageProc: AbstractMessageProcessor;
 
   private readonly opponentUserId: number;
 
@@ -93,32 +93,28 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     return this.store.roomsDict[this.roomId];
   }
 
-  @Subscribe<SendSetMessagesStatusMessage>()
-  public async sendSetMessagesStatus(payload: SendSetMessagesStatusMessageBody) {
-    const responseToRequest: SetMessageStatusRequest = {
+  @Subscribe<SendSetMessagesStatusInnerSystemMessage>()
+  public async sendSetMessagesStatus(payload: SendSetMessagesStatusInnerSystemBody) {
+    await this.messageProc.sendToServerAndAwait<SetMessageStatusP2pMessage, any>({
       action: "setMessageStatus",
-      messagesIds: payload.messageIds,
-      status: MessageStatus.READ,
-    };
-    await this.messageProc.sendToServerAndAwait(responseToRequest);
+      data: {
+        messagesIds: payload.messageIds,
+        status: MessageStatus.READ,
+      }
+    });
     this.store.setMessagesStatus({
       roomId: this.roomId,
       status: MessageStatus.READ,
       messagesIds: payload.messageIds,
     });
   }
-  @Subscribe<SetMessageStatusWsInMessage>()
+  @P2PSubscribe<SetMessageStatusWsInMessage>()
   public async setMessageStatus(m: SetMessageStatusWsInBody) {
     this.store.setMessagesStatus({
       roomId: this.roomId,
       status: m.status,
       messagesIds: m.messagesIds,
     });
-    const response: ConfirmSetMessageStatusRequest = {
-      action: "confirmSetMessageStatusRequest",
-      resolveCbId: m.cbId,
-    };
-    this.messageProc.sendToServer(response);
   }
 
   public getOpponentUserId() {
@@ -196,7 +192,8 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     }
   }
 
-  public async exchangeMessageInfoRequest(payload: ExchangeMessageInfoRequest) {
+  @P2PSubscribe<ExchangeMessageInfo1RequestP2pMessage>()
+  public async exchangeMessageInfo(payload: ExchangeMessageInfo1RequestP2pBody) {
     if (this.syncMessageLock) {
       this.logger.error("oops we already acquired lock, going to syncanyway");
     }
@@ -239,7 +236,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
         action: "exchangeMessageInfoResponse3",
         resolveCbId: a.cbId,
       };
-      this.messageProc.sendToServer(confirmationThatReceived);
+      this.messageProc.sendToServer<>(confirmationThatReceived);
     } finally {
       this.syncMessageLock = false;
     }
@@ -252,7 +249,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     }
     try {
       this.syncMessageLock = true;
-      await this.exchangeMessageInfo();
+      await this.startMessageInfoExchange();
     } catch (e) {
       this.logger.error("Can't send messages because {}", e)();
     } finally {
@@ -318,17 +315,18 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     }
   }
 
-  private async exchangeMessageInfo() {
+  private async startMessageInfoExchange() {
     if (this.isChannelOpened) {
       const mI: MessagesInfo = this.messages.reduce<MessagesInfo>((p, c) => {
         p[c.id] = c.edited ?? 0; // (undefied|null) ?? 0 === 0
         return p;
       }, {});
-      const message: ExchangeMessageInfoRequest = {
+      const response: ExchangeMessageInfoResponse = await this.messageProc.sendToServerAndAwait<ExchangeMessageInfo1RequestP2pMessage, >({
         action: "exchangeMessageInfoRequest",
-        messagesInfo: mI,
-      };
-      const response: ExchangeMessageInfoResponse = await this.messageProc.sendToServerAndAwait(message);
+        data: {
+          messagesInfo: mI,
+        },
+      });
       // Got exchangeMessageInfoResponse
       this.saveMessagesDtoToStore(response.messages);
       const responseMessages: MessageP2pDto[] = response.requestMessages.map(
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 555c2c23d..af59dc0e8 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -13,6 +13,7 @@ import Subscription from "@/ts/classes/Subscription";
 
 
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
+import type {SendSetMessagesStatusInnerSystemMessage} from "@/ts/types/messages/inner/send.set.message.status";
 
 
 /**
@@ -179,14 +180,15 @@ export default class MessageTransferHandler extends BaseTransferHandler implemen
   public async markMessagesInCurrentRoomAsRead(roomId: number, messageIds: number[]) {
     this.messageHelper.processAnyMessage();
     if (this.state === "ready") {
-      const payload: SendSetMessagesStatusMessage = {
+      this.sub.notify<SendSetMessagesStatusInnerSystemMessage>({
         action: "sendSetMessagesStatus",
         handler: Subscription.allPeerConnectionsForTransfer(this.connectionId!),
-        messageIds,
-        status: MessageStatus.READ,
+        data: {
+          messageIds,
+          status: MessageStatus.READ,
+        },
         allowZeroSubscribers: true,
-      };
-      this.sub.notify(payload);
+      });
     }
   }
 

From e8dde424da588231b3ceba1cce0cc31dea08b8ba Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 28 May 2022 10:42:40 +0300
Subject: [PATCH 151/221] More refactoring

---
 .../src/ts/classes/NotificationHandler.ts     | 10 +--
 frontend/src/ts/classes/SessionHolderImpl.ts  | 13 ++++
 frontend/src/ts/main.ts                       | 12 ++--
 .../message_handlers/{Api.ts => HttpApi.ts}   |  2 +-
 .../message_handlers/P2PMessageProcessor.ts   | 16 -----
 .../src/ts/message_handlers/RomHandler.ts     | 10 +--
 .../{WsHandler.ts => WsApi.ts}                |  2 +-
 .../ts/message_handlers/WsMessageHandler.ts   | 16 ++---
 .../ts/message_handlers/WsMessageProcessor.ts | 14 +---
 frontend/src/ts/types/env.d.ts                | 12 ++--
 frontend/src/ts/types/types.ts                |  1 +
 .../src/ts/webrtc/AbstractPeerConnection.ts   | 69 +++++++++++++++++--
 frontend/src/ts/webrtc/BaseTransferHandler.ts |  6 +-
 frontend/src/ts/webrtc/WebRtcApi.ts           |  6 +-
 .../src/ts/webrtc/call/CallPeerConnection.ts  |  4 +-
 frontend/src/ts/webrtc/file/FileHandler.ts    |  4 +-
 .../file/FileReceiveerPeerConnection.ts       |  4 +-
 .../webrtc/file/FileSenderPeerConnection.ts   |  4 +-
 .../webrtc/message/MessagePeerConnection.ts   | 46 +------------
 .../webrtc/message/MessageTransferHandler.ts  |  4 +-
 20 files changed, 130 insertions(+), 125 deletions(-)
 rename frontend/src/ts/message_handlers/{Api.ts => HttpApi.ts} (97%)
 delete mode 100644 frontend/src/ts/message_handlers/P2PMessageProcessor.ts
 rename frontend/src/ts/message_handlers/{WsHandler.ts => WsApi.ts} (99%)

diff --git a/frontend/src/ts/classes/NotificationHandler.ts b/frontend/src/ts/classes/NotificationHandler.ts
index 1550dcfb9..17e974e9a 100644
--- a/frontend/src/ts/classes/NotificationHandler.ts
+++ b/frontend/src/ts/classes/NotificationHandler.ts
@@ -2,8 +2,8 @@ import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.app
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
 import {extractError} from "@/ts/utils/pureFunctions";
-import type Api from "@/ts/message_handlers/Api";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type HttpApi from "@/ts/message_handlers/HttpApi";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import {
   CONNECTION_ERROR,
@@ -39,7 +39,7 @@ export default class NotifierHandler {
 
   private readonly store: DefaultStore;
 
-  private readonly api: Api;
+  private readonly api: HttpApi;
 
   private readonly browserVersion: string;
 
@@ -47,13 +47,13 @@ export default class NotifierHandler {
 
   private readonly isMobile: boolean;
 
-  private readonly ws: WsHandler;
+  private readonly ws: WsApi;
 
   private readonly documentTitle: string;
 
   private readonly sub: Subscription;
 
-  public constructor(api: Api, browserVersion: string, isChrome: boolean, isMobile: boolean, ws: WsHandler, store: DefaultStore, mainWindow: MainWindow, sub: Subscription) {
+  public constructor(api: HttpApi, browserVersion: string, isChrome: boolean, isMobile: boolean, ws: WsApi, store: DefaultStore, mainWindow: MainWindow, sub: Subscription) {
     this.api = api;
     this.browserVersion = browserVersion;
     this.isChrome = isChrome;
diff --git a/frontend/src/ts/classes/SessionHolderImpl.ts b/frontend/src/ts/classes/SessionHolderImpl.ts
index 3c7e27618..56922eba5 100644
--- a/frontend/src/ts/classes/SessionHolderImpl.ts
+++ b/frontend/src/ts/classes/SessionHolderImpl.ts
@@ -2,6 +2,7 @@ import type {SessionHolder} from "@/ts/types/types";
 
 export class SessionHolderImpl implements SessionHolder {
   private static readonly SESSION_KEY = "sessionId";
+  private static readonly WS_CONNECTION_ID_KEY = "wsConnectionId";
 
   get session(): string | null {
     return localStorage.getItem(SessionHolderImpl.SESSION_KEY);
@@ -14,4 +15,16 @@ export class SessionHolderImpl implements SessionHolder {
       localStorage.removeItem(SessionHolderImpl.SESSION_KEY);
     }
   }
+
+   get wsConnectionId(): string | null {
+    return sessionStorage.getItem(SessionHolderImpl.WS_CONNECTION_ID_KEY);
+  }
+
+  set wsConnectionId(value: string | null) {
+    if (value) {
+      sessionStorage.setItem(SessionHolderImpl.WS_CONNECTION_ID_KEY, value);
+    } else {
+      sessionStorage.removeItem(SessionHolderImpl.WS_CONNECTION_ID_KEY);
+    }
+  }
 }
diff --git a/frontend/src/ts/main.ts b/frontend/src/ts/main.ts
index afca5944f..2a1489d67 100644
--- a/frontend/src/ts/main.ts
+++ b/frontend/src/ts/main.ts
@@ -11,11 +11,11 @@ import loggerFactory from "@/ts/instances/loggerFactory";
 import type {App as VueApp} from "@vue/runtime-core";
 import type {PlatformUtil} from "@/ts/types/model";
 import "@/assets/icon.png"; // eslint-disable-line import/no-unassigned-import
-import WsHandler from "@/ts/message_handlers/WsHandler";
+import WsApi from "@/ts/message_handlers/WsApi";
 import WsMessageHandler from "@/ts/message_handlers/WsMessageHandler";
 import DatabaseWrapper from "@/ts/classes/DatabaseWrapper";
 import LocalStorage from "@/ts/classes/LocalStorage";
-import Api from "@/ts/message_handlers/Api";
+import HttpApi from "@/ts/message_handlers/HttpApi";
 import NotifierHandler from "@/ts/classes/NotificationHandler";
 import WebRtcApi from "@/ts/webrtc/WebRtcApi";
 import {routerFactory} from "@/ts/instances/routerInstance";
@@ -42,8 +42,8 @@ logger.log(`Evaluating main script ${constants.GIT_HASH}`)();
 // eslint-disable-next-line max-params
 function bootstrapVue(
   messageBus: Subscription,
-  api: Api,
-  ws: WsHandler,
+  api: HttpApi,
+  ws: WsApi,
   webrtcApi: WebRtcApi,
   platformUtil: PlatformUtil,
   messageSenderProxy: MessageSenderProxy,
@@ -104,7 +104,7 @@ function init(): void {
 
   const sessionHolder: SessionHolder = new SessionHolderImpl();
   const sub = new Subscription();
-  const api: Api = new Api(sessionHolder);
+  const api: HttpApi = new HttpApi(sessionHolder);
 
   let storage;
   try {
@@ -118,7 +118,7 @@ function init(): void {
   store.setStorage(storage);
   const smileyApi = new SmileysApi(store);
   void smileyApi.init();
-  const ws: WsHandler = new WsHandler(WS_API_URL, sessionHolder, store, sub);
+  const ws: WsApi = new WsApi(WS_API_URL, sessionHolder, store, sub);
   const notifier: NotifierHandler = new NotifierHandler(api, browserVersion, isChrome, isMobile, ws, store, mainWindow, sub);
   const messageHelper: MessageHelper = new MessageHelper(store, notifier, sub, audioPlayer);
   const wsMessageHandler: WsMessageHandler = new WsMessageHandler(store, api, ws, messageHelper, sub);
diff --git a/frontend/src/ts/message_handlers/Api.ts b/frontend/src/ts/message_handlers/HttpApi.ts
similarity index 97%
rename from frontend/src/ts/message_handlers/Api.ts
rename to frontend/src/ts/message_handlers/HttpApi.ts
index 8df5ebe50..01ea94772 100644
--- a/frontend/src/ts/message_handlers/Api.ts
+++ b/frontend/src/ts/message_handlers/HttpApi.ts
@@ -9,7 +9,7 @@ import JsApi from "@/ts/message_handlers/http_modules/JsApi";
 import GiphyApi from "@/ts/message_handlers/http_modules/GiphyApi";
 import {GIPHY_API_KEY, GIPHY_URL} from "@/ts/utils/consts";
 
-export default class Api {
+export default class HttpApi {
   public readonly authApi: AuthApi;
 
   public readonly verifyApi: VerifyApi;
diff --git a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts b/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
deleted file mode 100644
index 21a74b431..000000000
--- a/frontend/src/ts/message_handlers/P2PMessageProcessor.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
-import type {DefaultP2pMessage} from "@/ts/types/messages/p2pMessages";
-
-export class P2PMessageProcessor extends AbstractMessageProcessor {
-  public resolveCBifItsThere(data: DefaultP2pMessage<string>): boolean {
-    this.logger.debug("resolving cb")();
-    if (data.resolveCbId) {
-      this.callBacks[data.resolveCbId].resolve(data);
-      delete this.callBacks[data.resolveCbId];
-      return true;
-    }
-    return false;
-  }
-
-  abstract sendRawTextToServer(data: string): boolean;
-}
diff --git a/frontend/src/ts/message_handlers/RomHandler.ts b/frontend/src/ts/message_handlers/RomHandler.ts
index 8b7f43c5c..30c1ddd4b 100644
--- a/frontend/src/ts/message_handlers/RomHandler.ts
+++ b/frontend/src/ts/message_handlers/RomHandler.ts
@@ -68,8 +68,8 @@ import {convertUser, getChannelDict, getRoom, getRoomsBaseDict} from "@/ts/types
 import {ALL_ROOM_ID} from "@/ts/utils/consts";
 import type {Logger} from "lines-logger";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type Api from "@/ts/message_handlers/Api";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type HttpApi from "@/ts/message_handlers/HttpApi";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import type {AudioPlayer} from "@/ts/classes/AudioPlayer";
 import loggerFactory from "@/ts/instances/loggerFactory";
 import {login, logout} from "@/ts/utils/audio";
@@ -94,7 +94,7 @@ export class RoomHandler {
 
   private readonly store: DefaultStore;
 
-  private readonly ws: WsHandler;
+  private readonly ws: WsApi;
 
   private readonly audioPlayer: AudioPlayer;
 
@@ -102,8 +102,8 @@ export class RoomHandler {
 
   public constructor(
     store: DefaultStore,
-    api: Api,
-    ws: WsHandler,
+    api: HttpApi,
+    ws: WsApi,
     audioPlayer: AudioPlayer,
     sub: Subscription,
   ) {
diff --git a/frontend/src/ts/message_handlers/WsHandler.ts b/frontend/src/ts/message_handlers/WsApi.ts
similarity index 99%
rename from frontend/src/ts/message_handlers/WsHandler.ts
rename to frontend/src/ts/message_handlers/WsApi.ts
index ae15e3745..b6433d161 100644
--- a/frontend/src/ts/message_handlers/WsHandler.ts
+++ b/frontend/src/ts/message_handlers/WsApi.ts
@@ -103,7 +103,7 @@ import {AddRoomWsOutBody} from "@common/ws/message/room/add.room";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 
 
-export default class WsHandler implements MessageSupplier {
+export default class WsApi implements MessageSupplier {
   protected readonly logger: Logger;
 
   /*
diff --git a/frontend/src/ts/message_handlers/WsMessageHandler.ts b/frontend/src/ts/message_handlers/WsMessageHandler.ts
index 3d76b2f57..4b8732a1b 100644
--- a/frontend/src/ts/message_handlers/WsMessageHandler.ts
+++ b/frontend/src/ts/message_handlers/WsMessageHandler.ts
@@ -12,8 +12,7 @@ import type {HandlerName} from "@common/ws/common";
 import type {InternetAppearMessage} from "@/ts/types/messages/inner/internet.appear";
 
 import loggerFactory from "@/ts/instances/loggerFactory";
-import type Api from "@/ts/message_handlers/Api";
-import MessageHandler from "@/ts/message_handlers/MesageHandler";
+import type HttpApi from "@/ts/message_handlers/HttpApi";
 import type {
   MessageSender,
   RemoveMessageProgress,
@@ -27,7 +26,7 @@ import {MessageStatusInner} from "@/ts/types/model";
 import type {Logger} from "lines-logger";
 
 
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 
@@ -42,7 +41,7 @@ import {DeleteMessageWsInBody} from "@common/ws/message/ws-message/delete.messag
 import {SetMessageStatusWsInBody} from "@common/ws/message/set.message.status";
 
 
-export default class WsMessageHandler extends MessageHandler implements MessageSender {
+export default class WsMessageHandler implements MessageSender {
   protected readonly logger: Logger;
 
   protected readonly handlers: HandlerTypes<keyof WsMessageHandler, "ws-message"> = {
@@ -62,9 +61,9 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
    */
   private readonly store: DefaultStore;
 
-  private readonly api: Api;
+  private readonly api: HttpApi;
 
-  private readonly ws: WsHandler;
+  private readonly ws: WsApi;
 
   private syncMessageLock: boolean = false;
 
@@ -72,12 +71,11 @@ export default class WsMessageHandler extends MessageHandler implements MessageS
 
   public constructor(
     store: DefaultStore,
-    api: Api,
-    ws: WsHandler,
+    api: HttpApi,
+    ws: WsApi,
     messageHelper: MessageHelper,
     sub: Subscription,
   ) {
-    super();
     this.store = store;
     this.api = api;
     sub.subscribe("ws-message", this);
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index daae19a0a..d39885b55 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -38,7 +38,7 @@ export class WsMessageProcessor extends AbstractMessageProcessor {
     this.logger.log("Got onclose event")();
     this.ws = null;
     this.setStatus(false);
-    // Tornado drops connection if exception occurs during processing an event we send from WsHandler
+    // Tornado drops connection if exception occurs during processing an event we send from WsApi
     this.onDropConnection(e.code === 1006 ? "Server error" : "Connection to server is lost");
 
     /*
@@ -204,16 +204,4 @@ export class WsMessageProcessor extends AbstractMessageProcessor {
     });
   }
 
-  /*
-   * TODO
-   * public parseMessage<D>(jsonData: string): DefaultWsInMessage<string, HandlerName, D> | null | ResponseWsInMessage<D> {
-   *   const data: DefaultWsInMessage<string, HandlerName, D> | null| ResponseWsInMessage<D> = super.parseMessage(jsonData);
-   *   if ((data as DefaultWsInMessage<string, HandlerName, D>)?.handler !== "void" && (!data?.handler || !data.action)) {
-   *     this.logger.error("Invalid message structure")();
-   *
-   *     return null;
-   *   }
-   *   return data;
-   * }
-   */
 }
diff --git a/frontend/src/ts/types/env.d.ts b/frontend/src/ts/types/env.d.ts
index 300ad1112..db55bb1ff 100644
--- a/frontend/src/ts/types/env.d.ts
+++ b/frontend/src/ts/types/env.d.ts
@@ -1,5 +1,5 @@
-import type WsHandler from "@/ts/message_handlers/WsHandler";
-import type Api from "@/ts/message_handlers/Api";
+import type WsApi from "@/ts/message_handlers/WsApi";
+import type HttpApi from "@/ts/message_handlers/HttpApi";
 import type {Logger} from "lines-logger";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import type {GoogleCaptcha, PlatformUtil} from "@/ts/types/model";
@@ -19,11 +19,11 @@ declare global {
     vue: VueApp;
     onloadrecaptcha(): any;
     router: Router;
-    api: Api;
+    api: HttpApi;
     deferredPrompt: BeforeInstallPromptEvent;
     wsMessageHandler: WsMessageHandler;
     roomHandler: RoomHandler;
-    ws: WsHandler;
+    ws: WsApi;
     storage: IStorage;
     store: DefaultStore;
     webrtcApi: WebRtcApi;
@@ -38,8 +38,8 @@ declare global {
 
 declare module "@vue/runtime-core" {
   export interface ComponentCustomProperties {
-    $ws: WsHandler;
-    $api: Api;
+    $ws: WsApi;
+    $api: HttpApi;
     $store: DefaultStore;
     $logger: Logger;
     $smileyApi: SmileysApi;
diff --git a/frontend/src/ts/types/types.ts b/frontend/src/ts/types/types.ts
index 7410c4286..cc28effd1 100644
--- a/frontend/src/ts/types/types.ts
+++ b/frontend/src/ts/types/types.ts
@@ -335,4 +335,5 @@ export enum IconColor {
 
 export interface SessionHolder {
   session: string | null;
+  wsConnectionId: string|null;
 }
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 2d2c51b75..03a402916 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -6,7 +6,7 @@ import type {
 import type {HandlerName} from "@common/ws/common";
 import type {Logger} from "lines-logger";
 import loggerFactory from "@/ts/instances/loggerFactory";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
 
 import Subscription from "@/ts/classes/Subscription";
@@ -16,9 +16,12 @@ import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
 import {Subscribe} from "@/ts/utils/pubsub";
 import {SendRtcDataWsInMessage} from "@common/ws/message/peer-connection/send.rtc.data";
 import {ConnectToRemoteMessageBody} from "@/ts/types/messages/inner/connect.to.remote";
+import {SessionHolder} from "@/ts/types/types";
+import {DefaultP2pMessage} from "@/ts/types/messages/p2pMessages";
+import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 
 
-export default abstract class AbstractPeerConnection {
+export default abstract class AbstractPeerConnection extends AbstractMessageProcessor {
   protected offerCreator: boolean = false;
 
   protected sendRtcDataQueue: SendRtcDataWsInBody[] = [];
@@ -33,7 +36,7 @@ export default abstract class AbstractPeerConnection {
 
   protected sdpConstraints: any;
 
-  protected readonly wsHandler: WsHandler;
+  protected readonly wsHandler: WsApi;
 
   protected readonly store: DefaultStore;
 
@@ -50,7 +53,65 @@ export default abstract class AbstractPeerConnection {
     ],
   };
 
-  public constructor(roomId: number, connectionId: string, opponentWsId: string, ws: WsHandler, store: DefaultStore, sub: Subscription) {
+   constructor(
+    private readonly sessionHolder: SessionHolder,
+  ) {
+    super("p2p");
+  }
+  public resolveCBifItsThere(data: DefaultP2pMessage<string>): boolean {
+    this.logger.debug("resolving cb")();
+    if (data.resolveCbId) {
+      this.callBacks[data.resolveCbId].resolve(data);
+      delete this.callBacks[data.resolveCbId];
+      return true;
+    }
+    return false;
+  }
+
+  public sendRawTextToServer(message: string): boolean {
+    if (this.isChannelOpened) {
+      this.sendChannel!.send(message);
+      return true;
+    }
+    return false;
+  }
+
+  private get isChannelOpened(): boolean {
+    return this.sendChannel?.readyState === "open";
+  }
+
+
+    protected setupEvents() {
+    this.sendChannel!.onmessage = this.onChannelMessage.bind(this);
+    this.sendChannel!.onopen = () => {
+      this.logger.log("Channel opened")();
+      if (this.sessionHolder.wsConnectionId! > this.opponentWsId) {
+        this.syncMessages();
+      }
+      this.store.addLiveConnectionToRoom({
+        connection: this.opponentWsId,
+        roomId: this.roomId,
+      });
+    };
+    this.sendChannel!.onclose = () => {
+      // This.syncMessageLock = false; // just for the case, not nessesary
+      this.onDropConnection("Data channel closed");
+    };
+  }
+
+  onDropConnection(reason: string) {
+    this.logger.log(`Closed channel ${reason}`)();
+    super.onDropConnection(reasong);
+     if (this.store.userInfo) {
+        // Otherwise we logged out
+        this.store.removeLiveConnectionToRoom({
+          connection: this.opponentWsId,
+          roomId: this.roomId,
+        });
+      }
+  }
+
+  public constructor(roomId: number, connectionId: string, opponentWsId: string, ws: WsApi, store: DefaultStore, sub: Subscription) {
     this.roomId = roomId;
     this.connectionId = connectionId;
     this.opponentWsId = opponentWsId;
diff --git a/frontend/src/ts/webrtc/BaseTransferHandler.ts b/frontend/src/ts/webrtc/BaseTransferHandler.ts
index 766562aee..e1d6db985 100644
--- a/frontend/src/ts/webrtc/BaseTransferHandler.ts
+++ b/frontend/src/ts/webrtc/BaseTransferHandler.ts
@@ -1,6 +1,6 @@
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import Subscription from "@/ts/classes/Subscription";
 
@@ -9,7 +9,7 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 export default abstract class BaseTransferHandler {
   protected connectionId: string | null = null;
 
-  protected readonly wsHandler: WsHandler;
+  protected readonly wsHandler: WsApi;
 
   protected readonly notifier: NotifierHandler;
 
@@ -21,7 +21,7 @@ export default abstract class BaseTransferHandler {
 
   protected readonly sub: Subscription;
 
-  public constructor(roomId: number, wsHandler: WsHandler, notifier: NotifierHandler, store: DefaultStore, sub: Subscription) {
+  public constructor(roomId: number, wsHandler: WsApi, notifier: NotifierHandler, store: DefaultStore, sub: Subscription) {
     this.roomId = roomId;
     this.notifier = notifier;
     this.wsHandler = wsHandler;
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 4152b5cd6..951efe754 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -16,7 +16,7 @@ import type {LogoutMessage} from "@/ts/types/messages/inner/logout";
 
 import loggerFactory from "@/ts/instances/loggerFactory";
 import type {Logger} from "lines-logger";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import type {ReceivingFile} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
 import FileHandler from "@/ts/webrtc/file/FileHandler";
@@ -63,7 +63,7 @@ import {WebRtcSetConnectionIdBody} from "@common/model/webrtc.base";
 export default class WebRtcApi {
   protected logger: Logger;
 
-  private readonly wsHandler: WsHandler;
+  private readonly wsHandler: WsApi;
 
   private readonly store: DefaultStore;
 
@@ -79,7 +79,7 @@ export default class WebRtcApi {
 
   private readonly sub: Subscription;
 
-  public constructor(ws: WsHandler, store: DefaultStore, notifier: NotifierHandler, messageHelper: MessageHelper, sub: Subscription) {
+  public constructor(ws: WsApi, store: DefaultStore, notifier: NotifierHandler, messageHelper: MessageHelper, sub: Subscription) {
     this.sub = sub;
     this.sub.subscribe("webrtc", this);
     this.wsHandler = ws;
diff --git a/frontend/src/ts/webrtc/call/CallPeerConnection.ts b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
index 9f4ad9a16..2eea7d5d5 100644
--- a/frontend/src/ts/webrtc/call/CallPeerConnection.ts
+++ b/frontend/src/ts/webrtc/call/CallPeerConnection.ts
@@ -10,7 +10,7 @@ import type {
   SetOpponentAnchor,
   SetOpponentVoice
 } from "@/ts/types/types";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import {getStreamLog, getTrackLog} from "@/ts/utils/pureFunctions";
@@ -39,7 +39,7 @@ export default abstract class CallPeerConnection extends AbstractPeerConnection
     connId: string,
     opponentWsId: string,
     userId: number,
-    wsHandler: WsHandler,
+    wsHandler: WsApi,
     store: DefaultStore,
     sub: Subscription,
   ) {
diff --git a/frontend/src/ts/webrtc/file/FileHandler.ts b/frontend/src/ts/webrtc/file/FileHandler.ts
index 435d45a39..4a8dba113 100644
--- a/frontend/src/ts/webrtc/file/FileHandler.ts
+++ b/frontend/src/ts/webrtc/file/FileHandler.ts
@@ -1,7 +1,7 @@
 import type {ReplyFileWsInMessage} from "@common/ws/message/webrtc-transfer/reply.file";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {SendingFile} from "@/ts/types/model";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import FileSenderPeerConnection from "@/ts/webrtc/file/FileSenderPeerConnection";
 import Subscription from "@/ts/classes/Subscription";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
@@ -14,7 +14,7 @@ export default class FileHandler extends FileAndCallTransfer {
 
   private readonly file: File;
 
-  public constructor(roomId: number, threadId: number | null, connId: string, wsHandler: WsHandler, notifier: NotifierHandler, store: DefaultStore, file: File, time: number, sub: Subscription) {
+  public constructor(roomId: number, threadId: number | null, connId: string, wsHandler: WsApi, notifier: NotifierHandler, store: DefaultStore, file: File, time: number, sub: Subscription) {
     super(roomId, wsHandler, notifier, store, sub);
     this.file = file;
     this.setConnectionId(connId);
diff --git a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
index a97dda689..9af3e8200 100644
--- a/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileReceiveerPeerConnection.ts
@@ -4,7 +4,7 @@ import type {SetReceivingFileStatus, SetReceivingFileUploaded} from "@/ts/types/
 import type {ReceivingFile} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
 import {bytesToSize} from "@/ts/utils/pureFunctions";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import {requestFileSystem} from "@/ts/utils/htmlApi";
 import {MAX_ACCEPT_FILE_SIZE_WO_FS_API, MAX_BUFFER_SIZE} from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
@@ -35,7 +35,7 @@ export default class FileReceiverPeerConnection extends FilePeerConnection {
 
   private retryFileSend: number = 0;
 
-  public constructor(roomId: number, connId: string, opponentWsId: string, wsHandler: WsHandler, store: DefaultStore, size: number, sub: Subscription) {
+  public constructor(roomId: number, connId: string, opponentWsId: string, wsHandler: WsApi, store: DefaultStore, size: number, sub: Subscription) {
     super(roomId, connId, opponentWsId, wsHandler, store, sub);
     this.fileSize = size;
   }
diff --git a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
index e7b3f4325..1945fa9fa 100644
--- a/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
+++ b/frontend/src/ts/webrtc/file/FileSenderPeerConnection.ts
@@ -3,7 +3,7 @@ import type {AcceptFileWsInMessage} from "@common/ws/message/webrtc-transfer/acc
 import type {AddSendingFileTransfer, SetSendingFileStatus, SetSendingFileUploaded} from "@/ts/types/types";
 import type {SendingFileTransfer} from "@/ts/types/model";
 import {FileTransferStatus} from "@/ts/types/model";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import {bytesToSize, getDay} from "@/ts/utils/pureFunctions";
 import {READ_CHUNK_SIZE, SEND_CHUNK_SIZE} from "@/ts/utils/consts";
 import FilePeerConnection from "@/ts/webrtc/file/FilePeerConnection";
@@ -29,7 +29,7 @@ export default class FileSenderPeerConnection extends FilePeerConnection {
 
   private trackTimeout: number = 0;
 
-  public constructor(roomId: number, connId: string, opponentWsId: string, wsHandler: WsHandler, store: DefaultStore, file: File, userId: number, sub: Subscription) {
+  public constructor(roomId: number, connId: string, opponentWsId: string, wsHandler: WsApi, store: DefaultStore, file: File, userId: number, sub: Subscription) {
     super(roomId, connId, opponentWsId, wsHandler, store, sub);
     this.file = file;
     const asft: AddSendingFileTransfer = {
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index f1f44464b..c3b687a9a 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -5,9 +5,8 @@ import type {
   SyncP2PMessageBody
 } from "@/ts/types/messages/inner/sync.p2p";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import type {MessageSupplier} from "@/ts/types/types";
 import {P2PMessageProcessor} from "@/ts/message_handlers/P2PMessageProcessor";
 
 import type {MessageModel, RoomModel} from "@/ts/types/model";
@@ -37,7 +36,7 @@ import {
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 
 
-export default abstract class MessagePeerConnection extends AbstractPeerConnection implements MessageSupplier {
+export default abstract class MessagePeerConnection extends AbstractPeerConnection  {
   connectedToRemote: boolean = true;
 
   protected readonly handlers: HandlerTypes<keyof MessagePeerConnection, "peerConnection:*"> = {
@@ -64,7 +63,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     roomId: number,
     connId: string,
     opponentWsId: string,
-    wsHandler: WsHandler,
+    wsHandler: WsApi,
     store: DefaultStore,
     userId: number,
     messageHelper: MessageHelper,
@@ -81,9 +80,6 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     return this.opponentUserId === this.store.myId;
   }
 
-  private get isChannelOpened(): boolean {
-    return this.sendChannel?.readyState === "open";
-  }
 
   private get messages(): MessageModel[] {
     return Object.values(this.room.messages);
@@ -262,43 +258,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     this.messageProc.onDropConnection("data channel lost");
   }
 
-  public getWsConnectionId(): string {
-    return this.wsHandler.getWsConnectionId();
-  }
-
-  public sendRawTextToServer(message: string): boolean {
-    if (this.isChannelOpened) {
-      this.sendChannel!.send(message);
-      return true;
-    }
-    return false;
-  }
 
-  protected setupEvents() {
-    this.sendChannel!.onmessage = this.onChannelMessage.bind(this);
-    this.sendChannel!.onopen = () => {
-      this.logger.log("Channel opened")();
-      if (this.getWsConnectionId() > this.opponentWsId) {
-        this.syncMessages();
-      }
-      this.store.addLiveConnectionToRoom({
-        connection: this.opponentWsId,
-        roomId: this.roomId,
-      });
-    };
-    this.sendChannel!.onclose = () => {
-      this.logger.log("Closed channel ")();
-      // This.syncMessageLock = false; // just for the case, not nessesary
-      this.messageProc.onDropConnection("Data channel closed");
-      if (this.store.userInfo) {
-        // Otherwise we logged out
-        this.store.removeLiveConnectionToRoom({
-          connection: this.opponentWsId,
-          roomId: this.roomId,
-        });
-      }
-    };
-  }
 
   protected onChannelMessage(event: MessageEvent) {
     const data: DefaultP2pMessage<keyof MessagePeerConnection> = this.messageProc.parseMessage(event.data) as unknown as DefaultP2pMessage<keyof MessagePeerConnection>;
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index af59dc0e8..7515b9e2f 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -6,7 +6,7 @@ import type {MessageSender, UserIdConn} from "@/ts/types/types";
 import type {RoomModel} from "@/ts/types/model";
 import MessageSenderPeerConnection from "@/ts/webrtc/message/MessageSenderPeerConnection";
 import MessageReceiverPeerConnection from "@/ts/webrtc/message/MessageReceiverPeerConnection";
-import type WsHandler from "@/ts/message_handlers/WsHandler";
+import type WsApi from "@/ts/message_handlers/WsApi";
 import type NotifierHandler from "@/ts/classes/NotificationHandler";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
 import Subscription from "@/ts/classes/Subscription";
@@ -27,7 +27,7 @@ export default class MessageTransferHandler extends BaseTransferHandler implemen
 
   private readonly messageHelper: MessageHelper;
 
-  public constructor(roomId: number, wsHandler: WsHandler, notifier: NotifierHandler, store: DefaultStore, messageHelper: MessageHelper, sub: Subscription) {
+  public constructor(roomId: number, wsHandler: WsApi, notifier: NotifierHandler, store: DefaultStore, messageHelper: MessageHelper, sub: Subscription) {
     super(roomId, wsHandler, notifier, store, sub);
     this.messageHelper = messageHelper;
   }

From b0c435541c75f80d921ba87c6b0f71967f58ccb7 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 14 May 2023 16:29:57 +0300
Subject: [PATCH 152/221] lol

---
 frontend/a.js                                 | 12 +++
 frontend/a.ts                                 | 12 +++
 frontend/build/vite.config.ts                 | 17 ++++
 frontend/src/ts/{utils => classes}/smileys.ts |  0
 frontend/src/ts/message_handlers/WsApi.ts     | 52 +++++-----
 .../ts/message_handlers/WsMessageProcessor.ts |  1 +
 .../src/ts/types/messages/p2p/dto/file.ts     |  4 +
 .../ts/types/messages/p2p/dto/message.info.ts |  0
 .../src/ts/types/messages/p2p/dto/message.ts  | 17 ++++
 frontend/src/ts/types/messages/p2pDto.ts      | 17 ----
 .../peer-connection/accept.file.reply.ts      |  2 +-
 frontend/src/ts/utils/pubsub.ts               |  2 +-
 .../src/ts/webrtc/AbstractPeerConnection.ts   | 70 +++++--------
 frontend/src/ts/webrtc/WebRtcApi.ts           |  4 +-
 .../webrtc/message/MessagePeerConnection.ts   | 97 +++++++++++++------
 frontend/src/vue/App.vue                      |  2 +-
 .../modules/api/websocket/websocket.module.ts |  1 -
 17 files changed, 185 insertions(+), 125 deletions(-)
 create mode 100644 frontend/a.js
 create mode 100644 frontend/a.ts
 rename frontend/src/ts/{utils => classes}/smileys.ts (100%)
 create mode 100644 frontend/src/ts/types/messages/p2p/dto/file.ts
 create mode 100644 frontend/src/ts/types/messages/p2p/dto/message.info.ts
 create mode 100644 frontend/src/ts/types/messages/p2p/dto/message.ts

diff --git a/frontend/a.js b/frontend/a.js
new file mode 100644
index 000000000..db2ffe15e
--- /dev/null
+++ b/frontend/a.js
@@ -0,0 +1,12 @@
+function test() {
+try {
+    throw "error"; // this is not executed, control goes to finally
+  } catch {
+    console.log("catch");
+    return 1;
+  } finally {
+    console.log("finally");
+    return 1000;
+  }
+}
+console.log(test()); // finally 1
diff --git a/frontend/a.ts b/frontend/a.ts
new file mode 100644
index 000000000..5b6fbd76b
--- /dev/null
+++ b/frontend/a.ts
@@ -0,0 +1,12 @@
+  public async readCsv(): Promise<string> {
+    let data: Buffer;
+
+    try {
+      await this.sftp.connect(this.config);
+      const file = await this.lastModifiedFileOnServer();
+      data = (await this.sftp.get(`${this.pathToFolder}/${file}`)) as Buffer;
+      return data.toString();
+    } finally {
+      await this.sftp.end();
+    }
+  }
diff --git a/frontend/build/vite.config.ts b/frontend/build/vite.config.ts
index 2e2e833b3..4eb13a23f 100644
--- a/frontend/build/vite.config.ts
+++ b/frontend/build/vite.config.ts
@@ -36,6 +36,23 @@ export default defineConfig(async({command, mode}) => {
   const distDir = resolve(__dirname, '..', 'dist');
   const nodeModulesDir = resolve(__dirname, '..', 'node_modules');
   const swFilePath = resolve(srcDir, 'ts', 'sw.ts');
+  const plugins = []
+  if (!process.env.VITE_LIGHT) {
+    plugins.push(viteChecker({
+        typescript: true,
+        vueTsc: true,
+        ...(process.env.VITE_LINT ? {
+          eslint: {
+            lintCommand: 'eslint --ext .vue --ext .ts ts vue',
+            dev: {}
+          }
+        } : null)
+      }
+    ),)
+    plugins.push(viteCompression({
+      filter: () => true,
+    }))
+  }
   return {
     resolve: {
       alias: [
diff --git a/frontend/src/ts/utils/smileys.ts b/frontend/src/ts/classes/smileys.ts
similarity index 100%
rename from frontend/src/ts/utils/smileys.ts
rename to frontend/src/ts/classes/smileys.ts
diff --git a/frontend/src/ts/message_handlers/WsApi.ts b/frontend/src/ts/message_handlers/WsApi.ts
index b6433d161..1b82ee609 100644
--- a/frontend/src/ts/message_handlers/WsApi.ts
+++ b/frontend/src/ts/message_handlers/WsApi.ts
@@ -118,14 +118,14 @@ export default class WsApi implements MessageSupplier {
 
   private readonly sessionHolder: SessionHolder;
 
-  private readonly messageProc: WsMessageProcessor;
+  private readonly wsMessageProcessor: WsMessageProcessor;
 
   private readonly sub: Subscription;
 
   public constructor(API_URL: string, sessionHolder: SessionHolder, store: DefaultStore, sub: Subscription) {
     this.sub = sub;
     this.sub.subscribe("ws", this);
-    this.messageProc = new WsMessageProcessor(API_URL, store, "ws", sub);
+    this.wsMessageProcessor = new WsMessageProcessor(API_URL, store, "ws", sub);
     this.logger = loggerFactory.getLoggerColor("ws", "#4c002b");
     this.sessionHolder = sessionHolder;
     this.store = store;
@@ -133,14 +133,14 @@ export default class WsApi implements MessageSupplier {
 
 
   public async getCountryCode(): Promise<GetCountryCodeWsInBody> {
-    return this.messageProc.sendToServerAndAwait<GetCountryCodeWsOutMessage, GetCountryCodeWsInMessage>({
+    return this.wsMessageProcessor.sendToServerAndAwait<GetCountryCodeWsOutMessage, GetCountryCodeWsInMessage>({
       action: "getCountryCode",
       data: null,
     });
   }
 
   public async offerFile(roomId: number, browser: string, name: string, size: number, threadId: number | null): Promise<WebRtcSetConnectionIdBody> {
-    return this.messageProc.sendToServerAndAwait<OfferFileRequest, OfferFileResponse>({
+    return this.wsMessageProcessor.sendToServerAndAwait<OfferFileRequest, OfferFileResponse>({
       action: "offerFile",
       data: {
         roomId,
@@ -153,7 +153,7 @@ export default class WsApi implements MessageSupplier {
   }
 
   public async offerCall(roomId: number, browser: string): Promise<WebRtcSetConnectionIdBody> {
-    return this.messageProc.sendToServerAndAwait<OfferCallRequestWsOutMessage, OfferCallResponseWsInMessage>({
+    return this.wsMessageProcessor.sendToServerAndAwait<OfferCallRequestWsOutMessage, OfferCallResponseWsInMessage>({
       action: "offerCall",
       data: {
         roomId,
@@ -202,7 +202,7 @@ export default class WsApi implements MessageSupplier {
     roomId: number,
     offset: number,
   ): Promise<MessagesResponseMessage> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       searchString,
       roomId,
       offset,
@@ -231,14 +231,14 @@ export default class WsApi implements MessageSupplier {
   public async sendPrintMessage(
     data: PrintMessageWsOutBody,
   ): Promise<PrintMessageWsInMessage> {
-    return this.messageProc.sendToServerAndAwait<PrintMessageWsOutMessage, PrintMessageWsInMessage>({
+    return this.wsMessageProcessor.sendToServerAndAwait<PrintMessageWsOutMessage, PrintMessageWsInMessage>({
       action: "printMessage",
       data,
     });
   }
 
   public async saveSettings(content: UserSettingsDto): Promise<SetSettingsMessage | unknown> {
-    return this.messageProc.sendToServerAndAwait<SetSettingsWsOutMessage, SetSettingsMessage>({
+    return this.wsMessageProcessor.sendToServerAndAwait<SetSettingsWsOutMessage, SetSettingsMessage>({
       action: "setSettings",
       data: content,
     });
@@ -254,14 +254,14 @@ export default class WsApi implements MessageSupplier {
   }
 
   public async saveUser(data: UserProfileDtoWoImage): Promise<SetUserProfileBody> {
-    return this.messageProc.sendToServerAndAwait<SetUserProfileWsOutMessage, SetUserProfileMessage>({
+    return this.wsMessageProcessor.sendToServerAndAwait<SetUserProfileWsOutMessage, SetUserProfileMessage>({
       action: "setUserProfile",
       data,
     });
   }
 
   public async sendAddRoom(data: AddRoomWsOutBody): Promise<AddRoomWsInBody> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       data,
       action: "addRoom",
     });
@@ -274,7 +274,7 @@ export default class WsApi implements MessageSupplier {
     onServerMessageIds: number[],
     lastSynced: number,
   ): Promise<SyncHistoryWsInMessage> {
-    return this.messageProc.sendToServerAndAwait<SyncHistoryWsOutMessage, "syncHistory">({
+    return this.wsMessageProcessor.sendToServerAndAwait<SyncHistoryWsOutMessage, "syncHistory">({
       messagesIds,
       receivedMessageIds,
       onServerMessageIds,
@@ -285,7 +285,7 @@ export default class WsApi implements MessageSupplier {
   }
 
   public async sendAddChannel(channelName: string, users: number[]): Promise<AddChannelWsInMessage> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       channelName,
       users,
       action: "addChannel",
@@ -293,21 +293,21 @@ export default class WsApi implements MessageSupplier {
   }
 
   public async sendRoomSettings(message: RoomNoUsersDto): Promise<void> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       ...message,
       action: "saveRoomSettings",
     });
   }
 
   public async sendDeleteChannel(channelId: number): Promise<unknown> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       channelId,
       action: "deleteChannel",
     });
   }
 
   public async sendLeaveChannel(channelId: number): Promise<unknown> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       channelId,
       action: "leaveChannel",
     });
@@ -320,7 +320,7 @@ export default class WsApi implements MessageSupplier {
     volume: number,
     notifications: boolean,
   ): Promise<SaveChannelSettingsWsInMessage> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       action: "saveChannelSettings",
       channelId,
       channelCreatorId,
@@ -331,7 +331,7 @@ export default class WsApi implements MessageSupplier {
   }
 
   public async inviteUser(roomId: number, users: number[]): Promise<AddInviteWsInMessage> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       roomId,
       users,
       action: "inviteUser",
@@ -344,14 +344,14 @@ export default class WsApi implements MessageSupplier {
   }
 
   public async sendDeleteRoom(roomId: number) {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       roomId,
       action: "deleteRoom",
     });
   }
 
   public async sendLeaveRoom(roomId: number) {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       roomId,
       action: "leaveUser",
     });
@@ -362,7 +362,7 @@ export default class WsApi implements MessageSupplier {
     roomId: number,
     status: MessageStatus,
   ) {
-    return this.messageProc.sendToServerAndAwait<SetMessageStatusWsOutMessage, "setMessageStatus">({
+    return this.wsMessageProcessor.sendToServerAndAwait<SetMessageStatusWsOutMessage, "setMessageStatus">({
       messagesIds,
       action: "setMessageStatus",
       status,
@@ -376,7 +376,7 @@ export default class WsApi implements MessageSupplier {
     threadId: number | null,
     excludeIds: number[],
   ): Promise<MessagesResponseMessage> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       count,
       excludeIds,
       threadId,
@@ -389,7 +389,7 @@ export default class WsApi implements MessageSupplier {
     roomId: number,
     messagesIds: number[],
   ): Promise<MessagesResponseMessage> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       messagesIds,
       action: "loadMessagesByIds",
       roomId,
@@ -436,7 +436,7 @@ export default class WsApi implements MessageSupplier {
   }
 
   public async offerMessageConnection(roomId: number): Promise<WebRtcSetConnectionIdMessage> {
-    return this.messageProc.sendToServerAndAwait({
+    return this.wsMessageProcessor.sendToServerAndAwait({
       action: "offerMessage",
       roomId,
     });
@@ -482,7 +482,7 @@ export default class WsApi implements MessageSupplier {
 
   @Subscribe<SetWsIdWsInMessage>()
   public async setWsId(message: SetWsIdBody) {
-    this.messageProc.setWsConnectionId(message.opponentWsId);
+    this.wsMessageProcessor.setWsConnectionId(message.opponentWsId);
     this.setUserInfo(message.profile);
     this.setUserSettings(message.settings);
     this.setUserImage(message.profile.thumbnail);
@@ -522,7 +522,7 @@ export default class WsApi implements MessageSupplier {
 
   @Subscribe<PingWsInMessage>()
   public ping(message: PingWsInBody) {
-    this.messageProc.startNoPingTimeout();
+    this.wsMessageProcessor.startNoPingTimeout();
     this.sendToServer<PongWsOutMessage>({
       action: "pong",
       data: {
@@ -602,7 +602,7 @@ export default class WsApi implements MessageSupplier {
 
 
   private sendToServer<T extends DefaultWsOutMessage<string, any>>(messageRequest: T, skipGrowl = false): boolean {
-    const isSent = this.messageProc.sendToServer<T>(messageRequest);
+    const isSent = this.wsMessageProcessor.sendToServer<T>(messageRequest);
     if (!isSent && !skipGrowl) {
       this.logger.warn("Can't send message, because connection is lost :(")();
     }
diff --git a/frontend/src/ts/message_handlers/WsMessageProcessor.ts b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
index d39885b55..8aa700b3a 100644
--- a/frontend/src/ts/message_handlers/WsMessageProcessor.ts
+++ b/frontend/src/ts/message_handlers/WsMessageProcessor.ts
@@ -58,6 +58,7 @@ export class WsMessageProcessor extends AbstractMessageProcessor {
       const message1: LogoutMessage = {
         action: "logout",
         handler: "*",
+        data: null,
       };
       this.sub.notify(message1);
       return;
diff --git a/frontend/src/ts/types/messages/p2p/dto/file.ts b/frontend/src/ts/types/messages/p2p/dto/file.ts
new file mode 100644
index 000000000..551f95a2b
--- /dev/null
+++ b/frontend/src/ts/types/messages/p2p/dto/file.ts
@@ -0,0 +1,4 @@
+export interface FileP2pDto {
+  base64: string;
+  name: string;
+}
diff --git a/frontend/src/ts/types/messages/p2p/dto/message.info.ts b/frontend/src/ts/types/messages/p2p/dto/message.info.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/frontend/src/ts/types/messages/p2p/dto/message.ts b/frontend/src/ts/types/messages/p2p/dto/message.ts
new file mode 100644
index 000000000..38235ab06
--- /dev/null
+++ b/frontend/src/ts/types/messages/p2p/dto/message.ts
@@ -0,0 +1,17 @@
+import {MessageStatusModel} from "@/ts/types/model";
+import {FileP2pDto} from "@/ts/types/messages/p2pDto";
+
+export interface MessageP2pDto {
+  id: number;
+  content: string | null;
+  files: Record<string, FileP2pDto>;
+  timeAgo: number;
+  symbol: string | null;
+  status: MessageStatusModel;
+  parentMessage: number | null;
+  deleted: boolean;
+  edited: number;
+  userId: number;
+}
+
+
diff --git a/frontend/src/ts/types/messages/p2pDto.ts b/frontend/src/ts/types/messages/p2pDto.ts
index 861933c41..1a0447741 100644
--- a/frontend/src/ts/types/messages/p2pDto.ts
+++ b/frontend/src/ts/types/messages/p2pDto.ts
@@ -1,21 +1,4 @@
 import type {MessageStatusModel} from "@/ts/types/model";
 
-export interface MessageP2pDto {
-  id: number;
-  content: string | null;
-  files: Record<string, FileP2pDto>;
-  timeAgo: number;
-  symbol: string | null;
-  status: MessageStatusModel;
-  parentMessage: number | null;
-  deleted: boolean;
-  edited: number;
-  userId: number;
-}
 
-export interface FileP2pDto {
-  base64: string;
-  name: string;
-}
 
-export type MessagesInfo = Record<string, number | null>;
diff --git a/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts b/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
index 9b59699f0..fd47c3fe9 100644
--- a/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
+++ b/frontend/src/ts/types/messages/peer-connection/accept.file.reply.ts
@@ -1,3 +1,3 @@
 import type {DefaultInnerSystemMessage} from "@/ts/types/messages/helper";
 
-export type CheckDestroyInnerSystemMessage = DefaultInnerSystemMessage<"checkDestroy", "peerConnection:*", null>;
+export type AcceptFileReplyInnerSystemMessage = DefaultInnerSystemMessage<"acceptFileReply", "peerConnection:*", null>;
diff --git a/frontend/src/ts/utils/pubsub.ts b/frontend/src/ts/utils/pubsub.ts
index ac6a633e9..95a195d2f 100644
--- a/frontend/src/ts/utils/pubsub.ts
+++ b/frontend/src/ts/utils/pubsub.ts
@@ -24,7 +24,7 @@ export function P2PSubscribe<K extends DefaultP2pMessage<A, D>, A extends string
       TypedPropertyDescriptor<((firstParameter: K["data"]) => void)>
       | TypedPropertyDescriptor<(() => void)>
       | TypedPropertyDescriptor<(() => Promise<void>)>
-      | TypedPropertyDescriptor<((firstParameter: K["data"]) => Promise<void>)>
+      | TypedPropertyDescriptor<((firstParameter: K) => Promise<void>)>
   ) => {
     if (!target.__p2p_handlers) {
       target.__p2p_handlers = {}
diff --git a/frontend/src/ts/webrtc/AbstractPeerConnection.ts b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
index 03a402916..9a5b56d17 100644
--- a/frontend/src/ts/webrtc/AbstractPeerConnection.ts
+++ b/frontend/src/ts/webrtc/AbstractPeerConnection.ts
@@ -1,6 +1,6 @@
 import type {CheckTransferDestroyMessage} from "@/ts/types/messages/inner/check.transfer.destroy";
-import type {ConnectToRemoteMessage} from "@/ts/types/messages/inner/connect.to.remote";
-import type {
+import type {ConnectToRemoteMessage, ConnectToRemoteMessageBody} from "@/ts/types/messages/inner/connect.to.remote";
+import {
   SendRtcDataWsInBody,
 } from "@common/ws/message/peer-connection/send.rtc.data";
 import type {HandlerName} from "@common/ws/common";
@@ -14,10 +14,8 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import {WEBRTC_RUNTIME_CONFIG} from "@/ts/utils/runtimeConsts";
 import {Subscribe} from "@/ts/utils/pubsub";
-import {SendRtcDataWsInMessage} from "@common/ws/message/peer-connection/send.rtc.data";
-import {ConnectToRemoteMessageBody} from "@/ts/types/messages/inner/connect.to.remote";
+import type {SendRtcDataWsInMessage} from "@common/ws/message/peer-connection/send.rtc.data";
 import {SessionHolder} from "@/ts/types/types";
-import {DefaultP2pMessage} from "@/ts/types/messages/p2pMessages";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 
 
@@ -26,26 +24,14 @@ export default abstract class AbstractPeerConnection extends AbstractMessageProc
 
   protected sendRtcDataQueue: SendRtcDataWsInBody[] = [];
 
-  protected readonly opponentWsId: string;
-
-  protected readonly connectionId: string;
-
   protected logger: Logger;
 
   protected pc: RTCPeerConnection | null = null;
 
   protected sdpConstraints: any;
 
-  protected readonly wsHandler: WsApi;
-
-  protected readonly store: DefaultStore;
-
-  protected readonly roomId: number;
-
   protected sendChannel: RTCDataChannel | null = null;
 
-  protected readonly sub: Subscription;
-
   private readonly pc_constraints: unknown = {
     optional: [/* Firefox*/
       /* {DtlsSrtpKeyAgreement: true},*/
@@ -53,20 +39,22 @@ export default abstract class AbstractPeerConnection extends AbstractMessageProc
     ],
   };
 
-   constructor(
+    public constructor(
+    private readonly roomId: number,
+    private readonly connectionId: string,
+    private readonly opponentWsId: string,
+    private readonly wsHandler: WsApi,
+    private readonly store: DefaultStore,
+    private readonly sub: Subscription,
     private readonly sessionHolder: SessionHolder,
   ) {
     super("p2p");
+    this.sub.subscribe(Subscription.allPeerConnectionsForTransfer(connectionId), this);
+    this.sub.subscribe(this.mySubscriberId, this);
+    this.logger = loggerFactory.getLoggerColor(`peer:${this.connectionId}:${this.opponentWsId}`, "#960055");
+    this.logger.log("Created {}", this.constructor.name)();
   }
-  public resolveCBifItsThere(data: DefaultP2pMessage<string>): boolean {
-    this.logger.debug("resolving cb")();
-    if (data.resolveCbId) {
-      this.callBacks[data.resolveCbId].resolve(data);
-      delete this.callBacks[data.resolveCbId];
-      return true;
-    }
-    return false;
-  }
+
 
   public sendRawTextToServer(message: string): boolean {
     if (this.isChannelOpened) {
@@ -81,7 +69,7 @@ export default abstract class AbstractPeerConnection extends AbstractMessageProc
   }
 
 
-    protected setupEvents() {
+  protected setupEvents() {
     this.sendChannel!.onmessage = this.onChannelMessage.bind(this);
     this.sendChannel!.onopen = () => {
       this.logger.log("Channel opened")();
@@ -102,27 +90,15 @@ export default abstract class AbstractPeerConnection extends AbstractMessageProc
   onDropConnection(reason: string) {
     this.logger.log(`Closed channel ${reason}`)();
     super.onDropConnection(reasong);
-     if (this.store.userInfo) {
-        // Otherwise we logged out
-        this.store.removeLiveConnectionToRoom({
-          connection: this.opponentWsId,
-          roomId: this.roomId,
-        });
-      }
+    if (this.store.userInfo) {
+      // Otherwise we logged out
+      this.store.removeLiveConnectionToRoom({
+        connection: this.opponentWsId,
+        roomId: this.roomId,
+      });
+    }
   }
 
-  public constructor(roomId: number, connectionId: string, opponentWsId: string, ws: WsApi, store: DefaultStore, sub: Subscription) {
-    this.roomId = roomId;
-    this.connectionId = connectionId;
-    this.opponentWsId = opponentWsId;
-    this.sub = sub;
-    this.sub.subscribe(Subscription.allPeerConnectionsForTransfer(connectionId), this);
-    this.sub.subscribe(this.mySubscriberId, this);
-    this.wsHandler = ws;
-    this.store = store;
-    this.logger = loggerFactory.getLoggerColor(`peer:${this.connectionId}:${this.opponentWsId}`, "#960055");
-    this.logger.log("Created {}", this.constructor.name)();
-  }
 
   abstract get connectedToRemote(): boolean;
   abstract set connectedToRemote(v: boolean);
diff --git a/frontend/src/ts/webrtc/WebRtcApi.ts b/frontend/src/ts/webrtc/WebRtcApi.ts
index 951efe754..8b5a43f65 100644
--- a/frontend/src/ts/webrtc/WebRtcApi.ts
+++ b/frontend/src/ts/webrtc/WebRtcApi.ts
@@ -56,8 +56,8 @@ import type {VideoAnswerCallMessage} from "@/ts/types/messages/inner/video.answe
 import type {DeclineSendingMessage} from "@/ts/types/messages/peer-connection/decline.sending";
 import type {DeclineFileReply} from "@/ts/types/messages/peer-connection/decline.file.reply";
 import type {RetryFileReply} from "@/ts/types/messages/peer-connection/retry.file.reply";
-import type {AcceptFileReply} from "@/ts/types/messages/peer-connection/accept.file.reply";
 import {WebRtcSetConnectionIdBody} from "@common/model/webrtc.base";
+import {AcceptFileReplyInnerSystemMessage} from "@/ts/types/messages/peer-connection/accept.file.reply";
 
 
 export default class WebRtcApi {
@@ -156,7 +156,7 @@ export default class WebRtcApi {
   }
 
   public acceptFile(connId: string, webRtcOpponentId: string) {
-    this.sub.notify<AcceptFileReply>({
+    this.sub.notify<AcceptFileReplyInnerSystemMessage>({
       action: "acceptFileReply",
       handler: Subscription.getPeerConnectionId(connId, webRtcOpponentId),
       data: null,
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index c3b687a9a..7aa08be52 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -1,13 +1,14 @@
 import {MessageStatus} from "@common/model/enum/message.status";
 import type {SendSetMessagesStatusMessage} from "@/ts/types/messages/inner/send.set.messages.status";
+import {
+  SyncP2PMessageBody,
+} from "@/ts/types/messages/inner/sync.p2p";
 import type {
   SyncP2PInnerSystemMessage,
-  SyncP2PMessageBody
 } from "@/ts/types/messages/inner/sync.p2p";
 import AbstractPeerConnection from "@/ts/webrtc/AbstractPeerConnection";
 import type WsApi from "@/ts/message_handlers/WsApi";
 import type {DefaultStore} from "@/ts/classes/DefaultStore";
-import {P2PMessageProcessor} from "@/ts/message_handlers/P2PMessageProcessor";
 
 import type {MessageModel, RoomModel} from "@/ts/types/model";
 import {MessageStatusInner} from "@/ts/types/model";
@@ -19,26 +20,44 @@ import loggerFactory from "@/ts/instances/loggerFactory";
 import type Subscription from "@/ts/classes/Subscription";
 import {
   P2PSubscribe,
-  Subscribe
+  Subscribe,
 } from "@/ts/utils/pubsub";
-import {SetMessageStatusWsInBody, SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
-import {CheckDestroyInnerSystemMessage} from "@/ts/types/messages/peer-connection/accept.file.reply";
+import type {SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
+import {SetMessageStatusWsInBody} from "@common/ws/message/set.message.status";
+import type {CheckDestroyInnerSystemMessage} from "@/ts/types/messages/peer-connection/accept.file.reply";
 import {SendSetMessagesStatusMessageBody} from "@/ts/types/messages/inner/send.set.messages.status";
+import type {
+  SendSetMessagesStatusInnerSystemMessage,
+} from "@/ts/types/messages/inner/send.set.message.status";
 import {
   SendSetMessagesStatusInnerSystemBody,
-  SendSetMessagesStatusInnerSystemMessage
 } from "@/ts/types/messages/inner/send.set.message.status";
 import {SetMessageStatusP2pMessage} from "@/ts/types/messages/p2p/set.message.status";
+import type {
+  ExchangeMessageInfo1RequestP2pMessage,
+} from "@/ts/types/messages/p2p/exchange.message.info";
 import {
   ExchangeMessageInfo1RequestP2pBody,
-  ExchangeMessageInfo1RequestP2pMessage
 } from "@/ts/types/messages/p2p/exchange.message.info";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
+import type {DefaultP2pMessage} from "@/ts/types/messages/p2p";
+import type {
+  RequestWsOutMessage,
+  ResponseWsInMessage,
+} from "@common/ws/common";
+import {
+  ExchangeMessageInfoResponse,
+  ExchangeMessageInfoResponse2,
+  ExchangeMessageInfoResponse3,
+  SendNewP2PMessage
+} from "@/ts/types/messages/p2pMessages";
 
 
-export default abstract class MessagePeerConnection extends AbstractPeerConnection  {
+export default abstract class MessagePeerConnection extends AbstractPeerConnection {
   connectedToRemote: boolean = true;
 
+  protected readonly callBacks: Record<number, {resolve: Function; reject: Function; all?: true}> = {};
+
   protected readonly handlers: HandlerTypes<keyof MessagePeerConnection, "peerConnection:*"> = {
     syncP2pMessage: <HandlerType<"syncP2pMessage", "peerConnection:*">> this.syncP2pMessage,
     sendSetMessagesStatus: <HandlerType<"sendSetMessagesStatus", "peerConnection:*">> this.sendSetMessagesStatus,
@@ -46,12 +65,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
 
   protected status: "inited" | "not_inited" = "not_inited";
 
-  private readonly p2pHandlers: P2PHandlerTypes<keyof MessagePeerConnection> = {
-    exchangeMessageInfoRequest: <P2PHandlerType<"exchangeMessageInfoRequest">> this.exchangeMessageInfoRequest,
-    sendNewP2PMessage: <P2PHandlerType<"sendNewP2PMessage">> this.sendNewP2PMessage,
-  };
-
-  private readonly messageProc: AbstractMessageProcessor;
+  private readonly messageProc: P2PMessageProcessor;
 
   private readonly opponentUserId: number;
 
@@ -96,7 +110,7 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
       data: {
         messagesIds: payload.messageIds,
         status: MessageStatus.READ,
-      }
+      },
     });
     this.store.setMessagesStatus({
       roomId: this.roomId,
@@ -104,12 +118,13 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
       messagesIds: payload.messageIds,
     });
   }
-  @P2PSubscribe<SetMessageStatusWsInMessage>()
-  public async setMessageStatus(m: SetMessageStatusWsInBody) {
+
+  @P2PSubscribe<SetMessageStatusP2pMessage>()
+  public async setMessageStatus(m: SetMessageStatusP2pMessage) {
     this.store.setMessagesStatus({
       roomId: this.roomId,
-      status: m.status,
-      messagesIds: m.messagesIds,
+      status: m.data.status,
+      messagesIds: m.data.messagesIds,
     });
   }
 
@@ -258,20 +273,44 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     this.messageProc.onDropConnection("data channel lost");
   }
 
+  public resolveCBifItsThere(data: DefaultP2pMessage<string>): boolean {
+
+  }
+
+  public async sendToServerAndAwaitData<REQ extends RequestWsOutMessage<any, any>, RES extends ResponseWsInMessage<any>>(message: Omit<REQ, "cbId">): Promise<RES> {
+    return new Promise((resolve, reject) => {
+      (message as any).cbId = ++this.uniquePositiveMessageId;
+      const jsonMessage = this.getJsonMessage(message);
+      this.callBacks[(message as any).cbId!] = {
+        resolve,
+        reject,
+        all: true,
+      };
+      const isSent = this.sendRawTextToServer(jsonMessage);
+      if (isSent) {
+        this.logData(this.loggerOut, jsonMessage, message)();
+      }
+    });
+  }
 
 
   protected onChannelMessage(event: MessageEvent) {
-    const data: DefaultP2pMessage<keyof MessagePeerConnection> = this.messageProc.parseMessage(event.data) as unknown as DefaultP2pMessage<keyof MessagePeerConnection>;
-    if (data) {
-      const cb = this.messageProc.resolveCBifItsThere(data);
-      if (!cb) {
-        const handler: P2PHandlerType<keyof MessagePeerConnection> = this.p2pHandlers[data.action] as P2PHandlerType<keyof MessagePeerConnection>;
-        if (handler) {
-          handler.bind(this)(data);
-        } else {
-          this.logger.error("{} can't find handler for {}, available handlers {}. Message: {}", this.constructor.name, data.action, Object.keys(this.p2pHandlers), data)();
-        }
+    const data = this.messageProc.parseMessage(event.data);
+    if (!data) {
+      throw Error("WTF");
+    }
+    if (data.resolveCbId) {
+      this.callBacks[data.resolveCbId].resolve(data);
+      delete this.callBacks[data.resolveCbId];
+    } else if (data.action) {
+      const handler = this.__p2p_handlers[data.action];
+      if (handler) {
+        handler.bind(this)(data);
+      } else {
+        throw Error(`Invalid handler ${handler} for message ${event.data}`);
       }
+    } else {
+      throw Error(`Invalid message ${event.data}`);
     }
   }
 
diff --git a/frontend/src/vue/App.vue b/frontend/src/vue/App.vue
index 508d919bd..76a5344b1 100644
--- a/frontend/src/vue/App.vue
+++ b/frontend/src/vue/App.vue
@@ -38,7 +38,7 @@ export default class App extends Vue {
 }
 </script>
 <style lang="sass">
-  @import "@/assets/sass/common.sass";
+@import "@/assets/sass/common.sass";
 </style>
 <style lang="sass" scoped>
 .body
diff --git a/newback/src/modules/api/websocket/websocket.module.ts b/newback/src/modules/api/websocket/websocket.module.ts
index 85cc2d9c2..a1c03b19b 100644
--- a/newback/src/modules/api/websocket/websocket.module.ts
+++ b/newback/src/modules/api/websocket/websocket.module.ts
@@ -22,7 +22,6 @@ import {PubsubModule} from "@/modules/shared/pubsub/pubsub.module";
     MessageService,
     WebsocketGateway,
   ],
-
 })
 export class WebsocketModule {
 }

From 04d0d2efef18775f8e385a6f0b4840fd522bab48 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Sun, 14 May 2023 16:39:09 +0300
Subject: [PATCH 153/221] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 629525531..3fcf055d0 100644
--- a/README.md
+++ b/README.md
@@ -63,12 +63,12 @@ Pychat is an opensource absolutely free communication tool targeted for a compan
 
 I would personally use discord or slack as a company chat. They are built and maintained by thousands of people rather than a single person. BUT wait!!! There're some key factors of picking pychat over others:
 
- 1. Being opensource. If you need to add some custom tool or feature, you will never able to do this with any other messanger. Slack and discord provides plugins but they are still limited.
+ 1. Being opensource. If you need to add some custom tool or feature, you will never able to do this with any helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -fother messanger. Slack and discord provides plugins but they are still limited.
  2. Being absolutely free. You don't need to pay anything to use or setup pychat at all. You can host pychat on low-end hardware like Raspberry Pi which costs under 50$ and will easily handle thousands of active users. Slack and Discord [will charge you](https://www.chanty.com/blog/discord-vs-slack/) for the set of features you need now or WILL need in the future. Telegram/Skype/Viber and etc are not corporate chats and they lack a lot of features and there're people all over the world which could accidentaly be invited to your group. 
  3. Security. All of the chats above are SAAS solutions, but not Pychat! Remember wHen you chose any messangers, all of your communication is stored on external hard drive which is always less secure. Some messangers like viber or whatsapp backup do not store messages but rather backup history to your google driver. But that often leads to holes in history and broken search. Also only pychat features p2p file sharing. Do you still use messangers to echange ssh keys or any other secure files? Never store them on the server! Only with pychat you can send file directly to another person ommiting persisting it on the server.
  4. You just feel enthusiastic for bleeding-edge opensource projects. 
 
-# How to host pychat
+# How to host pychathelm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f
 
 Notice: 
 pychat is migrating from vue2 to vue3 and this change has been released to master. The older code that supports some feature (electron/cordova) is still not migrated and located at branch [vue2-webpack](https://github.com/akoidan/pychat/tree/vue2-webpack)
@@ -524,7 +524,7 @@ http ALL=(ALL) NOPASSWD: RESTART_TORNADO
  - kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml
  - helm repo add jetstack https://charts.jetstack.io
  - helm repo update
- - helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f -
+ - helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f
  4.2 Generate cloudflare token
  - In clodflare dashboard: Profile → API Tokens → Create Token.  https://dash.cloudflare.com/profile/api-tokens Permissions: Zone — DNS — Edit, Zone — Zone — Read; Zone Resources: Include — All Zones
  - put token into `kubernetes/cf-secret-yaml`

From d9fa4f90d994d1e5ec8a7871f6f4a0f7cda1edb2 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Sun, 14 May 2023 16:40:43 +0300
Subject: [PATCH 154/221] Update README.md

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3fcf055d0..5353b4c92 100644
--- a/README.md
+++ b/README.md
@@ -520,12 +520,14 @@ http ALL=(ALL) NOPASSWD: RESTART_TORNADO
  - Installing ingress controller: `helm install nginx-ingress ingress-nginx/ingress-nginx`. You should see load-banancer on your admin dashboard now.
  - Specify load-balancer ip address in your DNS provider.
  4. If you don't have ssl certificate, lets use letsencrypt and certmanager to generate it for us.
- 4.1 Install cert-manager
+ 
+ 4.1. Install cert-manager
  - kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml
  - helm repo add jetstack https://charts.jetstack.io
  - helm repo update
  - helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f
- 4.2 Generate cloudflare token
+ 
+ 4.2. Generate cloudflare token
  - In clodflare dashboard: Profile → API Tokens → Create Token.  https://dash.cloudflare.com/profile/api-tokens Permissions: Zone — DNS — Edit, Zone — Zone — Read; Zone Resources: Include — All Zones
  - put token into `kubernetes/cf-secret-yaml`
 ```yaml
@@ -541,10 +543,12 @@ stringData:
  - `kubectl apply -f kubernetes/namespace.yaml`
  - `kubectl apply -f kubernetes/cf-secret.yaml`
  - `kubectl apply -f kubernetes/cert-manager.yaml`
- 4.3 Verify certificate
+ 
+ 4.3. Verify certificate
  - Check that it's created `kubectl get secret pychat-tls -o yaml -n pychat`
  - save it to file: `echo base64certfrom-tls.cert |base64 -d > lol.cert`
  - Should give your domain `openssl x509 -in ./lol.cert  -noout -text
+ 
  5. Build images and upload it to docker registry:
   - `docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .` 
   - `docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend .` 

From 793379a39e9213331aaaf38b6117c550b6a716d4 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Sun, 14 May 2023 16:41:20 +0300
Subject: [PATCH 155/221] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5353b4c92..37c2d6312 100644
--- a/README.md
+++ b/README.md
@@ -525,7 +525,7 @@ http ALL=(ALL) NOPASSWD: RESTART_TORNADO
  - kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml
  - helm repo add jetstack https://charts.jetstack.io
  - helm repo update
- - helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f
+ - helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f -
  
  4.2. Generate cloudflare token
  - In clodflare dashboard: Profile → API Tokens → Create Token.  https://dash.cloudflare.com/profile/api-tokens Permissions: Zone — DNS — Edit, Zone — Zone — Read; Zone Resources: Include — All Zones

From 726d0a0d2d74f4f7789fb59a8707640b43008f92 Mon Sep 17 00:00:00 2001
From: Andrew Koidan <deathangel908@gmail.com>
Date: Sun, 14 May 2023 19:25:37 +0300
Subject: [PATCH 156/221] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 37c2d6312..d7a89777b 100644
--- a/README.md
+++ b/README.md
@@ -547,7 +547,7 @@ stringData:
  4.3. Verify certificate
  - Check that it's created `kubectl get secret pychat-tls -o yaml -n pychat`
  - save it to file: `echo base64certfrom-tls.cert |base64 -d > lol.cert`
- - Should give your domain `openssl x509 -in ./lol.cert  -noout -text
+ - Should give your domain `openssl x509 -in ./lol.cert  -noout -text`
  
  5. Build images and upload it to docker registry:
   - `docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .` 

From 9d67ceb1344e737563f18bd6c92058d851277c21 Mon Sep 17 00:00:00 2001
From: andrew <andrew.koidan@vertrical.com>
Date: Fri, 19 May 2023 10:56:03 +0300
Subject: [PATCH 157/221] Added postfix

---
 kubernetes/DockerfilePostfix |  8 +++++
 kubernetes/postfix.yaml      | 66 ++++++++++++++++++++++++++++++++++++
 kubernetes/postfix/main.cf   | 39 +++++++++++++++++++++
 kubernetes/postfix/master.cf | 25 ++++++++++++++
 4 files changed, 138 insertions(+)
 create mode 100644 kubernetes/DockerfilePostfix
 create mode 100644 kubernetes/postfix.yaml
 create mode 100644 kubernetes/postfix/main.cf
 create mode 100644 kubernetes/postfix/master.cf

diff --git a/kubernetes/DockerfilePostfix b/kubernetes/DockerfilePostfix
new file mode 100644
index 000000000..6d84f17ab
--- /dev/null
+++ b/kubernetes/DockerfilePostfix
@@ -0,0 +1,8 @@
+FROM alpine:3.17.3
+RUN apk update && \
+    apk add --no-cache postfix
+
+COPY ./postfix/main.cf /etc/postfix/main.cf
+COPY ./postfix/master.cf /etc/postfix/master.cf
+RUN /usr/bin/newaliases
+CMD ["/usr/sbin/postfix", "start-fg"]
\ No newline at end of file
diff --git a/kubernetes/postfix.yaml b/kubernetes/postfix.yaml
new file mode 100644
index 000000000..0c3ddab70
--- /dev/null
+++ b/kubernetes/postfix.yaml
@@ -0,0 +1,66 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: postfix-deployment
+  namespace: pychat
+  labels:
+    app: postfix
+spec:
+  selector:
+    matchLabels:
+      app: postfix
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: postfix
+    spec:
+      volumes:
+        - name: pychat-postfix-tls
+          secret:
+            secretName: pychat-tls
+            items:
+              - key: tls.crt
+                path: crt.pem
+              - key: tls.key
+                path: key.pem
+      containers:
+        - name: postfix
+          image: deathangel908/pychat-postfix
+          imagePullPolicy: Always
+          volumeMounts:
+          - name: pychat-postfix-tls
+            mountPath: "/etc/tls"
+            readOnly: true
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: postfix-service
+  namespace: pychat
+spec:
+  selector:
+    app: postfix
+  ports:
+    - protocol: TCP
+      port: 25
+      name: smtp-tls
+      targetPort: 25
+    - protocol: TCP
+      port: 587
+      name: smpt-tcp-reply-1
+      targetPort: 587
+    - protocol: TCP
+      port: 465
+      name: smpt-tcp-reply-2
+      targetPort: 465
+#---
+#apiVersion: v1
+#kind: ConfigMap
+#metadata:
+#  name: tcp-services
+#  namespace: pychat
+#data:
+#  25: "pychat/postfix-service:25"
+#  587: "pychat/postfix-service:587"
+#  465: "pychat/postfix-service:465"
\ No newline at end of file
diff --git a/kubernetes/postfix/main.cf b/kubernetes/postfix/main.cf
new file mode 100644
index 000000000..e1466fa68
--- /dev/null
+++ b/kubernetes/postfix/main.cf
@@ -0,0 +1,39 @@
+compatibility_level = 3.7
+queue_directory = /var/spool/postfix
+command_directory = /usr/sbin
+daemon_directory = /usr/libexec/postfix
+data_directory = /var/lib/postfix
+mail_spool_directory = /var/spool/mail
+mail_owner = postfix
+myhostname = pychat.org
+mydomain = pychat.org
+maillog_file = /dev/stdout
+myorigin = $mydomain
+inet_interfaces = all
+inet_protocols = ipv4
+mydestination = $myhostname, localhost.$mydomain, localhost
+unknown_local_recipient_reject_code = 550
+mynetworks =  127.0.0.0/8, localhost, [::1]/128, 10.0.0.0/8
+relay_domains =
+home_mailbox = Maildir/
+debug_peer_level = 2
+debugger_command =
+	PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+	ddd $daemon_directory/$process_name $process_id & sleep 5
+sendmail_path = /usr/sbin/sendmail
+newaliases_path = /usr/bin/newaliases
+mailq_path = /usr/bin/mailq
+setgid_group = postdrop
+html_directory = no
+manpage_directory = /usr/share/man
+sample_directory = /etc/postfix/sample
+readme_directory = /usr/share/doc/postfix
+## SSL
+smtpd_use_tls = yes
+smtpd_tls_auth_only = yes
+smtpd_tls_key_file = /etc/tls/key.pem
+smtpd_tls_cert_file = /etc/tls/crt.pem
+smtpd_tls_loglevel = 1
+meta_directory = /etc/postfix
+shlib_directory = /usr/lib/postfix
+smtpd_recipient_restrictions= permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination
diff --git a/kubernetes/postfix/master.cf b/kubernetes/postfix/master.cf
new file mode 100644
index 000000000..1180cc1c1
--- /dev/null
+++ b/kubernetes/postfix/master.cf
@@ -0,0 +1,25 @@
+smtp      inet  n       -       n       -       -       smtpd
+pickup    unix  n       -       n       60      1       pickup
+cleanup   unix  n       -       n       -       0       cleanup
+qmgr      unix  n       -       n       300     1       qmgr
+tlsmgr    unix  -       -       n       1000?   1       tlsmgr
+rewrite   unix  -       -       n       -       -       trivial-rewrite
+bounce    unix  -       -       n       -       0       bounce
+defer     unix  -       -       n       -       0       bounce
+trace     unix  -       -       n       -       0       bounce
+verify    unix  -       -       n       -       1       verify
+flush     unix  n       -       n       1000?   0       flush
+proxymap  unix  -       -       n       -       -       proxymap
+proxywrite unix -       -       n       -       1       proxymap
+smtp      unix  -       -       n       -       -       smtp
+relay     unix  -       -       n       -       -       smtp
+showq     unix  n       -       n       -       -       showq
+error     unix  -       -       n       -       -       error
+retry     unix  -       -       n       -       -       error
+discard   unix  -       -       n       -       -       discard
+local     unix  -       n       n       -       -       local
+virtual   unix  -       n       n       -       -       virtual
+lmtp      unix  -       -       n       -       -       lmtp
+anvil     unix  -       -       n       -       1       anvil
+scache    unix  -       -       n       -       1       scache
+postlog   unix-dgram n  -       n       -       1       postlogd
\ No newline at end of file

From 6b74f64e4556d4319cb65e1d5091aa6bc6b9deaa Mon Sep 17 00:00:00 2001
From: andrew <andrew.koidan@vertrical.com>
Date: Fri, 19 May 2023 11:32:32 +0300
Subject: [PATCH 158/221] Revert "Update README.md"

This reverts commit 04d0d2ef
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d7a89777b..a14c53df1 100644
--- a/README.md
+++ b/README.md
@@ -63,12 +63,12 @@ Pychat is an opensource absolutely free communication tool targeted for a compan
 
 I would personally use discord or slack as a company chat. They are built and maintained by thousands of people rather than a single person. BUT wait!!! There're some key factors of picking pychat over others:
 
- 1. Being opensource. If you need to add some custom tool or feature, you will never able to do this with any helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -fother messanger. Slack and discord provides plugins but they are still limited.
+ 1. Being opensource. If you need to add some custom tool or feature, you will never able to do this with any other messanger. Slack and discord provides plugins but they are still limited.
  2. Being absolutely free. You don't need to pay anything to use or setup pychat at all. You can host pychat on low-end hardware like Raspberry Pi which costs under 50$ and will easily handle thousands of active users. Slack and Discord [will charge you](https://www.chanty.com/blog/discord-vs-slack/) for the set of features you need now or WILL need in the future. Telegram/Skype/Viber and etc are not corporate chats and they lack a lot of features and there're people all over the world which could accidentaly be invited to your group. 
  3. Security. All of the chats above are SAAS solutions, but not Pychat! Remember wHen you chose any messangers, all of your communication is stored on external hard drive which is always less secure. Some messangers like viber or whatsapp backup do not store messages but rather backup history to your google driver. But that often leads to holes in history and broken search. Also only pychat features p2p file sharing. Do you still use messangers to echange ssh keys or any other secure files? Never store them on the server! Only with pychat you can send file directly to another person ommiting persisting it on the server.
  4. You just feel enthusiastic for bleeding-edge opensource projects. 
 
-# How to host pychathelm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f
+# How to host pychat
 
 Notice: 
 pychat is migrating from vue2 to vue3 and this change has been released to master. The older code that supports some feature (electron/cordova) is still not migrated and located at branch [vue2-webpack](https://github.com/akoidan/pychat/tree/vue2-webpack)

From 9c795631e27ae800585313033ba13c58bee57f0c Mon Sep 17 00:00:00 2001
From: andrew <andrew.koidan@vertrical.com>
Date: Fri, 19 May 2023 11:51:46 +0300
Subject: [PATCH 159/221] Fix

---
 frontend/a.js | 12 ------------
 frontend/a.ts | 12 ------------
 2 files changed, 24 deletions(-)
 delete mode 100644 frontend/a.js
 delete mode 100644 frontend/a.ts

diff --git a/frontend/a.js b/frontend/a.js
deleted file mode 100644
index db2ffe15e..000000000
--- a/frontend/a.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function test() {
-try {
-    throw "error"; // this is not executed, control goes to finally
-  } catch {
-    console.log("catch");
-    return 1;
-  } finally {
-    console.log("finally");
-    return 1000;
-  }
-}
-console.log(test()); // finally 1
diff --git a/frontend/a.ts b/frontend/a.ts
deleted file mode 100644
index 5b6fbd76b..000000000
--- a/frontend/a.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-  public async readCsv(): Promise<string> {
-    let data: Buffer;
-
-    try {
-      await this.sftp.connect(this.config);
-      const file = await this.lastModifiedFileOnServer();
-      data = (await this.sftp.get(`${this.pathToFolder}/${file}`)) as Buffer;
-      return data.toString();
-    } finally {
-      await this.sftp.end();
-    }
-  }

From e391e6366f89a67b851797fcb48e93b9448b6dc5 Mon Sep 17 00:00:00 2001
From: andrew <andrew.koidan@vertrical.com>
Date: Fri, 19 May 2023 22:43:11 +0300
Subject: [PATCH 160/221] Fix

---
 README.md                    |  7 +++++--
 kubernetes/DockerfilePostfix |  2 +-
 kubernetes/postfix.yaml      | 13 +------------
 kubernetes/postfix/main.cf   |  3 ++-
 kubernetes/postfix/master.cf |  4 +++-
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index a14c53df1..2d764a26e 100644
--- a/README.md
+++ b/README.md
@@ -550,8 +550,9 @@ stringData:
  - Should give your domain `openssl x509 -in ./lol.cert  -noout -text`
  
  5. Build images and upload it to docker registry:
-  - `docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .` 
-  - `docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend .` 
+  - `docker build -f ./kubernetes/DockerfileOldFrontend -t deathangel908/pychat-frontend .`; `docker push deathangel908/pychat-frontend`
+  - `docker build -f ./kubernetes/DockerfileOldBackend -t deathangel908/pychat-backend .`; `docker push deathangel908/pychat-backend`
+  - `docker build -f ./kubernetes/DockerfilePostfix -t deathangel908/pychat-postfix .` ; `docker push deathangel908/pychat-postfix`
  6. Setup kubernetes env:
   - `kubectl apply -f kubernetes/pv-photo.yaml`
   - `kubectl apply -f kubernetes/pv-redis.yaml`
@@ -564,7 +565,9 @@ stringData:
   - `kubectl apply -f kubernetes/backend.yaml`
   - `kubectl apply -f kubernetes/frontend.yaml`
   - `kubectl apply -f kubernetes/ingress.yaml`
+  - `kubectl apply -f kubernetes/postfix.yaml`
 
+ 7. For postfix (email server) do not forget to add spf record to cloudflare. Create new TXT record on cloudflare with name/alias `@` (for root domain) and value `v=spf1 ip4:34.243.61.237` where 34:243:61:237 is your NODE's ip in kube with postfix instance. Do not confuse it with ingres/nginx instance
 
 # TODO
 * teleport smileys https://vuejsdevelopers.com/2020/03/16/vue-js-tutorial/#teleporting-content
diff --git a/kubernetes/DockerfilePostfix b/kubernetes/DockerfilePostfix
index 6d84f17ab..ebfc03239 100644
--- a/kubernetes/DockerfilePostfix
+++ b/kubernetes/DockerfilePostfix
@@ -1,6 +1,6 @@
 FROM alpine:3.17.3
 RUN apk update && \
-    apk add --no-cache postfix
+    apk add --no-cache postfix policyd-spf-fs
 
 COPY ./postfix/main.cf /etc/postfix/main.cf
 COPY ./postfix/master.cf /etc/postfix/master.cf
diff --git a/kubernetes/postfix.yaml b/kubernetes/postfix.yaml
index 0c3ddab70..679f9a050 100644
--- a/kubernetes/postfix.yaml
+++ b/kubernetes/postfix.yaml
@@ -27,7 +27,6 @@ spec:
       containers:
         - name: postfix
           image: deathangel908/pychat-postfix
-          imagePullPolicy: Always
           volumeMounts:
           - name: pychat-postfix-tls
             mountPath: "/etc/tls"
@@ -53,14 +52,4 @@ spec:
     - protocol: TCP
       port: 465
       name: smpt-tcp-reply-2
-      targetPort: 465
-#---
-#apiVersion: v1
-#kind: ConfigMap
-#metadata:
-#  name: tcp-services
-#  namespace: pychat
-#data:
-#  25: "pychat/postfix-service:25"
-#  587: "pychat/postfix-service:587"
-#  465: "pychat/postfix-service:465"
\ No newline at end of file
+      targetPort: 465
\ No newline at end of file
diff --git a/kubernetes/postfix/main.cf b/kubernetes/postfix/main.cf
index e1466fa68..0c10b00a2 100644
--- a/kubernetes/postfix/main.cf
+++ b/kubernetes/postfix/main.cf
@@ -36,4 +36,5 @@ smtpd_tls_cert_file = /etc/tls/crt.pem
 smtpd_tls_loglevel = 1
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib/postfix
-smtpd_recipient_restrictions= permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination
+policyd-spf_time_limit = 3600
+smtpd_recipient_restrictions= permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination,  check_policy_service unix:private/policyd-spf
diff --git a/kubernetes/postfix/master.cf b/kubernetes/postfix/master.cf
index 1180cc1c1..8fe126aa9 100644
--- a/kubernetes/postfix/master.cf
+++ b/kubernetes/postfix/master.cf
@@ -22,4 +22,6 @@ virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       n       -       -       lmtp
 anvil     unix  -       -       n       -       1       anvil
 scache    unix  -       -       n       -       1       scache
-postlog   unix-dgram n  -       n       -       1       postlogd
\ No newline at end of file
+postlog   unix-dgram n  -       n       -       1       postlogd
+policyd-spf  unix  -       n       n       -       0       spawn
+    user=policyd-spf argv=/usr/bin/policyd-spf-fs
\ No newline at end of file

From 8291e27459cac86f46dcae67f9df18a2710b7d33 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 21 May 2023 13:09:59 +0300
Subject: [PATCH 161/221] test

---
 kubernetes/DockerfileTurn  |  0
 kubernetes/pv-postfix.yaml | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 kubernetes/DockerfileTurn
 create mode 100644 kubernetes/pv-postfix.yaml

diff --git a/kubernetes/DockerfileTurn b/kubernetes/DockerfileTurn
new file mode 100644
index 000000000..e69de29bb
diff --git a/kubernetes/pv-postfix.yaml b/kubernetes/pv-postfix.yaml
new file mode 100644
index 000000000..eb9cee766
--- /dev/null
+++ b/kubernetes/pv-postfix.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-photo
+spec:
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: 512Mi
+  hostPath:
+    path: /data/photo
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-photo
+  namespace: pychat
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 15Gi
+  storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
+  volumeName: pv-photo

From 4e71f6ba026736427c0d1656b9ea830f3979e940 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 23 May 2023 15:30:55 +0300
Subject: [PATCH 162/221] Added turn server to kube

---
 docker/pychat.org/turnserver.conf             |    2 +-
 .../ts/types/messages/p2p/dto/message.info.ts |    1 +
 .../src/ts/types/messages/p2p/dto/message.ts  |    4 +-
 .../webrtc/message/MessagePeerConnection.ts   |   24 +-
 .../webrtc/message/MessageTransferHandler.ts  |    2 +-
 kubernetes/DockerfilePostfix                  |    9 +-
 kubernetes/DockerfileTurn                     |   10 +
 kubernetes/coturn.yaml                        |  864 +++++++++
 kubernetes/frontend-old-pychat.org.json       |    2 +-
 kubernetes/frontend.json                      |    2 +-
 kubernetes/ingress-controller.yaml            | 1692 +++++++++++++++++
 kubernetes/postfix.yaml                       |    3 +-
 kubernetes/turnserver.conf                    |   11 +
 13 files changed, 2604 insertions(+), 22 deletions(-)
 create mode 100644 kubernetes/coturn.yaml
 create mode 100644 kubernetes/ingress-controller.yaml
 create mode 100644 kubernetes/turnserver.conf

diff --git a/docker/pychat.org/turnserver.conf b/docker/pychat.org/turnserver.conf
index d1514547f..bc5b6afb2 100644
--- a/docker/pychat.org/turnserver.conf
+++ b/docker/pychat.org/turnserver.conf
@@ -1,3 +1,3 @@
 user=pychat:pypass
 realm=pychat.org
-server-name=pychat.org
\ No newline at end of file
+server-name=pychat.org
diff --git a/frontend/src/ts/types/messages/p2p/dto/message.info.ts b/frontend/src/ts/types/messages/p2p/dto/message.info.ts
index e69de29bb..42a584967 100644
--- a/frontend/src/ts/types/messages/p2p/dto/message.info.ts
+++ b/frontend/src/ts/types/messages/p2p/dto/message.info.ts
@@ -0,0 +1 @@
+export type MessagesInfo = Record<string, number | null>;
diff --git a/frontend/src/ts/types/messages/p2p/dto/message.ts b/frontend/src/ts/types/messages/p2p/dto/message.ts
index 38235ab06..ee53b4fbd 100644
--- a/frontend/src/ts/types/messages/p2p/dto/message.ts
+++ b/frontend/src/ts/types/messages/p2p/dto/message.ts
@@ -1,5 +1,5 @@
-import {MessageStatusModel} from "@/ts/types/model";
-import {FileP2pDto} from "@/ts/types/messages/p2pDto";
+import type {MessageStatusModel} from "@/ts/types/model";
+import type {FileP2pDto} from "@/ts/types/messages/p2p/dto/file";
 
 export interface MessageP2pDto {
   id: number;
diff --git a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
index 7aa08be52..58d91c66d 100644
--- a/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
+++ b/frontend/src/ts/webrtc/message/MessagePeerConnection.ts
@@ -12,7 +12,7 @@ import type {DefaultStore} from "@/ts/classes/DefaultStore";
 
 import type {MessageModel, RoomModel} from "@/ts/types/model";
 import {MessageStatusInner} from "@/ts/types/model";
-import type {MessageP2pDto, MessagesInfo} from "@/ts/types/messages/p2pDto";
+import type {MessagesInfo} from "@/ts/types/messages/p2p/dto/message.info";
 import {messageModelToP2p, p2pMessageToModel} from "@/ts/types/converters";
 
 import type {MessageHelper} from "@/ts/message_handlers/MessageHelper";
@@ -24,7 +24,6 @@ import {
 } from "@/ts/utils/pubsub";
 import type {SetMessageStatusWsInMessage} from "@common/ws/message/set.message.status";
 import {SetMessageStatusWsInBody} from "@common/ws/message/set.message.status";
-import type {CheckDestroyInnerSystemMessage} from "@/ts/types/messages/peer-connection/accept.file.reply";
 import {SendSetMessagesStatusMessageBody} from "@/ts/types/messages/inner/send.set.messages.status";
 import type {
   SendSetMessagesStatusInnerSystemMessage,
@@ -36,9 +35,6 @@ import {SetMessageStatusP2pMessage} from "@/ts/types/messages/p2p/set.message.st
 import type {
   ExchangeMessageInfo1RequestP2pMessage,
 } from "@/ts/types/messages/p2p/exchange.message.info";
-import {
-  ExchangeMessageInfo1RequestP2pBody,
-} from "@/ts/types/messages/p2p/exchange.message.info";
 import AbstractMessageProcessor from "@/ts/message_handlers/AbstractMessageProcessor";
 import type {DefaultP2pMessage} from "@/ts/types/messages/p2p";
 import type {
@@ -51,6 +47,11 @@ import {
   ExchangeMessageInfoResponse3,
   SendNewP2PMessage
 } from "@/ts/types/messages/p2pMessages";
+import {MessageP2pDto} from "@/ts/types/messages/p2p/dto/message";
+import {
+  CheckTransferDestroyBody,
+  CheckTransferDestroyMessage
+} from "@/ts/types/messages/inner/check.transfer.destroy";
 
 
 export default abstract class MessagePeerConnection extends AbstractPeerConnection {
@@ -58,10 +59,10 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
 
   protected readonly callBacks: Record<number, {resolve: Function; reject: Function; all?: true}> = {};
 
-  protected readonly handlers: HandlerTypes<keyof MessagePeerConnection, "peerConnection:*"> = {
-    syncP2pMessage: <HandlerType<"syncP2pMessage", "peerConnection:*">> this.syncP2pMessage,
-    sendSetMessagesStatus: <HandlerType<"sendSetMessagesStatus", "peerConnection:*">> this.sendSetMessagesStatus,
-  };
+  // protected readonly handlers: HandlerTypes<keyof MessagePeerConnection, "peerConnection:*"> = {
+  //   syncP2pMessage: <HandlerType<"syncP2pMessage", "peerConnection:*">> this.syncP2pMessage,
+  //   sendSetMessagesStatus: <HandlerType<"sendSetMessagesStatus", "peerConnection:*">> this.sendSetMessagesStatus,
+  // };
 
   protected status: "inited" | "not_inited" = "not_inited";
 
@@ -189,9 +190,8 @@ export default abstract class MessagePeerConnection extends AbstractPeerConnecti
     }
   }
 
-  @Subscribe<CheckDestroyInnerSystemMessage>()
-  public checkDestroy() {
-
+  @Subscribe<CheckTransferDestroyMessage>()
+  public checkDestroy(body: CheckTransferDestroyBody) {
     /*
      * Destroy only if user has left this room, if he's offline but connections is stil in progress,
      *  maybe he has jost connection to server but not to us
diff --git a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
index 7515b9e2f..626a64a9e 100644
--- a/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
+++ b/frontend/src/ts/webrtc/message/MessageTransferHandler.ts
@@ -21,7 +21,7 @@ import type {SendSetMessagesStatusInnerSystemMessage} from "@/ts/types/messages/
  * https://drive.google.com/file/d/1BCtFNNWprfobqQlG4n2lPyWEqroi7nJh/view
  */
 export default class MessageTransferHandler extends BaseTransferHandler implements MessageSender {
-  protected readonly handlers: HandlerTypes<keyof MessageTransferHandler, "webrtc-message"> = {};
+  // protected readonly handlers: HandlerTypes<keyof MessageTransferHandler, "webrtc-message"> = {};
 
   private state: "initing" | "not_inited" | "ready" = "not_inited";
 
diff --git a/kubernetes/DockerfilePostfix b/kubernetes/DockerfilePostfix
index ebfc03239..0de2db553 100644
--- a/kubernetes/DockerfilePostfix
+++ b/kubernetes/DockerfilePostfix
@@ -1,8 +1,11 @@
+# docker build -f ./kubernetes/DockerfilePostfix -t deathangel908/pychat-postfix .
+# docker push deathangel908/pychat-postfix
+
 FROM alpine:3.17.3
 RUN apk update && \
     apk add --no-cache postfix policyd-spf-fs
 
-COPY ./postfix/main.cf /etc/postfix/main.cf
-COPY ./postfix/master.cf /etc/postfix/master.cf
+COPY ./kubernetes/postfix/main.cf /etc/postfix/main.cf
+COPY ./kubernetes/postfix/master.cf /etc/postfix/master.cf
 RUN /usr/bin/newaliases
-CMD ["/usr/sbin/postfix", "start-fg"]
\ No newline at end of file
+CMD ["/usr/sbin/postfix", "start-fg"]
diff --git a/kubernetes/DockerfileTurn b/kubernetes/DockerfileTurn
index e69de29bb..ffd0b2060 100644
--- a/kubernetes/DockerfileTurn
+++ b/kubernetes/DockerfileTurn
@@ -0,0 +1,10 @@
+# docker build -f ./kubernetes/DockerfileTurn -t deathangel908/pychat-turn .
+# docker push deathangel908/pychat-turn
+
+FROM alpine:3.17.3
+RUN apk update && \
+    apk add --no-cache coturn
+
+COPY ./kubernetes/turnserver.conf /etc/coturn/turnserver.conf
+
+CMD ["/usr/bin/turnserver"]
diff --git a/kubernetes/coturn.yaml b/kubernetes/coturn.yaml
new file mode 100644
index 000000000..7fad58488
--- /dev/null
+++ b/kubernetes/coturn.yaml
@@ -0,0 +1,864 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: coturn-deployment
+  namespace: pychat
+  labels:
+    app: coturn
+spec:
+  selector:
+    matchLabels:
+      app: coturn
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: coturn
+    spec:
+      volumes:
+        - name: pychat-coturn-tls
+          secret:
+            secretName: pychat-tls
+            items:
+              - key: tls.crt
+                path: crt.pem
+              - key: tls.key
+                path: key.pem
+      containers:
+        - name: coturn
+          imagePullPolicy: Always
+          image: deathangel908/pychat-turn
+          volumeMounts:
+          - name: pychat-coturn-tls
+            mountPath: "/etc/tls"
+            readOnly: true
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: coturn-service
+  namespace: pychat
+spec:
+  selector:
+    app: coturn
+  ports:
+    - protocol: TCP
+      name: coturn-main-port-tcp
+      port: 5349
+      targetPort: 5349
+    - protocol: TCP
+      port: 3478
+      name: coturn-secondary-port-tcp
+      targetPort: 3478
+    - protocol: UDP
+      port: 5349
+      name: coturn-main-port-udp
+      targetPort: 5349
+    - protocol: UDP
+      port: 3478
+      name: coturn-secondary-port-udp
+      targetPort: 3478
+    - protocol: UDP
+      port: 49152
+      name: coturn-udp-49152
+      targetPort: 49152
+    - protocol: UDP
+      port: 49153
+      name: coturn-udp-49153
+      targetPort: 49153
+    - protocol: UDP
+      port: 49154
+      name: coturn-udp-49154
+      targetPort: 49154
+    - protocol: UDP
+      port: 49155
+      name: coturn-udp-49155
+      targetPort: 49155
+    - protocol: UDP
+      port: 49156
+      name: coturn-udp-49156
+      targetPort: 49156
+    - protocol: UDP
+      port: 49157
+      name: coturn-udp-49157
+      targetPort: 49157
+    - protocol: UDP
+      port: 49158
+      name: coturn-udp-49158
+      targetPort: 49158
+    - protocol: UDP
+      port: 49159
+      name: coturn-udp-49159
+      targetPort: 49159
+    - protocol: UDP
+      port: 49160
+      name: coturn-udp-49160
+      targetPort: 49160
+    - protocol: UDP
+      port: 49161
+      name: coturn-udp-49161
+      targetPort: 49161
+    - protocol: UDP
+      port: 49162
+      name: coturn-udp-49162
+      targetPort: 49162
+    - protocol: UDP
+      port: 49163
+      name: coturn-udp-49163
+      targetPort: 49163
+    - protocol: UDP
+      port: 49164
+      name: coturn-udp-49164
+      targetPort: 49164
+    - protocol: UDP
+      port: 49165
+      name: coturn-udp-49165
+      targetPort: 49165
+    - protocol: UDP
+      port: 49166
+      name: coturn-udp-49166
+      targetPort: 49166
+    - protocol: UDP
+      port: 49167
+      name: coturn-udp-49167
+      targetPort: 49167
+    - protocol: UDP
+      port: 49168
+      name: coturn-udp-49168
+      targetPort: 49168
+    - protocol: UDP
+      port: 49169
+      name: coturn-udp-49169
+      targetPort: 49169
+    - protocol: UDP
+      port: 49170
+      name: coturn-udp-49170
+      targetPort: 49170
+    - protocol: UDP
+      port: 49171
+      name: coturn-udp-49171
+      targetPort: 49171
+    - protocol: UDP
+      port: 49172
+      name: coturn-udp-49172
+      targetPort: 49172
+    - protocol: UDP
+      port: 49173
+      name: coturn-udp-49173
+      targetPort: 49173
+    - protocol: UDP
+      port: 49174
+      name: coturn-udp-49174
+      targetPort: 49174
+    - protocol: UDP
+      port: 49175
+      name: coturn-udp-49175
+      targetPort: 49175
+    - protocol: UDP
+      port: 49176
+      name: coturn-udp-49176
+      targetPort: 49176
+    - protocol: UDP
+      port: 49177
+      name: coturn-udp-49177
+      targetPort: 49177
+    - protocol: UDP
+      port: 49178
+      name: coturn-udp-49178
+      targetPort: 49178
+    - protocol: UDP
+      port: 49179
+      name: coturn-udp-49179
+      targetPort: 49179
+    - protocol: UDP
+      port: 49180
+      name: coturn-udp-49180
+      targetPort: 49180
+    - protocol: UDP
+      port: 49181
+      name: coturn-udp-49181
+      targetPort: 49181
+    - protocol: UDP
+      port: 49182
+      name: coturn-udp-49182
+      targetPort: 49182
+    - protocol: UDP
+      port: 49183
+      name: coturn-udp-49183
+      targetPort: 49183
+    - protocol: UDP
+      port: 49184
+      name: coturn-udp-49184
+      targetPort: 49184
+    - protocol: UDP
+      port: 49185
+      name: coturn-udp-49185
+      targetPort: 49185
+    - protocol: UDP
+      port: 49186
+      name: coturn-udp-49186
+      targetPort: 49186
+    - protocol: UDP
+      port: 49187
+      name: coturn-udp-49187
+      targetPort: 49187
+    - protocol: UDP
+      port: 49188
+      name: coturn-udp-49188
+      targetPort: 49188
+    - protocol: UDP
+      port: 49189
+      name: coturn-udp-49189
+      targetPort: 49189
+    - protocol: UDP
+      port: 49190
+      name: coturn-udp-49190
+      targetPort: 49190
+    - protocol: UDP
+      port: 49191
+      name: coturn-udp-49191
+      targetPort: 49191
+    - protocol: UDP
+      port: 49192
+      name: coturn-udp-49192
+      targetPort: 49192
+    - protocol: UDP
+      port: 49193
+      name: coturn-udp-49193
+      targetPort: 49193
+    - protocol: UDP
+      port: 49194
+      name: coturn-udp-49194
+      targetPort: 49194
+    - protocol: UDP
+      port: 49195
+      name: coturn-udp-49195
+      targetPort: 49195
+    - protocol: UDP
+      port: 49196
+      name: coturn-udp-49196
+      targetPort: 49196
+    - protocol: UDP
+      port: 49197
+      name: coturn-udp-49197
+      targetPort: 49197
+    - protocol: UDP
+      port: 49198
+      name: coturn-udp-49198
+      targetPort: 49198
+    - protocol: UDP
+      port: 49199
+      name: coturn-udp-49199
+      targetPort: 49199
+    - protocol: UDP
+      port: 49200
+      name: coturn-udp-49200
+      targetPort: 49200
+    - protocol: UDP
+      port: 49201
+      name: coturn-udp-49201
+      targetPort: 49201
+    - protocol: UDP
+      port: 49202
+      name: coturn-udp-49202
+      targetPort: 49202
+    - protocol: UDP
+      port: 49203
+      name: coturn-udp-49203
+      targetPort: 49203
+    - protocol: UDP
+      port: 49204
+      name: coturn-udp-49204
+      targetPort: 49204
+    - protocol: UDP
+      port: 49205
+      name: coturn-udp-49205
+      targetPort: 49205
+    - protocol: UDP
+      port: 49206
+      name: coturn-udp-49206
+      targetPort: 49206
+    - protocol: UDP
+      port: 49207
+      name: coturn-udp-49207
+      targetPort: 49207
+    - protocol: UDP
+      port: 49208
+      name: coturn-udp-49208
+      targetPort: 49208
+    - protocol: UDP
+      port: 49209
+      name: coturn-udp-49209
+      targetPort: 49209
+    - protocol: UDP
+      port: 49210
+      name: coturn-udp-49210
+      targetPort: 49210
+    - protocol: UDP
+      port: 49211
+      name: coturn-udp-49211
+      targetPort: 49211
+    - protocol: UDP
+      port: 49212
+      name: coturn-udp-49212
+      targetPort: 49212
+    - protocol: UDP
+      port: 49213
+      name: coturn-udp-49213
+      targetPort: 49213
+    - protocol: UDP
+      port: 49214
+      name: coturn-udp-49214
+      targetPort: 49214
+    - protocol: UDP
+      port: 49215
+      name: coturn-udp-49215
+      targetPort: 49215
+    - protocol: UDP
+      port: 49216
+      name: coturn-udp-49216
+      targetPort: 49216
+    - protocol: UDP
+      port: 49217
+      name: coturn-udp-49217
+      targetPort: 49217
+    - protocol: UDP
+      port: 49218
+      name: coturn-udp-49218
+      targetPort: 49218
+    - protocol: UDP
+      port: 49219
+      name: coturn-udp-49219
+      targetPort: 49219
+    - protocol: UDP
+      port: 49220
+      name: coturn-udp-49220
+      targetPort: 49220
+    - protocol: UDP
+      port: 49221
+      name: coturn-udp-49221
+      targetPort: 49221
+    - protocol: UDP
+      port: 49222
+      name: coturn-udp-49222
+      targetPort: 49222
+    - protocol: UDP
+      port: 49223
+      name: coturn-udp-49223
+      targetPort: 49223
+    - protocol: UDP
+      port: 49224
+      name: coturn-udp-49224
+      targetPort: 49224
+    - protocol: UDP
+      port: 49225
+      name: coturn-udp-49225
+      targetPort: 49225
+    - protocol: UDP
+      port: 49226
+      name: coturn-udp-49226
+      targetPort: 49226
+    - protocol: UDP
+      port: 49227
+      name: coturn-udp-49227
+      targetPort: 49227
+    - protocol: UDP
+      port: 49228
+      name: coturn-udp-49228
+      targetPort: 49228
+    - protocol: UDP
+      port: 49229
+      name: coturn-udp-49229
+      targetPort: 49229
+    - protocol: UDP
+      port: 49230
+      name: coturn-udp-49230
+      targetPort: 49230
+    - protocol: UDP
+      port: 49231
+      name: coturn-udp-49231
+      targetPort: 49231
+    - protocol: UDP
+      port: 49232
+      name: coturn-udp-49232
+      targetPort: 49232
+    - protocol: UDP
+      port: 49233
+      name: coturn-udp-49233
+      targetPort: 49233
+    - protocol: UDP
+      port: 49234
+      name: coturn-udp-49234
+      targetPort: 49234
+    - protocol: UDP
+      port: 49235
+      name: coturn-udp-49235
+      targetPort: 49235
+    - protocol: UDP
+      port: 49236
+      name: coturn-udp-49236
+      targetPort: 49236
+    - protocol: UDP
+      port: 49237
+      name: coturn-udp-49237
+      targetPort: 49237
+    - protocol: UDP
+      port: 49238
+      name: coturn-udp-49238
+      targetPort: 49238
+    - protocol: UDP
+      port: 49239
+      name: coturn-udp-49239
+      targetPort: 49239
+    - protocol: UDP
+      port: 49240
+      name: coturn-udp-49240
+      targetPort: 49240
+    - protocol: UDP
+      port: 49241
+      name: coturn-udp-49241
+      targetPort: 49241
+    - protocol: UDP
+      port: 49242
+      name: coturn-udp-49242
+      targetPort: 49242
+    - protocol: UDP
+      port: 49243
+      name: coturn-udp-49243
+      targetPort: 49243
+    - protocol: UDP
+      port: 49244
+      name: coturn-udp-49244
+      targetPort: 49244
+    - protocol: UDP
+      port: 49245
+      name: coturn-udp-49245
+      targetPort: 49245
+    - protocol: UDP
+      port: 49246
+      name: coturn-udp-49246
+      targetPort: 49246
+    - protocol: UDP
+      port: 49247
+      name: coturn-udp-49247
+      targetPort: 49247
+    - protocol: UDP
+      port: 49248
+      name: coturn-udp-49248
+      targetPort: 49248
+    - protocol: UDP
+      port: 49249
+      name: coturn-udp-49249
+      targetPort: 49249
+    - protocol: UDP
+      port: 49250
+      name: coturn-udp-49250
+      targetPort: 49250
+    - protocol: UDP
+      port: 49251
+      name: coturn-udp-49251
+      targetPort: 49251
+    - protocol: UDP
+      port: 49252
+      name: coturn-udp-49252
+      targetPort: 49252
+    - protocol: UDP
+      port: 49253
+      name: coturn-udp-49253
+      targetPort: 49253
+    - protocol: UDP
+      port: 49254
+      name: coturn-udp-49254
+      targetPort: 49254
+    - protocol: UDP
+      port: 49255
+      name: coturn-udp-49255
+      targetPort: 49255
+    - protocol: UDP
+      port: 49256
+      name: coturn-udp-49256
+      targetPort: 49256
+    - protocol: UDP
+      port: 49257
+      name: coturn-udp-49257
+      targetPort: 49257
+    - protocol: UDP
+      port: 49258
+      name: coturn-udp-49258
+      targetPort: 49258
+    - protocol: UDP
+      port: 49259
+      name: coturn-udp-49259
+      targetPort: 49259
+    - protocol: UDP
+      port: 49260
+      name: coturn-udp-49260
+      targetPort: 49260
+    - protocol: UDP
+      port: 49261
+      name: coturn-udp-49261
+      targetPort: 49261
+    - protocol: UDP
+      port: 49262
+      name: coturn-udp-49262
+      targetPort: 49262
+    - protocol: UDP
+      port: 49263
+      name: coturn-udp-49263
+      targetPort: 49263
+    - protocol: UDP
+      port: 49264
+      name: coturn-udp-49264
+      targetPort: 49264
+    - protocol: UDP
+      port: 49265
+      name: coturn-udp-49265
+      targetPort: 49265
+    - protocol: UDP
+      port: 49266
+      name: coturn-udp-49266
+      targetPort: 49266
+    - protocol: UDP
+      port: 49267
+      name: coturn-udp-49267
+      targetPort: 49267
+    - protocol: UDP
+      port: 49268
+      name: coturn-udp-49268
+      targetPort: 49268
+    - protocol: UDP
+      port: 49269
+      name: coturn-udp-49269
+      targetPort: 49269
+    - protocol: UDP
+      port: 49270
+      name: coturn-udp-49270
+      targetPort: 49270
+    - protocol: UDP
+      port: 49271
+      name: coturn-udp-49271
+      targetPort: 49271
+    - protocol: UDP
+      port: 49272
+      name: coturn-udp-49272
+      targetPort: 49272
+    - protocol: UDP
+      port: 49273
+      name: coturn-udp-49273
+      targetPort: 49273
+    - protocol: UDP
+      port: 49274
+      name: coturn-udp-49274
+      targetPort: 49274
+    - protocol: UDP
+      port: 49275
+      name: coturn-udp-49275
+      targetPort: 49275
+    - protocol: UDP
+      port: 49276
+      name: coturn-udp-49276
+      targetPort: 49276
+    - protocol: UDP
+      port: 49277
+      name: coturn-udp-49277
+      targetPort: 49277
+    - protocol: UDP
+      port: 49278
+      name: coturn-udp-49278
+      targetPort: 49278
+    - protocol: UDP
+      port: 49279
+      name: coturn-udp-49279
+      targetPort: 49279
+    - protocol: UDP
+      port: 49280
+      name: coturn-udp-49280
+      targetPort: 49280
+    - protocol: UDP
+      port: 49281
+      name: coturn-udp-49281
+      targetPort: 49281
+    - protocol: UDP
+      port: 49282
+      name: coturn-udp-49282
+      targetPort: 49282
+    - protocol: UDP
+      port: 49283
+      name: coturn-udp-49283
+      targetPort: 49283
+    - protocol: UDP
+      port: 49284
+      name: coturn-udp-49284
+      targetPort: 49284
+    - protocol: UDP
+      port: 49285
+      name: coturn-udp-49285
+      targetPort: 49285
+    - protocol: UDP
+      port: 49286
+      name: coturn-udp-49286
+      targetPort: 49286
+    - protocol: UDP
+      port: 49287
+      name: coturn-udp-49287
+      targetPort: 49287
+    - protocol: UDP
+      port: 49288
+      name: coturn-udp-49288
+      targetPort: 49288
+    - protocol: UDP
+      port: 49289
+      name: coturn-udp-49289
+      targetPort: 49289
+    - protocol: UDP
+      port: 49290
+      name: coturn-udp-49290
+      targetPort: 49290
+    - protocol: UDP
+      port: 49291
+      name: coturn-udp-49291
+      targetPort: 49291
+    - protocol: UDP
+      port: 49292
+      name: coturn-udp-49292
+      targetPort: 49292
+    - protocol: UDP
+      port: 49293
+      name: coturn-udp-49293
+      targetPort: 49293
+    - protocol: UDP
+      port: 49294
+      name: coturn-udp-49294
+      targetPort: 49294
+    - protocol: UDP
+      port: 49295
+      name: coturn-udp-49295
+      targetPort: 49295
+    - protocol: UDP
+      port: 49296
+      name: coturn-udp-49296
+      targetPort: 49296
+    - protocol: UDP
+      port: 49297
+      name: coturn-udp-49297
+      targetPort: 49297
+    - protocol: UDP
+      port: 49298
+      name: coturn-udp-49298
+      targetPort: 49298
+    - protocol: UDP
+      port: 49299
+      name: coturn-udp-49299
+      targetPort: 49299
+    - protocol: UDP
+      port: 49300
+      name: coturn-udp-49300
+      targetPort: 49300
+    - protocol: UDP
+      port: 49301
+      name: coturn-udp-49301
+      targetPort: 49301
+    - protocol: UDP
+      port: 49302
+      name: coturn-udp-49302
+      targetPort: 49302
+    - protocol: UDP
+      port: 49303
+      name: coturn-udp-49303
+      targetPort: 49303
+    - protocol: UDP
+      port: 49304
+      name: coturn-udp-49304
+      targetPort: 49304
+    - protocol: UDP
+      port: 49305
+      name: coturn-udp-49305
+      targetPort: 49305
+    - protocol: UDP
+      port: 49306
+      name: coturn-udp-49306
+      targetPort: 49306
+    - protocol: UDP
+      port: 49307
+      name: coturn-udp-49307
+      targetPort: 49307
+    - protocol: UDP
+      port: 49308
+      name: coturn-udp-49308
+      targetPort: 49308
+    - protocol: UDP
+      port: 49309
+      name: coturn-udp-49309
+      targetPort: 49309
+    - protocol: UDP
+      port: 49310
+      name: coturn-udp-49310
+      targetPort: 49310
+    - protocol: UDP
+      port: 49311
+      name: coturn-udp-49311
+      targetPort: 49311
+    - protocol: UDP
+      port: 49312
+      name: coturn-udp-49312
+      targetPort: 49312
+    - protocol: UDP
+      port: 49313
+      name: coturn-udp-49313
+      targetPort: 49313
+    - protocol: UDP
+      port: 49314
+      name: coturn-udp-49314
+      targetPort: 49314
+    - protocol: UDP
+      port: 49315
+      name: coturn-udp-49315
+      targetPort: 49315
+    - protocol: UDP
+      port: 49316
+      name: coturn-udp-49316
+      targetPort: 49316
+    - protocol: UDP
+      port: 49317
+      name: coturn-udp-49317
+      targetPort: 49317
+    - protocol: UDP
+      port: 49318
+      name: coturn-udp-49318
+      targetPort: 49318
+    - protocol: UDP
+      port: 49319
+      name: coturn-udp-49319
+      targetPort: 49319
+    - protocol: UDP
+      port: 49320
+      name: coturn-udp-49320
+      targetPort: 49320
+    - protocol: UDP
+      port: 49321
+      name: coturn-udp-49321
+      targetPort: 49321
+    - protocol: UDP
+      port: 49322
+      name: coturn-udp-49322
+      targetPort: 49322
+    - protocol: UDP
+      port: 49323
+      name: coturn-udp-49323
+      targetPort: 49323
+    - protocol: UDP
+      port: 49324
+      name: coturn-udp-49324
+      targetPort: 49324
+    - protocol: UDP
+      port: 49325
+      name: coturn-udp-49325
+      targetPort: 49325
+    - protocol: UDP
+      port: 49326
+      name: coturn-udp-49326
+      targetPort: 49326
+    - protocol: UDP
+      port: 49327
+      name: coturn-udp-49327
+      targetPort: 49327
+    - protocol: UDP
+      port: 49328
+      name: coturn-udp-49328
+      targetPort: 49328
+    - protocol: UDP
+      port: 49329
+      name: coturn-udp-49329
+      targetPort: 49329
+    - protocol: UDP
+      port: 49330
+      name: coturn-udp-49330
+      targetPort: 49330
+    - protocol: UDP
+      port: 49331
+      name: coturn-udp-49331
+      targetPort: 49331
+    - protocol: UDP
+      port: 49332
+      name: coturn-udp-49332
+      targetPort: 49332
+    - protocol: UDP
+      port: 49333
+      name: coturn-udp-49333
+      targetPort: 49333
+    - protocol: UDP
+      port: 49334
+      name: coturn-udp-49334
+      targetPort: 49334
+    - protocol: UDP
+      port: 49335
+      name: coturn-udp-49335
+      targetPort: 49335
+    - protocol: UDP
+      port: 49336
+      name: coturn-udp-49336
+      targetPort: 49336
+    - protocol: UDP
+      port: 49337
+      name: coturn-udp-49337
+      targetPort: 49337
+    - protocol: UDP
+      port: 49338
+      name: coturn-udp-49338
+      targetPort: 49338
+    - protocol: UDP
+      port: 49339
+      name: coturn-udp-49339
+      targetPort: 49339
+    - protocol: UDP
+      port: 49340
+      name: coturn-udp-49340
+      targetPort: 49340
+    - protocol: UDP
+      port: 49341
+      name: coturn-udp-49341
+      targetPort: 49341
+    - protocol: UDP
+      port: 49342
+      name: coturn-udp-49342
+      targetPort: 49342
+    - protocol: UDP
+      port: 49343
+      name: coturn-udp-49343
+      targetPort: 49343
+    - protocol: UDP
+      port: 49344
+      name: coturn-udp-49344
+      targetPort: 49344
+    - protocol: UDP
+      port: 49345
+      name: coturn-udp-49345
+      targetPort: 49345
+    - protocol: UDP
+      port: 49346
+      name: coturn-udp-49346
+      targetPort: 49346
+    - protocol: UDP
+      port: 49347
+      name: coturn-udp-49347
+      targetPort: 49347
+    - protocol: UDP
+      port: 49348
+      name: coturn-udp-49348
+      targetPort: 49348
+    - protocol: UDP
+      port: 49349
+      name: coturn-udp-49349
+      targetPort: 49349
+    - protocol: UDP
+      port: 49350
+      name: coturn-udp-49350
+      targetPort: 49350
+    - protocol: UDP
+      port: 49351
+      name: coturn-udp-49351
+      targetPort: 49351
+    - protocol: UDP
+      port: 49352
+      name: coturn-udp-49352
+      targetPort: 49352
diff --git a/kubernetes/frontend-old-pychat.org.json b/kubernetes/frontend-old-pychat.org.json
index 2607c5ed7..43f3975ce 100644
--- a/kubernetes/frontend-old-pychat.org.json
+++ b/kubernetes/frontend-old-pychat.org.json
@@ -15,5 +15,5 @@
     "PAINTER": false,
     "FLAGS": true,
     "PUBLIC_PATH": "https://static.pychat.org/",
-    "WEBRTC_CONFIG": {"iceServers":[{"urls":["stun:turn2.l.google.com"]}]}
+    "WEBRTC_CONFIG": {"iceServers":[{"urls":["turn:pychat.org"],"username":"pychat","credential":"pypass"}]}
 }
diff --git a/kubernetes/frontend.json b/kubernetes/frontend.json
index 1a0bc5d5c..6c8be1c97 100644
--- a/kubernetes/frontend.json
+++ b/kubernetes/frontend.json
@@ -11,5 +11,5 @@
   "GIPHY_API_KEY": "thZMTtWsaBQAPDIAY461GzYTctuYIeIj",
   "GITHUB_LINK": "https://github.com/akoidan/pychat",
   "FLAGS": true,
-  "WEBRTC_CONFIG": {"iceServers":[{"urls":["stun:turn2.l.google.com"]}]}
+  "WEBRTC_CONFIG": {"iceServers":[{"urls":["turn:pychat.org"],"username":"pychat","credential":"pypass"}]}
 }
diff --git a/kubernetes/ingress-controller.yaml b/kubernetes/ingress-controller.yaml
new file mode 100644
index 000000000..341a37c30
--- /dev/null
+++ b/kubernetes/ingress-controller.yaml
@@ -0,0 +1,1692 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+  name: ingress-nginx
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: tcp-services
+  namespace: ingress-nginx
+data:
+#  25: "pychat/postfix-service:25"
+#  587: "pychat/postfix-service:587"
+#  465: "pychat/postfix-service:465"
+  3478: "pychat/coturn-service:3478"
+  5349: "pychat/coturn-service:5349"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: udp-services
+  namespace: ingress-nginx
+data:
+  #for (let i = 49152; i < 49353; i++) {
+  #console.log(`  ${i}: "pychat/coturn-service:${i}"`)
+  #}
+  3478: "pychat/coturn-service:3478"
+  5349: "pychat/coturn-service:5349"
+  49152: "pychat/coturn-service:49152"
+  49153: "pychat/coturn-service:49153"
+  49154: "pychat/coturn-service:49154"
+  49155: "pychat/coturn-service:49155"
+  49156: "pychat/coturn-service:49156"
+  49157: "pychat/coturn-service:49157"
+  49158: "pychat/coturn-service:49158"
+  49159: "pychat/coturn-service:49159"
+  49160: "pychat/coturn-service:49160"
+  49161: "pychat/coturn-service:49161"
+  49162: "pychat/coturn-service:49162"
+  49163: "pychat/coturn-service:49163"
+  49164: "pychat/coturn-service:49164"
+  49165: "pychat/coturn-service:49165"
+  49166: "pychat/coturn-service:49166"
+  49167: "pychat/coturn-service:49167"
+  49168: "pychat/coturn-service:49168"
+  49169: "pychat/coturn-service:49169"
+  49170: "pychat/coturn-service:49170"
+  49171: "pychat/coturn-service:49171"
+  49172: "pychat/coturn-service:49172"
+  49173: "pychat/coturn-service:49173"
+  49174: "pychat/coturn-service:49174"
+  49175: "pychat/coturn-service:49175"
+  49176: "pychat/coturn-service:49176"
+  49177: "pychat/coturn-service:49177"
+  49178: "pychat/coturn-service:49178"
+  49179: "pychat/coturn-service:49179"
+  49180: "pychat/coturn-service:49180"
+  49181: "pychat/coturn-service:49181"
+  49182: "pychat/coturn-service:49182"
+  49183: "pychat/coturn-service:49183"
+  49184: "pychat/coturn-service:49184"
+  49185: "pychat/coturn-service:49185"
+  49186: "pychat/coturn-service:49186"
+  49187: "pychat/coturn-service:49187"
+  49188: "pychat/coturn-service:49188"
+  49189: "pychat/coturn-service:49189"
+  49190: "pychat/coturn-service:49190"
+  49191: "pychat/coturn-service:49191"
+  49192: "pychat/coturn-service:49192"
+  49193: "pychat/coturn-service:49193"
+  49194: "pychat/coturn-service:49194"
+  49195: "pychat/coturn-service:49195"
+  49196: "pychat/coturn-service:49196"
+  49197: "pychat/coturn-service:49197"
+  49198: "pychat/coturn-service:49198"
+  49199: "pychat/coturn-service:49199"
+  49200: "pychat/coturn-service:49200"
+  49201: "pychat/coturn-service:49201"
+  49202: "pychat/coturn-service:49202"
+  49203: "pychat/coturn-service:49203"
+  49204: "pychat/coturn-service:49204"
+  49205: "pychat/coturn-service:49205"
+  49206: "pychat/coturn-service:49206"
+  49207: "pychat/coturn-service:49207"
+  49208: "pychat/coturn-service:49208"
+  49209: "pychat/coturn-service:49209"
+  49210: "pychat/coturn-service:49210"
+  49211: "pychat/coturn-service:49211"
+  49212: "pychat/coturn-service:49212"
+  49213: "pychat/coturn-service:49213"
+  49214: "pychat/coturn-service:49214"
+  49215: "pychat/coturn-service:49215"
+  49216: "pychat/coturn-service:49216"
+  49217: "pychat/coturn-service:49217"
+  49218: "pychat/coturn-service:49218"
+  49219: "pychat/coturn-service:49219"
+  49220: "pychat/coturn-service:49220"
+  49221: "pychat/coturn-service:49221"
+  49222: "pychat/coturn-service:49222"
+  49223: "pychat/coturn-service:49223"
+  49224: "pychat/coturn-service:49224"
+  49225: "pychat/coturn-service:49225"
+  49226: "pychat/coturn-service:49226"
+  49227: "pychat/coturn-service:49227"
+  49228: "pychat/coturn-service:49228"
+  49229: "pychat/coturn-service:49229"
+  49230: "pychat/coturn-service:49230"
+  49231: "pychat/coturn-service:49231"
+  49232: "pychat/coturn-service:49232"
+  49233: "pychat/coturn-service:49233"
+  49234: "pychat/coturn-service:49234"
+  49235: "pychat/coturn-service:49235"
+  49236: "pychat/coturn-service:49236"
+  49237: "pychat/coturn-service:49237"
+  49238: "pychat/coturn-service:49238"
+  49239: "pychat/coturn-service:49239"
+  49240: "pychat/coturn-service:49240"
+  49241: "pychat/coturn-service:49241"
+  49242: "pychat/coturn-service:49242"
+  49243: "pychat/coturn-service:49243"
+  49244: "pychat/coturn-service:49244"
+  49245: "pychat/coturn-service:49245"
+  49246: "pychat/coturn-service:49246"
+  49247: "pychat/coturn-service:49247"
+  49248: "pychat/coturn-service:49248"
+  49249: "pychat/coturn-service:49249"
+  49250: "pychat/coturn-service:49250"
+  49251: "pychat/coturn-service:49251"
+  49252: "pychat/coturn-service:49252"
+  49253: "pychat/coturn-service:49253"
+  49254: "pychat/coturn-service:49254"
+  49255: "pychat/coturn-service:49255"
+  49256: "pychat/coturn-service:49256"
+  49257: "pychat/coturn-service:49257"
+  49258: "pychat/coturn-service:49258"
+  49259: "pychat/coturn-service:49259"
+  49260: "pychat/coturn-service:49260"
+  49261: "pychat/coturn-service:49261"
+  49262: "pychat/coturn-service:49262"
+  49263: "pychat/coturn-service:49263"
+  49264: "pychat/coturn-service:49264"
+  49265: "pychat/coturn-service:49265"
+  49266: "pychat/coturn-service:49266"
+  49267: "pychat/coturn-service:49267"
+  49268: "pychat/coturn-service:49268"
+  49269: "pychat/coturn-service:49269"
+  49270: "pychat/coturn-service:49270"
+  49271: "pychat/coturn-service:49271"
+  49272: "pychat/coturn-service:49272"
+  49273: "pychat/coturn-service:49273"
+  49274: "pychat/coturn-service:49274"
+  49275: "pychat/coturn-service:49275"
+  49276: "pychat/coturn-service:49276"
+  49277: "pychat/coturn-service:49277"
+  49278: "pychat/coturn-service:49278"
+  49279: "pychat/coturn-service:49279"
+  49280: "pychat/coturn-service:49280"
+  49281: "pychat/coturn-service:49281"
+  49282: "pychat/coturn-service:49282"
+  49283: "pychat/coturn-service:49283"
+  49284: "pychat/coturn-service:49284"
+  49285: "pychat/coturn-service:49285"
+  49286: "pychat/coturn-service:49286"
+  49287: "pychat/coturn-service:49287"
+  49288: "pychat/coturn-service:49288"
+  49289: "pychat/coturn-service:49289"
+  49290: "pychat/coturn-service:49290"
+  49291: "pychat/coturn-service:49291"
+  49292: "pychat/coturn-service:49292"
+  49293: "pychat/coturn-service:49293"
+  49294: "pychat/coturn-service:49294"
+  49295: "pychat/coturn-service:49295"
+  49296: "pychat/coturn-service:49296"
+  49297: "pychat/coturn-service:49297"
+  49298: "pychat/coturn-service:49298"
+  49299: "pychat/coturn-service:49299"
+  49300: "pychat/coturn-service:49300"
+  49301: "pychat/coturn-service:49301"
+  49302: "pychat/coturn-service:49302"
+  49303: "pychat/coturn-service:49303"
+  49304: "pychat/coturn-service:49304"
+  49305: "pychat/coturn-service:49305"
+  49306: "pychat/coturn-service:49306"
+  49307: "pychat/coturn-service:49307"
+  49308: "pychat/coturn-service:49308"
+  49309: "pychat/coturn-service:49309"
+  49310: "pychat/coturn-service:49310"
+  49311: "pychat/coturn-service:49311"
+  49312: "pychat/coturn-service:49312"
+  49313: "pychat/coturn-service:49313"
+  49314: "pychat/coturn-service:49314"
+  49315: "pychat/coturn-service:49315"
+  49316: "pychat/coturn-service:49316"
+  49317: "pychat/coturn-service:49317"
+  49318: "pychat/coturn-service:49318"
+  49319: "pychat/coturn-service:49319"
+  49320: "pychat/coturn-service:49320"
+  49321: "pychat/coturn-service:49321"
+  49322: "pychat/coturn-service:49322"
+  49323: "pychat/coturn-service:49323"
+  49324: "pychat/coturn-service:49324"
+  49325: "pychat/coturn-service:49325"
+  49326: "pychat/coturn-service:49326"
+  49327: "pychat/coturn-service:49327"
+  49328: "pychat/coturn-service:49328"
+  49329: "pychat/coturn-service:49329"
+  49330: "pychat/coturn-service:49330"
+  49331: "pychat/coturn-service:49331"
+  49332: "pychat/coturn-service:49332"
+  49333: "pychat/coturn-service:49333"
+  49334: "pychat/coturn-service:49334"
+  49335: "pychat/coturn-service:49335"
+  49336: "pychat/coturn-service:49336"
+  49337: "pychat/coturn-service:49337"
+  49338: "pychat/coturn-service:49338"
+  49339: "pychat/coturn-service:49339"
+  49340: "pychat/coturn-service:49340"
+  49341: "pychat/coturn-service:49341"
+  49342: "pychat/coturn-service:49342"
+  49343: "pychat/coturn-service:49343"
+  49344: "pychat/coturn-service:49344"
+  49345: "pychat/coturn-service:49345"
+  49346: "pychat/coturn-service:49346"
+  49347: "pychat/coturn-service:49347"
+  49348: "pychat/coturn-service:49348"
+  49349: "pychat/coturn-service:49349"
+  49350: "pychat/coturn-service:49350"
+  49351: "pychat/coturn-service:49351"
+  49352: "pychat/coturn-service:49352"
+---
+apiVersion: v1
+automountServiceAccountToken: true
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - pods
+  - secrets
+  - endpoints
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - update
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resourceNames:
+  - ingress-nginx-leader
+  resources:
+  - leases
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - list
+  - watch
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - endpoints
+  - nodes
+  - pods
+  - secrets
+  - namespaces
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - update
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - list
+  - watch
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+rules:
+- apiGroups:
+  - admissionregistration.k8s.io
+  resources:
+  - validatingwebhookconfigurations
+  verbs:
+  - get
+  - update
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: ingress-nginx
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx
+  namespace: ingress-nginx
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: ingress-nginx-admission
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ingress-nginx
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx
+  namespace: ingress-nginx
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ingress-nginx-admission
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+---
+apiVersion: v1
+data:
+  allow-snippet-annotations: "true"
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+spec:
+  externalTrafficPolicy: Local
+  ipFamilies:
+  - IPv4
+  ipFamilyPolicy: SingleStack
+  ports:
+  - appProtocol: http
+    name: http
+    port: 80
+    protocol: TCP
+    targetPort: http
+  - appProtocol: https
+    name: https
+    port: 443
+    protocol: TCP
+    targetPort: https
+  - name: proxied-tcp-5349
+    port: 5349
+    targetPort: 5349
+    protocol: TCP
+  - name: proxied-tcp-3478
+    port: 3478
+    targetPort: 3478
+    protocol: TCP
+  - name: proxied-udp-5349
+    port: 5349
+    targetPort: 5349
+    protocol: UDP
+  - name: proxied-udp-3478
+    port: 3478
+    targetPort: 3478
+    protocol: UDP
+  - protocol: UDP
+    port: 49152
+    name: coturn-udp-49152
+    targetPort: 49152
+  - protocol: UDP
+    port: 49153
+    name: coturn-udp-49153
+    targetPort: 49153
+  - protocol: UDP
+    port: 49154
+    name: coturn-udp-49154
+    targetPort: 49154
+  - protocol: UDP
+    port: 49155
+    name: coturn-udp-49155
+    targetPort: 49155
+  - protocol: UDP
+    port: 49156
+    name: coturn-udp-49156
+    targetPort: 49156
+  - protocol: UDP
+    port: 49157
+    name: coturn-udp-49157
+    targetPort: 49157
+  - protocol: UDP
+    port: 49158
+    name: coturn-udp-49158
+    targetPort: 49158
+  - protocol: UDP
+    port: 49159
+    name: coturn-udp-49159
+    targetPort: 49159
+  - protocol: UDP
+    port: 49160
+    name: coturn-udp-49160
+    targetPort: 49160
+  - protocol: UDP
+    port: 49161
+    name: coturn-udp-49161
+    targetPort: 49161
+  - protocol: UDP
+    port: 49162
+    name: coturn-udp-49162
+    targetPort: 49162
+  - protocol: UDP
+    port: 49163
+    name: coturn-udp-49163
+    targetPort: 49163
+  - protocol: UDP
+    port: 49164
+    name: coturn-udp-49164
+    targetPort: 49164
+  - protocol: UDP
+    port: 49165
+    name: coturn-udp-49165
+    targetPort: 49165
+  - protocol: UDP
+    port: 49166
+    name: coturn-udp-49166
+    targetPort: 49166
+  - protocol: UDP
+    port: 49167
+    name: coturn-udp-49167
+    targetPort: 49167
+  - protocol: UDP
+    port: 49168
+    name: coturn-udp-49168
+    targetPort: 49168
+  - protocol: UDP
+    port: 49169
+    name: coturn-udp-49169
+    targetPort: 49169
+  - protocol: UDP
+    port: 49170
+    name: coturn-udp-49170
+    targetPort: 49170
+  - protocol: UDP
+    port: 49171
+    name: coturn-udp-49171
+    targetPort: 49171
+  - protocol: UDP
+    port: 49172
+    name: coturn-udp-49172
+    targetPort: 49172
+  - protocol: UDP
+    port: 49173
+    name: coturn-udp-49173
+    targetPort: 49173
+  - protocol: UDP
+    port: 49174
+    name: coturn-udp-49174
+    targetPort: 49174
+  - protocol: UDP
+    port: 49175
+    name: coturn-udp-49175
+    targetPort: 49175
+  - protocol: UDP
+    port: 49176
+    name: coturn-udp-49176
+    targetPort: 49176
+  - protocol: UDP
+    port: 49177
+    name: coturn-udp-49177
+    targetPort: 49177
+  - protocol: UDP
+    port: 49178
+    name: coturn-udp-49178
+    targetPort: 49178
+  - protocol: UDP
+    port: 49179
+    name: coturn-udp-49179
+    targetPort: 49179
+  - protocol: UDP
+    port: 49180
+    name: coturn-udp-49180
+    targetPort: 49180
+  - protocol: UDP
+    port: 49181
+    name: coturn-udp-49181
+    targetPort: 49181
+  - protocol: UDP
+    port: 49182
+    name: coturn-udp-49182
+    targetPort: 49182
+  - protocol: UDP
+    port: 49183
+    name: coturn-udp-49183
+    targetPort: 49183
+  - protocol: UDP
+    port: 49184
+    name: coturn-udp-49184
+    targetPort: 49184
+  - protocol: UDP
+    port: 49185
+    name: coturn-udp-49185
+    targetPort: 49185
+  - protocol: UDP
+    port: 49186
+    name: coturn-udp-49186
+    targetPort: 49186
+  - protocol: UDP
+    port: 49187
+    name: coturn-udp-49187
+    targetPort: 49187
+  - protocol: UDP
+    port: 49188
+    name: coturn-udp-49188
+    targetPort: 49188
+  - protocol: UDP
+    port: 49189
+    name: coturn-udp-49189
+    targetPort: 49189
+  - protocol: UDP
+    port: 49190
+    name: coturn-udp-49190
+    targetPort: 49190
+  - protocol: UDP
+    port: 49191
+    name: coturn-udp-49191
+    targetPort: 49191
+  - protocol: UDP
+    port: 49192
+    name: coturn-udp-49192
+    targetPort: 49192
+  - protocol: UDP
+    port: 49193
+    name: coturn-udp-49193
+    targetPort: 49193
+  - protocol: UDP
+    port: 49194
+    name: coturn-udp-49194
+    targetPort: 49194
+  - protocol: UDP
+    port: 49195
+    name: coturn-udp-49195
+    targetPort: 49195
+  - protocol: UDP
+    port: 49196
+    name: coturn-udp-49196
+    targetPort: 49196
+  - protocol: UDP
+    port: 49197
+    name: coturn-udp-49197
+    targetPort: 49197
+  - protocol: UDP
+    port: 49198
+    name: coturn-udp-49198
+    targetPort: 49198
+  - protocol: UDP
+    port: 49199
+    name: coturn-udp-49199
+    targetPort: 49199
+  - protocol: UDP
+    port: 49200
+    name: coturn-udp-49200
+    targetPort: 49200
+  - protocol: UDP
+    port: 49201
+    name: coturn-udp-49201
+    targetPort: 49201
+  - protocol: UDP
+    port: 49202
+    name: coturn-udp-49202
+    targetPort: 49202
+  - protocol: UDP
+    port: 49203
+    name: coturn-udp-49203
+    targetPort: 49203
+  - protocol: UDP
+    port: 49204
+    name: coturn-udp-49204
+    targetPort: 49204
+  - protocol: UDP
+    port: 49205
+    name: coturn-udp-49205
+    targetPort: 49205
+  - protocol: UDP
+    port: 49206
+    name: coturn-udp-49206
+    targetPort: 49206
+  - protocol: UDP
+    port: 49207
+    name: coturn-udp-49207
+    targetPort: 49207
+  - protocol: UDP
+    port: 49208
+    name: coturn-udp-49208
+    targetPort: 49208
+  - protocol: UDP
+    port: 49209
+    name: coturn-udp-49209
+    targetPort: 49209
+  - protocol: UDP
+    port: 49210
+    name: coturn-udp-49210
+    targetPort: 49210
+  - protocol: UDP
+    port: 49211
+    name: coturn-udp-49211
+    targetPort: 49211
+  - protocol: UDP
+    port: 49212
+    name: coturn-udp-49212
+    targetPort: 49212
+  - protocol: UDP
+    port: 49213
+    name: coturn-udp-49213
+    targetPort: 49213
+  - protocol: UDP
+    port: 49214
+    name: coturn-udp-49214
+    targetPort: 49214
+  - protocol: UDP
+    port: 49215
+    name: coturn-udp-49215
+    targetPort: 49215
+  - protocol: UDP
+    port: 49216
+    name: coturn-udp-49216
+    targetPort: 49216
+  - protocol: UDP
+    port: 49217
+    name: coturn-udp-49217
+    targetPort: 49217
+  - protocol: UDP
+    port: 49218
+    name: coturn-udp-49218
+    targetPort: 49218
+  - protocol: UDP
+    port: 49219
+    name: coturn-udp-49219
+    targetPort: 49219
+  - protocol: UDP
+    port: 49220
+    name: coturn-udp-49220
+    targetPort: 49220
+  - protocol: UDP
+    port: 49221
+    name: coturn-udp-49221
+    targetPort: 49221
+  - protocol: UDP
+    port: 49222
+    name: coturn-udp-49222
+    targetPort: 49222
+  - protocol: UDP
+    port: 49223
+    name: coturn-udp-49223
+    targetPort: 49223
+  - protocol: UDP
+    port: 49224
+    name: coturn-udp-49224
+    targetPort: 49224
+  - protocol: UDP
+    port: 49225
+    name: coturn-udp-49225
+    targetPort: 49225
+  - protocol: UDP
+    port: 49226
+    name: coturn-udp-49226
+    targetPort: 49226
+  - protocol: UDP
+    port: 49227
+    name: coturn-udp-49227
+    targetPort: 49227
+  - protocol: UDP
+    port: 49228
+    name: coturn-udp-49228
+    targetPort: 49228
+  - protocol: UDP
+    port: 49229
+    name: coturn-udp-49229
+    targetPort: 49229
+  - protocol: UDP
+    port: 49230
+    name: coturn-udp-49230
+    targetPort: 49230
+  - protocol: UDP
+    port: 49231
+    name: coturn-udp-49231
+    targetPort: 49231
+  - protocol: UDP
+    port: 49232
+    name: coturn-udp-49232
+    targetPort: 49232
+  - protocol: UDP
+    port: 49233
+    name: coturn-udp-49233
+    targetPort: 49233
+  - protocol: UDP
+    port: 49234
+    name: coturn-udp-49234
+    targetPort: 49234
+  - protocol: UDP
+    port: 49235
+    name: coturn-udp-49235
+    targetPort: 49235
+  - protocol: UDP
+    port: 49236
+    name: coturn-udp-49236
+    targetPort: 49236
+  - protocol: UDP
+    port: 49237
+    name: coturn-udp-49237
+    targetPort: 49237
+  - protocol: UDP
+    port: 49238
+    name: coturn-udp-49238
+    targetPort: 49238
+  - protocol: UDP
+    port: 49239
+    name: coturn-udp-49239
+    targetPort: 49239
+  - protocol: UDP
+    port: 49240
+    name: coturn-udp-49240
+    targetPort: 49240
+  - protocol: UDP
+    port: 49241
+    name: coturn-udp-49241
+    targetPort: 49241
+  - protocol: UDP
+    port: 49242
+    name: coturn-udp-49242
+    targetPort: 49242
+  - protocol: UDP
+    port: 49243
+    name: coturn-udp-49243
+    targetPort: 49243
+  - protocol: UDP
+    port: 49244
+    name: coturn-udp-49244
+    targetPort: 49244
+  - protocol: UDP
+    port: 49245
+    name: coturn-udp-49245
+    targetPort: 49245
+  - protocol: UDP
+    port: 49246
+    name: coturn-udp-49246
+    targetPort: 49246
+  - protocol: UDP
+    port: 49247
+    name: coturn-udp-49247
+    targetPort: 49247
+  - protocol: UDP
+    port: 49248
+    name: coturn-udp-49248
+    targetPort: 49248
+  - protocol: UDP
+    port: 49249
+    name: coturn-udp-49249
+    targetPort: 49249
+  - protocol: UDP
+    port: 49250
+    name: coturn-udp-49250
+    targetPort: 49250
+  - protocol: UDP
+    port: 49251
+    name: coturn-udp-49251
+    targetPort: 49251
+  - protocol: UDP
+    port: 49252
+    name: coturn-udp-49252
+    targetPort: 49252
+  - protocol: UDP
+    port: 49253
+    name: coturn-udp-49253
+    targetPort: 49253
+  - protocol: UDP
+    port: 49254
+    name: coturn-udp-49254
+    targetPort: 49254
+  - protocol: UDP
+    port: 49255
+    name: coturn-udp-49255
+    targetPort: 49255
+  - protocol: UDP
+    port: 49256
+    name: coturn-udp-49256
+    targetPort: 49256
+  - protocol: UDP
+    port: 49257
+    name: coturn-udp-49257
+    targetPort: 49257
+  - protocol: UDP
+    port: 49258
+    name: coturn-udp-49258
+    targetPort: 49258
+  - protocol: UDP
+    port: 49259
+    name: coturn-udp-49259
+    targetPort: 49259
+  - protocol: UDP
+    port: 49260
+    name: coturn-udp-49260
+    targetPort: 49260
+  - protocol: UDP
+    port: 49261
+    name: coturn-udp-49261
+    targetPort: 49261
+  - protocol: UDP
+    port: 49262
+    name: coturn-udp-49262
+    targetPort: 49262
+  - protocol: UDP
+    port: 49263
+    name: coturn-udp-49263
+    targetPort: 49263
+  - protocol: UDP
+    port: 49264
+    name: coturn-udp-49264
+    targetPort: 49264
+  - protocol: UDP
+    port: 49265
+    name: coturn-udp-49265
+    targetPort: 49265
+  - protocol: UDP
+    port: 49266
+    name: coturn-udp-49266
+    targetPort: 49266
+  - protocol: UDP
+    port: 49267
+    name: coturn-udp-49267
+    targetPort: 49267
+  - protocol: UDP
+    port: 49268
+    name: coturn-udp-49268
+    targetPort: 49268
+  - protocol: UDP
+    port: 49269
+    name: coturn-udp-49269
+    targetPort: 49269
+  - protocol: UDP
+    port: 49270
+    name: coturn-udp-49270
+    targetPort: 49270
+  - protocol: UDP
+    port: 49271
+    name: coturn-udp-49271
+    targetPort: 49271
+  - protocol: UDP
+    port: 49272
+    name: coturn-udp-49272
+    targetPort: 49272
+  - protocol: UDP
+    port: 49273
+    name: coturn-udp-49273
+    targetPort: 49273
+  - protocol: UDP
+    port: 49274
+    name: coturn-udp-49274
+    targetPort: 49274
+  - protocol: UDP
+    port: 49275
+    name: coturn-udp-49275
+    targetPort: 49275
+  - protocol: UDP
+    port: 49276
+    name: coturn-udp-49276
+    targetPort: 49276
+  - protocol: UDP
+    port: 49277
+    name: coturn-udp-49277
+    targetPort: 49277
+  - protocol: UDP
+    port: 49278
+    name: coturn-udp-49278
+    targetPort: 49278
+  - protocol: UDP
+    port: 49279
+    name: coturn-udp-49279
+    targetPort: 49279
+  - protocol: UDP
+    port: 49280
+    name: coturn-udp-49280
+    targetPort: 49280
+  - protocol: UDP
+    port: 49281
+    name: coturn-udp-49281
+    targetPort: 49281
+  - protocol: UDP
+    port: 49282
+    name: coturn-udp-49282
+    targetPort: 49282
+  - protocol: UDP
+    port: 49283
+    name: coturn-udp-49283
+    targetPort: 49283
+  - protocol: UDP
+    port: 49284
+    name: coturn-udp-49284
+    targetPort: 49284
+  - protocol: UDP
+    port: 49285
+    name: coturn-udp-49285
+    targetPort: 49285
+  - protocol: UDP
+    port: 49286
+    name: coturn-udp-49286
+    targetPort: 49286
+  - protocol: UDP
+    port: 49287
+    name: coturn-udp-49287
+    targetPort: 49287
+  - protocol: UDP
+    port: 49288
+    name: coturn-udp-49288
+    targetPort: 49288
+  - protocol: UDP
+    port: 49289
+    name: coturn-udp-49289
+    targetPort: 49289
+  - protocol: UDP
+    port: 49290
+    name: coturn-udp-49290
+    targetPort: 49290
+  - protocol: UDP
+    port: 49291
+    name: coturn-udp-49291
+    targetPort: 49291
+  - protocol: UDP
+    port: 49292
+    name: coturn-udp-49292
+    targetPort: 49292
+  - protocol: UDP
+    port: 49293
+    name: coturn-udp-49293
+    targetPort: 49293
+  - protocol: UDP
+    port: 49294
+    name: coturn-udp-49294
+    targetPort: 49294
+  - protocol: UDP
+    port: 49295
+    name: coturn-udp-49295
+    targetPort: 49295
+  - protocol: UDP
+    port: 49296
+    name: coturn-udp-49296
+    targetPort: 49296
+  - protocol: UDP
+    port: 49297
+    name: coturn-udp-49297
+    targetPort: 49297
+  - protocol: UDP
+    port: 49298
+    name: coturn-udp-49298
+    targetPort: 49298
+  - protocol: UDP
+    port: 49299
+    name: coturn-udp-49299
+    targetPort: 49299
+  - protocol: UDP
+    port: 49300
+    name: coturn-udp-49300
+    targetPort: 49300
+  - protocol: UDP
+    port: 49301
+    name: coturn-udp-49301
+    targetPort: 49301
+  - protocol: UDP
+    port: 49302
+    name: coturn-udp-49302
+    targetPort: 49302
+  - protocol: UDP
+    port: 49303
+    name: coturn-udp-49303
+    targetPort: 49303
+  - protocol: UDP
+    port: 49304
+    name: coturn-udp-49304
+    targetPort: 49304
+  - protocol: UDP
+    port: 49305
+    name: coturn-udp-49305
+    targetPort: 49305
+  - protocol: UDP
+    port: 49306
+    name: coturn-udp-49306
+    targetPort: 49306
+  - protocol: UDP
+    port: 49307
+    name: coturn-udp-49307
+    targetPort: 49307
+  - protocol: UDP
+    port: 49308
+    name: coturn-udp-49308
+    targetPort: 49308
+  - protocol: UDP
+    port: 49309
+    name: coturn-udp-49309
+    targetPort: 49309
+  - protocol: UDP
+    port: 49310
+    name: coturn-udp-49310
+    targetPort: 49310
+  - protocol: UDP
+    port: 49311
+    name: coturn-udp-49311
+    targetPort: 49311
+  - protocol: UDP
+    port: 49312
+    name: coturn-udp-49312
+    targetPort: 49312
+  - protocol: UDP
+    port: 49313
+    name: coturn-udp-49313
+    targetPort: 49313
+  - protocol: UDP
+    port: 49314
+    name: coturn-udp-49314
+    targetPort: 49314
+  - protocol: UDP
+    port: 49315
+    name: coturn-udp-49315
+    targetPort: 49315
+  - protocol: UDP
+    port: 49316
+    name: coturn-udp-49316
+    targetPort: 49316
+  - protocol: UDP
+    port: 49317
+    name: coturn-udp-49317
+    targetPort: 49317
+  - protocol: UDP
+    port: 49318
+    name: coturn-udp-49318
+    targetPort: 49318
+  - protocol: UDP
+    port: 49319
+    name: coturn-udp-49319
+    targetPort: 49319
+  - protocol: UDP
+    port: 49320
+    name: coturn-udp-49320
+    targetPort: 49320
+  - protocol: UDP
+    port: 49321
+    name: coturn-udp-49321
+    targetPort: 49321
+  - protocol: UDP
+    port: 49322
+    name: coturn-udp-49322
+    targetPort: 49322
+  - protocol: UDP
+    port: 49323
+    name: coturn-udp-49323
+    targetPort: 49323
+  - protocol: UDP
+    port: 49324
+    name: coturn-udp-49324
+    targetPort: 49324
+  - protocol: UDP
+    port: 49325
+    name: coturn-udp-49325
+    targetPort: 49325
+  - protocol: UDP
+    port: 49326
+    name: coturn-udp-49326
+    targetPort: 49326
+  - protocol: UDP
+    port: 49327
+    name: coturn-udp-49327
+    targetPort: 49327
+  - protocol: UDP
+    port: 49328
+    name: coturn-udp-49328
+    targetPort: 49328
+  - protocol: UDP
+    port: 49329
+    name: coturn-udp-49329
+    targetPort: 49329
+  - protocol: UDP
+    port: 49330
+    name: coturn-udp-49330
+    targetPort: 49330
+  - protocol: UDP
+    port: 49331
+    name: coturn-udp-49331
+    targetPort: 49331
+  - protocol: UDP
+    port: 49332
+    name: coturn-udp-49332
+    targetPort: 49332
+  - protocol: UDP
+    port: 49333
+    name: coturn-udp-49333
+    targetPort: 49333
+  - protocol: UDP
+    port: 49334
+    name: coturn-udp-49334
+    targetPort: 49334
+  - protocol: UDP
+    port: 49335
+    name: coturn-udp-49335
+    targetPort: 49335
+  - protocol: UDP
+    port: 49336
+    name: coturn-udp-49336
+    targetPort: 49336
+  - protocol: UDP
+    port: 49337
+    name: coturn-udp-49337
+    targetPort: 49337
+  - protocol: UDP
+    port: 49338
+    name: coturn-udp-49338
+    targetPort: 49338
+  - protocol: UDP
+    port: 49339
+    name: coturn-udp-49339
+    targetPort: 49339
+  - protocol: UDP
+    port: 49340
+    name: coturn-udp-49340
+    targetPort: 49340
+  - protocol: UDP
+    port: 49341
+    name: coturn-udp-49341
+    targetPort: 49341
+  - protocol: UDP
+    port: 49342
+    name: coturn-udp-49342
+    targetPort: 49342
+  - protocol: UDP
+    port: 49343
+    name: coturn-udp-49343
+    targetPort: 49343
+  - protocol: UDP
+    port: 49344
+    name: coturn-udp-49344
+    targetPort: 49344
+  - protocol: UDP
+    port: 49345
+    name: coturn-udp-49345
+    targetPort: 49345
+  - protocol: UDP
+    port: 49346
+    name: coturn-udp-49346
+    targetPort: 49346
+  - protocol: UDP
+    port: 49347
+    name: coturn-udp-49347
+    targetPort: 49347
+  - protocol: UDP
+    port: 49348
+    name: coturn-udp-49348
+    targetPort: 49348
+  - protocol: UDP
+    port: 49349
+    name: coturn-udp-49349
+    targetPort: 49349
+  - protocol: UDP
+    port: 49350
+    name: coturn-udp-49350
+    targetPort: 49350
+  - protocol: UDP
+    port: 49351
+    name: coturn-udp-49351
+    targetPort: 49351
+  - protocol: UDP
+    port: 49352
+    name: coturn-udp-49352
+    targetPort: 49352
+  selector:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller-admission
+  namespace: ingress-nginx
+spec:
+  ports:
+  - appProtocol: https
+    name: https-webhook
+    port: 443
+    targetPort: webhook
+  selector:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+  type: ClusterIP
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+spec:
+  minReadySeconds: 0
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: controller
+      app.kubernetes.io/instance: ingress-nginx
+      app.kubernetes.io/name: ingress-nginx
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: controller
+        app.kubernetes.io/instance: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
+        app.kubernetes.io/version: 1.7.1
+    spec:
+      containers:
+      - args:
+        - /nginx-ingress-controller
+        - --tcp-services-configmap=ingress-nginx/tcp-services
+        - --udp-services-configmap=ingress-nginx/udp-services
+        - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
+        - --election-id=ingress-nginx-leader
+        - --controller-class=k8s.io/ingress-nginx
+        - --ingress-class=nginx
+        - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
+        - --validating-webhook=:8443
+        - --validating-webhook-certificate=/usr/local/certificates/cert
+        - --validating-webhook-key=/usr/local/certificates/key
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: LD_PRELOAD
+          value: /usr/local/lib/libmimalloc.so
+        image: registry.k8s.io/ingress-nginx/controller:v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
+        imagePullPolicy: IfNotPresent
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - /wait-shutdown
+        livenessProbe:
+          failureThreshold: 5
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+        name: controller
+        ports:
+        - containerPort: 80
+          name: http
+          protocol: TCP
+        - containerPort: 443
+          name: https
+          protocol: TCP
+        - containerPort: 8443
+          name: webhook
+          protocol: TCP
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+        resources:
+          requests:
+            cpu: 100m
+            memory: 90Mi
+        securityContext:
+          allowPrivilegeEscalation: true
+          capabilities:
+            add:
+            - NET_BIND_SERVICE
+            drop:
+            - ALL
+          runAsUser: 101
+        volumeMounts:
+        - mountPath: /usr/local/certificates/
+          name: webhook-cert
+          readOnly: true
+      dnsPolicy: ClusterFirst
+      nodeSelector:
+        kubernetes.io/os: linux
+      serviceAccountName: ingress-nginx
+      terminationGracePeriodSeconds: 300
+      volumes:
+      - name: webhook-cert
+        secret:
+          secretName: ingress-nginx-admission
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission-create
+  namespace: ingress-nginx
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: admission-webhook
+        app.kubernetes.io/instance: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
+        app.kubernetes.io/version: 1.7.1
+      name: ingress-nginx-admission-create
+    spec:
+      containers:
+      - args:
+        - create
+        - --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
+        - --namespace=$(POD_NAMESPACE)
+        - --secret-name=ingress-nginx-admission
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
+        imagePullPolicy: IfNotPresent
+        name: create
+        securityContext:
+          allowPrivilegeEscalation: false
+      nodeSelector:
+        kubernetes.io/os: linux
+      restartPolicy: OnFailure
+      securityContext:
+        fsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      serviceAccountName: ingress-nginx-admission
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission-patch
+  namespace: ingress-nginx
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: admission-webhook
+        app.kubernetes.io/instance: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
+        app.kubernetes.io/version: 1.7.1
+      name: ingress-nginx-admission-patch
+    spec:
+      containers:
+      - args:
+        - patch
+        - --webhook-name=ingress-nginx-admission
+        - --namespace=$(POD_NAMESPACE)
+        - --patch-mutating=false
+        - --secret-name=ingress-nginx-admission
+        - --patch-failure-policy=Fail
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
+        imagePullPolicy: IfNotPresent
+        name: patch
+        securityContext:
+          allowPrivilegeEscalation: false
+      nodeSelector:
+        kubernetes.io/os: linux
+      restartPolicy: OnFailure
+      securityContext:
+        fsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      serviceAccountName: ingress-nginx-admission
+---
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: nginx
+spec:
+  controller: k8s.io/ingress-nginx
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: ingress-nginx-controller-admission
+      namespace: ingress-nginx
+      path: /networking/v1/ingresses
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validate.nginx.ingress.kubernetes.io
+  rules:
+  - apiGroups:
+    - networking.k8s.io
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - ingresses
+  sideEffects: None
diff --git a/kubernetes/postfix.yaml b/kubernetes/postfix.yaml
index 679f9a050..07c394258 100644
--- a/kubernetes/postfix.yaml
+++ b/kubernetes/postfix.yaml
@@ -26,6 +26,7 @@ spec:
                 path: key.pem
       containers:
         - name: postfix
+          imagePullPolicy: Always
           image: deathangel908/pychat-postfix
           volumeMounts:
           - name: pychat-postfix-tls
@@ -52,4 +53,4 @@ spec:
     - protocol: TCP
       port: 465
       name: smpt-tcp-reply-2
-      targetPort: 465
\ No newline at end of file
+      targetPort: 465
diff --git a/kubernetes/turnserver.conf b/kubernetes/turnserver.conf
new file mode 100644
index 000000000..fbb7309ef
--- /dev/null
+++ b/kubernetes/turnserver.conf
@@ -0,0 +1,11 @@
+user=pychat:pypass
+realm=pychat.org
+server-name=pychat.org
+min-port=49152
+max-port=49352
+listening-port=3478
+tls-listening-port=5349
+listening-ip=0.0.0.0
+verbose
+cert=/etc/tls/crt.pem
+pkey=/etc/tls/key.pem

From 21d8202c21e6db763ad8e7de71b79b9aec9857a1 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 23 May 2023 18:48:55 +0300
Subject: [PATCH 163/221] Fixed namings

---
 kubernetes/{DockerfileTurn => DockerfileCoturn} | 4 ++--
 kubernetes/coturn.yaml                          | 2 +-
 kubernetes/postfix.yaml                         | 8 --------
 3 files changed, 3 insertions(+), 11 deletions(-)
 rename kubernetes/{DockerfileTurn => DockerfileCoturn} (56%)

diff --git a/kubernetes/DockerfileTurn b/kubernetes/DockerfileCoturn
similarity index 56%
rename from kubernetes/DockerfileTurn
rename to kubernetes/DockerfileCoturn
index ffd0b2060..2374dc0b1 100644
--- a/kubernetes/DockerfileTurn
+++ b/kubernetes/DockerfileCoturn
@@ -1,5 +1,5 @@
-# docker build -f ./kubernetes/DockerfileTurn -t deathangel908/pychat-turn .
-# docker push deathangel908/pychat-turn
+# docker build -f ./kubernetes/DockerfileCoturn -t deathangel908/pychat-coturn .
+# docker push deathangel908/pychat-coturn
 
 FROM alpine:3.17.3
 RUN apk update && \
diff --git a/kubernetes/coturn.yaml b/kubernetes/coturn.yaml
index 7fad58488..9bf53cf1c 100644
--- a/kubernetes/coturn.yaml
+++ b/kubernetes/coturn.yaml
@@ -27,7 +27,7 @@ spec:
       containers:
         - name: coturn
           imagePullPolicy: Always
-          image: deathangel908/pychat-turn
+          image: deathangel908/pychat-coturn
           volumeMounts:
           - name: pychat-coturn-tls
             mountPath: "/etc/tls"
diff --git a/kubernetes/postfix.yaml b/kubernetes/postfix.yaml
index 07c394258..e21aeef33 100644
--- a/kubernetes/postfix.yaml
+++ b/kubernetes/postfix.yaml
@@ -46,11 +46,3 @@ spec:
       port: 25
       name: smtp-tls
       targetPort: 25
-    - protocol: TCP
-      port: 587
-      name: smpt-tcp-reply-1
-      targetPort: 587
-    - protocol: TCP
-      port: 465
-      name: smpt-tcp-reply-2
-      targetPort: 465

From e26dd54dd403fd121209fb630cf2971709249931 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 23 May 2023 21:52:01 +0300
Subject: [PATCH 164/221] load-balancer replaced for NodePort and it works

---
 README.md                                     |   14 +-
 ...troller-legacy-provider-load-balancer.yaml | 1692 +++++++++++++++++
 kubernetes/ingress-controller.yaml            |  267 +--
 3 files changed, 1710 insertions(+), 263 deletions(-)
 create mode 100644 kubernetes/ingress-controller-legacy-provider-load-balancer.yaml

diff --git a/README.md b/README.md
index 2d764a26e..16b9ecfa8 100644
--- a/README.md
+++ b/README.md
@@ -515,10 +515,18 @@ http ALL=(ALL) NOPASSWD: RESTART_TORNADO
  1. Go to linode dashboard, kubernetes -> create cluster, if it's not created yet.
  2. After provisioning has finished, download `kubectl-config.yaml` from the linode dashboard and place it either at `~/.kube/config` or do export KUBECONFIG=/file/path . Verify that you can access the cluster with `kubectl get nodes`
  3. Install nginx controller:
- - Download chart repo and chart `helm repo add stable https://charts.helm.sh/stable`
- - `helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx`
- - Installing ingress controller: `helm install nginx-ingress ingress-nginx/ingress-nginx`. You should see load-banancer on your admin dashboard now.
+I have to come up with using custom yaml file for ingress instead of helm, since I need a few tweaks like tcp/udp port mapping, and purging redundant webhooks and etc.
+You have 2 options, use standard way, with LoadBalancer provided by your k8s provider, which it will aditionally bill you (gcp 20$/m, linode 10$/m). Or inject some hacks which will expose ingress ip to public host.
+ 3.1 Provider's load balancer
+ - `kubectl apply -f ./kubernetes/ingress-controller-legacy-provider-load-balancer.yaml`
+ - Check that you see load-banancer on your admin dashboard now.
  - Specify load-balancer ip address in your DNS provider.
+ - `kubectl apply -f kubernetes/ingress.yaml`
+ 3.2 Custom load balancer. This method assumes that you have ingress on some of your nodes. I only checked that it worked with a k8s cluster with a single node.
+ - Edit `kubernetes/ingress-controller.yaml` and replace `externalIPs` to the one that your k8s node has.
+ - `kubectl apply -f ./kubernetes/ingress-controller.yaml`
+ - Specify your k8s node IP address in your dns provider. 
+ - `kubectl apply -f kubernetes/ingress.yaml`
  4. If you don't have ssl certificate, lets use letsencrypt and certmanager to generate it for us.
  
  4.1. Install cert-manager
diff --git a/kubernetes/ingress-controller-legacy-provider-load-balancer.yaml b/kubernetes/ingress-controller-legacy-provider-load-balancer.yaml
new file mode 100644
index 000000000..341a37c30
--- /dev/null
+++ b/kubernetes/ingress-controller-legacy-provider-load-balancer.yaml
@@ -0,0 +1,1692 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+  name: ingress-nginx
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: tcp-services
+  namespace: ingress-nginx
+data:
+#  25: "pychat/postfix-service:25"
+#  587: "pychat/postfix-service:587"
+#  465: "pychat/postfix-service:465"
+  3478: "pychat/coturn-service:3478"
+  5349: "pychat/coturn-service:5349"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: udp-services
+  namespace: ingress-nginx
+data:
+  #for (let i = 49152; i < 49353; i++) {
+  #console.log(`  ${i}: "pychat/coturn-service:${i}"`)
+  #}
+  3478: "pychat/coturn-service:3478"
+  5349: "pychat/coturn-service:5349"
+  49152: "pychat/coturn-service:49152"
+  49153: "pychat/coturn-service:49153"
+  49154: "pychat/coturn-service:49154"
+  49155: "pychat/coturn-service:49155"
+  49156: "pychat/coturn-service:49156"
+  49157: "pychat/coturn-service:49157"
+  49158: "pychat/coturn-service:49158"
+  49159: "pychat/coturn-service:49159"
+  49160: "pychat/coturn-service:49160"
+  49161: "pychat/coturn-service:49161"
+  49162: "pychat/coturn-service:49162"
+  49163: "pychat/coturn-service:49163"
+  49164: "pychat/coturn-service:49164"
+  49165: "pychat/coturn-service:49165"
+  49166: "pychat/coturn-service:49166"
+  49167: "pychat/coturn-service:49167"
+  49168: "pychat/coturn-service:49168"
+  49169: "pychat/coturn-service:49169"
+  49170: "pychat/coturn-service:49170"
+  49171: "pychat/coturn-service:49171"
+  49172: "pychat/coturn-service:49172"
+  49173: "pychat/coturn-service:49173"
+  49174: "pychat/coturn-service:49174"
+  49175: "pychat/coturn-service:49175"
+  49176: "pychat/coturn-service:49176"
+  49177: "pychat/coturn-service:49177"
+  49178: "pychat/coturn-service:49178"
+  49179: "pychat/coturn-service:49179"
+  49180: "pychat/coturn-service:49180"
+  49181: "pychat/coturn-service:49181"
+  49182: "pychat/coturn-service:49182"
+  49183: "pychat/coturn-service:49183"
+  49184: "pychat/coturn-service:49184"
+  49185: "pychat/coturn-service:49185"
+  49186: "pychat/coturn-service:49186"
+  49187: "pychat/coturn-service:49187"
+  49188: "pychat/coturn-service:49188"
+  49189: "pychat/coturn-service:49189"
+  49190: "pychat/coturn-service:49190"
+  49191: "pychat/coturn-service:49191"
+  49192: "pychat/coturn-service:49192"
+  49193: "pychat/coturn-service:49193"
+  49194: "pychat/coturn-service:49194"
+  49195: "pychat/coturn-service:49195"
+  49196: "pychat/coturn-service:49196"
+  49197: "pychat/coturn-service:49197"
+  49198: "pychat/coturn-service:49198"
+  49199: "pychat/coturn-service:49199"
+  49200: "pychat/coturn-service:49200"
+  49201: "pychat/coturn-service:49201"
+  49202: "pychat/coturn-service:49202"
+  49203: "pychat/coturn-service:49203"
+  49204: "pychat/coturn-service:49204"
+  49205: "pychat/coturn-service:49205"
+  49206: "pychat/coturn-service:49206"
+  49207: "pychat/coturn-service:49207"
+  49208: "pychat/coturn-service:49208"
+  49209: "pychat/coturn-service:49209"
+  49210: "pychat/coturn-service:49210"
+  49211: "pychat/coturn-service:49211"
+  49212: "pychat/coturn-service:49212"
+  49213: "pychat/coturn-service:49213"
+  49214: "pychat/coturn-service:49214"
+  49215: "pychat/coturn-service:49215"
+  49216: "pychat/coturn-service:49216"
+  49217: "pychat/coturn-service:49217"
+  49218: "pychat/coturn-service:49218"
+  49219: "pychat/coturn-service:49219"
+  49220: "pychat/coturn-service:49220"
+  49221: "pychat/coturn-service:49221"
+  49222: "pychat/coturn-service:49222"
+  49223: "pychat/coturn-service:49223"
+  49224: "pychat/coturn-service:49224"
+  49225: "pychat/coturn-service:49225"
+  49226: "pychat/coturn-service:49226"
+  49227: "pychat/coturn-service:49227"
+  49228: "pychat/coturn-service:49228"
+  49229: "pychat/coturn-service:49229"
+  49230: "pychat/coturn-service:49230"
+  49231: "pychat/coturn-service:49231"
+  49232: "pychat/coturn-service:49232"
+  49233: "pychat/coturn-service:49233"
+  49234: "pychat/coturn-service:49234"
+  49235: "pychat/coturn-service:49235"
+  49236: "pychat/coturn-service:49236"
+  49237: "pychat/coturn-service:49237"
+  49238: "pychat/coturn-service:49238"
+  49239: "pychat/coturn-service:49239"
+  49240: "pychat/coturn-service:49240"
+  49241: "pychat/coturn-service:49241"
+  49242: "pychat/coturn-service:49242"
+  49243: "pychat/coturn-service:49243"
+  49244: "pychat/coturn-service:49244"
+  49245: "pychat/coturn-service:49245"
+  49246: "pychat/coturn-service:49246"
+  49247: "pychat/coturn-service:49247"
+  49248: "pychat/coturn-service:49248"
+  49249: "pychat/coturn-service:49249"
+  49250: "pychat/coturn-service:49250"
+  49251: "pychat/coturn-service:49251"
+  49252: "pychat/coturn-service:49252"
+  49253: "pychat/coturn-service:49253"
+  49254: "pychat/coturn-service:49254"
+  49255: "pychat/coturn-service:49255"
+  49256: "pychat/coturn-service:49256"
+  49257: "pychat/coturn-service:49257"
+  49258: "pychat/coturn-service:49258"
+  49259: "pychat/coturn-service:49259"
+  49260: "pychat/coturn-service:49260"
+  49261: "pychat/coturn-service:49261"
+  49262: "pychat/coturn-service:49262"
+  49263: "pychat/coturn-service:49263"
+  49264: "pychat/coturn-service:49264"
+  49265: "pychat/coturn-service:49265"
+  49266: "pychat/coturn-service:49266"
+  49267: "pychat/coturn-service:49267"
+  49268: "pychat/coturn-service:49268"
+  49269: "pychat/coturn-service:49269"
+  49270: "pychat/coturn-service:49270"
+  49271: "pychat/coturn-service:49271"
+  49272: "pychat/coturn-service:49272"
+  49273: "pychat/coturn-service:49273"
+  49274: "pychat/coturn-service:49274"
+  49275: "pychat/coturn-service:49275"
+  49276: "pychat/coturn-service:49276"
+  49277: "pychat/coturn-service:49277"
+  49278: "pychat/coturn-service:49278"
+  49279: "pychat/coturn-service:49279"
+  49280: "pychat/coturn-service:49280"
+  49281: "pychat/coturn-service:49281"
+  49282: "pychat/coturn-service:49282"
+  49283: "pychat/coturn-service:49283"
+  49284: "pychat/coturn-service:49284"
+  49285: "pychat/coturn-service:49285"
+  49286: "pychat/coturn-service:49286"
+  49287: "pychat/coturn-service:49287"
+  49288: "pychat/coturn-service:49288"
+  49289: "pychat/coturn-service:49289"
+  49290: "pychat/coturn-service:49290"
+  49291: "pychat/coturn-service:49291"
+  49292: "pychat/coturn-service:49292"
+  49293: "pychat/coturn-service:49293"
+  49294: "pychat/coturn-service:49294"
+  49295: "pychat/coturn-service:49295"
+  49296: "pychat/coturn-service:49296"
+  49297: "pychat/coturn-service:49297"
+  49298: "pychat/coturn-service:49298"
+  49299: "pychat/coturn-service:49299"
+  49300: "pychat/coturn-service:49300"
+  49301: "pychat/coturn-service:49301"
+  49302: "pychat/coturn-service:49302"
+  49303: "pychat/coturn-service:49303"
+  49304: "pychat/coturn-service:49304"
+  49305: "pychat/coturn-service:49305"
+  49306: "pychat/coturn-service:49306"
+  49307: "pychat/coturn-service:49307"
+  49308: "pychat/coturn-service:49308"
+  49309: "pychat/coturn-service:49309"
+  49310: "pychat/coturn-service:49310"
+  49311: "pychat/coturn-service:49311"
+  49312: "pychat/coturn-service:49312"
+  49313: "pychat/coturn-service:49313"
+  49314: "pychat/coturn-service:49314"
+  49315: "pychat/coturn-service:49315"
+  49316: "pychat/coturn-service:49316"
+  49317: "pychat/coturn-service:49317"
+  49318: "pychat/coturn-service:49318"
+  49319: "pychat/coturn-service:49319"
+  49320: "pychat/coturn-service:49320"
+  49321: "pychat/coturn-service:49321"
+  49322: "pychat/coturn-service:49322"
+  49323: "pychat/coturn-service:49323"
+  49324: "pychat/coturn-service:49324"
+  49325: "pychat/coturn-service:49325"
+  49326: "pychat/coturn-service:49326"
+  49327: "pychat/coturn-service:49327"
+  49328: "pychat/coturn-service:49328"
+  49329: "pychat/coturn-service:49329"
+  49330: "pychat/coturn-service:49330"
+  49331: "pychat/coturn-service:49331"
+  49332: "pychat/coturn-service:49332"
+  49333: "pychat/coturn-service:49333"
+  49334: "pychat/coturn-service:49334"
+  49335: "pychat/coturn-service:49335"
+  49336: "pychat/coturn-service:49336"
+  49337: "pychat/coturn-service:49337"
+  49338: "pychat/coturn-service:49338"
+  49339: "pychat/coturn-service:49339"
+  49340: "pychat/coturn-service:49340"
+  49341: "pychat/coturn-service:49341"
+  49342: "pychat/coturn-service:49342"
+  49343: "pychat/coturn-service:49343"
+  49344: "pychat/coturn-service:49344"
+  49345: "pychat/coturn-service:49345"
+  49346: "pychat/coturn-service:49346"
+  49347: "pychat/coturn-service:49347"
+  49348: "pychat/coturn-service:49348"
+  49349: "pychat/coturn-service:49349"
+  49350: "pychat/coturn-service:49350"
+  49351: "pychat/coturn-service:49351"
+  49352: "pychat/coturn-service:49352"
+---
+apiVersion: v1
+automountServiceAccountToken: true
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - pods
+  - secrets
+  - endpoints
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - update
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resourceNames:
+  - ingress-nginx-leader
+  resources:
+  - leases
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - list
+  - watch
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - endpoints
+  - nodes
+  - pods
+  - secrets
+  - namespaces
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - update
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - list
+  - watch
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+rules:
+- apiGroups:
+  - admissionregistration.k8s.io
+  resources:
+  - validatingwebhookconfigurations
+  verbs:
+  - get
+  - update
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: ingress-nginx
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx
+  namespace: ingress-nginx
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: ingress-nginx-admission
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ingress-nginx
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx
+  namespace: ingress-nginx
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ingress-nginx-admission
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx-admission
+  namespace: ingress-nginx
+---
+apiVersion: v1
+data:
+  allow-snippet-annotations: "true"
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+spec:
+  externalTrafficPolicy: Local
+  ipFamilies:
+  - IPv4
+  ipFamilyPolicy: SingleStack
+  ports:
+  - appProtocol: http
+    name: http
+    port: 80
+    protocol: TCP
+    targetPort: http
+  - appProtocol: https
+    name: https
+    port: 443
+    protocol: TCP
+    targetPort: https
+  - name: proxied-tcp-5349
+    port: 5349
+    targetPort: 5349
+    protocol: TCP
+  - name: proxied-tcp-3478
+    port: 3478
+    targetPort: 3478
+    protocol: TCP
+  - name: proxied-udp-5349
+    port: 5349
+    targetPort: 5349
+    protocol: UDP
+  - name: proxied-udp-3478
+    port: 3478
+    targetPort: 3478
+    protocol: UDP
+  - protocol: UDP
+    port: 49152
+    name: coturn-udp-49152
+    targetPort: 49152
+  - protocol: UDP
+    port: 49153
+    name: coturn-udp-49153
+    targetPort: 49153
+  - protocol: UDP
+    port: 49154
+    name: coturn-udp-49154
+    targetPort: 49154
+  - protocol: UDP
+    port: 49155
+    name: coturn-udp-49155
+    targetPort: 49155
+  - protocol: UDP
+    port: 49156
+    name: coturn-udp-49156
+    targetPort: 49156
+  - protocol: UDP
+    port: 49157
+    name: coturn-udp-49157
+    targetPort: 49157
+  - protocol: UDP
+    port: 49158
+    name: coturn-udp-49158
+    targetPort: 49158
+  - protocol: UDP
+    port: 49159
+    name: coturn-udp-49159
+    targetPort: 49159
+  - protocol: UDP
+    port: 49160
+    name: coturn-udp-49160
+    targetPort: 49160
+  - protocol: UDP
+    port: 49161
+    name: coturn-udp-49161
+    targetPort: 49161
+  - protocol: UDP
+    port: 49162
+    name: coturn-udp-49162
+    targetPort: 49162
+  - protocol: UDP
+    port: 49163
+    name: coturn-udp-49163
+    targetPort: 49163
+  - protocol: UDP
+    port: 49164
+    name: coturn-udp-49164
+    targetPort: 49164
+  - protocol: UDP
+    port: 49165
+    name: coturn-udp-49165
+    targetPort: 49165
+  - protocol: UDP
+    port: 49166
+    name: coturn-udp-49166
+    targetPort: 49166
+  - protocol: UDP
+    port: 49167
+    name: coturn-udp-49167
+    targetPort: 49167
+  - protocol: UDP
+    port: 49168
+    name: coturn-udp-49168
+    targetPort: 49168
+  - protocol: UDP
+    port: 49169
+    name: coturn-udp-49169
+    targetPort: 49169
+  - protocol: UDP
+    port: 49170
+    name: coturn-udp-49170
+    targetPort: 49170
+  - protocol: UDP
+    port: 49171
+    name: coturn-udp-49171
+    targetPort: 49171
+  - protocol: UDP
+    port: 49172
+    name: coturn-udp-49172
+    targetPort: 49172
+  - protocol: UDP
+    port: 49173
+    name: coturn-udp-49173
+    targetPort: 49173
+  - protocol: UDP
+    port: 49174
+    name: coturn-udp-49174
+    targetPort: 49174
+  - protocol: UDP
+    port: 49175
+    name: coturn-udp-49175
+    targetPort: 49175
+  - protocol: UDP
+    port: 49176
+    name: coturn-udp-49176
+    targetPort: 49176
+  - protocol: UDP
+    port: 49177
+    name: coturn-udp-49177
+    targetPort: 49177
+  - protocol: UDP
+    port: 49178
+    name: coturn-udp-49178
+    targetPort: 49178
+  - protocol: UDP
+    port: 49179
+    name: coturn-udp-49179
+    targetPort: 49179
+  - protocol: UDP
+    port: 49180
+    name: coturn-udp-49180
+    targetPort: 49180
+  - protocol: UDP
+    port: 49181
+    name: coturn-udp-49181
+    targetPort: 49181
+  - protocol: UDP
+    port: 49182
+    name: coturn-udp-49182
+    targetPort: 49182
+  - protocol: UDP
+    port: 49183
+    name: coturn-udp-49183
+    targetPort: 49183
+  - protocol: UDP
+    port: 49184
+    name: coturn-udp-49184
+    targetPort: 49184
+  - protocol: UDP
+    port: 49185
+    name: coturn-udp-49185
+    targetPort: 49185
+  - protocol: UDP
+    port: 49186
+    name: coturn-udp-49186
+    targetPort: 49186
+  - protocol: UDP
+    port: 49187
+    name: coturn-udp-49187
+    targetPort: 49187
+  - protocol: UDP
+    port: 49188
+    name: coturn-udp-49188
+    targetPort: 49188
+  - protocol: UDP
+    port: 49189
+    name: coturn-udp-49189
+    targetPort: 49189
+  - protocol: UDP
+    port: 49190
+    name: coturn-udp-49190
+    targetPort: 49190
+  - protocol: UDP
+    port: 49191
+    name: coturn-udp-49191
+    targetPort: 49191
+  - protocol: UDP
+    port: 49192
+    name: coturn-udp-49192
+    targetPort: 49192
+  - protocol: UDP
+    port: 49193
+    name: coturn-udp-49193
+    targetPort: 49193
+  - protocol: UDP
+    port: 49194
+    name: coturn-udp-49194
+    targetPort: 49194
+  - protocol: UDP
+    port: 49195
+    name: coturn-udp-49195
+    targetPort: 49195
+  - protocol: UDP
+    port: 49196
+    name: coturn-udp-49196
+    targetPort: 49196
+  - protocol: UDP
+    port: 49197
+    name: coturn-udp-49197
+    targetPort: 49197
+  - protocol: UDP
+    port: 49198
+    name: coturn-udp-49198
+    targetPort: 49198
+  - protocol: UDP
+    port: 49199
+    name: coturn-udp-49199
+    targetPort: 49199
+  - protocol: UDP
+    port: 49200
+    name: coturn-udp-49200
+    targetPort: 49200
+  - protocol: UDP
+    port: 49201
+    name: coturn-udp-49201
+    targetPort: 49201
+  - protocol: UDP
+    port: 49202
+    name: coturn-udp-49202
+    targetPort: 49202
+  - protocol: UDP
+    port: 49203
+    name: coturn-udp-49203
+    targetPort: 49203
+  - protocol: UDP
+    port: 49204
+    name: coturn-udp-49204
+    targetPort: 49204
+  - protocol: UDP
+    port: 49205
+    name: coturn-udp-49205
+    targetPort: 49205
+  - protocol: UDP
+    port: 49206
+    name: coturn-udp-49206
+    targetPort: 49206
+  - protocol: UDP
+    port: 49207
+    name: coturn-udp-49207
+    targetPort: 49207
+  - protocol: UDP
+    port: 49208
+    name: coturn-udp-49208
+    targetPort: 49208
+  - protocol: UDP
+    port: 49209
+    name: coturn-udp-49209
+    targetPort: 49209
+  - protocol: UDP
+    port: 49210
+    name: coturn-udp-49210
+    targetPort: 49210
+  - protocol: UDP
+    port: 49211
+    name: coturn-udp-49211
+    targetPort: 49211
+  - protocol: UDP
+    port: 49212
+    name: coturn-udp-49212
+    targetPort: 49212
+  - protocol: UDP
+    port: 49213
+    name: coturn-udp-49213
+    targetPort: 49213
+  - protocol: UDP
+    port: 49214
+    name: coturn-udp-49214
+    targetPort: 49214
+  - protocol: UDP
+    port: 49215
+    name: coturn-udp-49215
+    targetPort: 49215
+  - protocol: UDP
+    port: 49216
+    name: coturn-udp-49216
+    targetPort: 49216
+  - protocol: UDP
+    port: 49217
+    name: coturn-udp-49217
+    targetPort: 49217
+  - protocol: UDP
+    port: 49218
+    name: coturn-udp-49218
+    targetPort: 49218
+  - protocol: UDP
+    port: 49219
+    name: coturn-udp-49219
+    targetPort: 49219
+  - protocol: UDP
+    port: 49220
+    name: coturn-udp-49220
+    targetPort: 49220
+  - protocol: UDP
+    port: 49221
+    name: coturn-udp-49221
+    targetPort: 49221
+  - protocol: UDP
+    port: 49222
+    name: coturn-udp-49222
+    targetPort: 49222
+  - protocol: UDP
+    port: 49223
+    name: coturn-udp-49223
+    targetPort: 49223
+  - protocol: UDP
+    port: 49224
+    name: coturn-udp-49224
+    targetPort: 49224
+  - protocol: UDP
+    port: 49225
+    name: coturn-udp-49225
+    targetPort: 49225
+  - protocol: UDP
+    port: 49226
+    name: coturn-udp-49226
+    targetPort: 49226
+  - protocol: UDP
+    port: 49227
+    name: coturn-udp-49227
+    targetPort: 49227
+  - protocol: UDP
+    port: 49228
+    name: coturn-udp-49228
+    targetPort: 49228
+  - protocol: UDP
+    port: 49229
+    name: coturn-udp-49229
+    targetPort: 49229
+  - protocol: UDP
+    port: 49230
+    name: coturn-udp-49230
+    targetPort: 49230
+  - protocol: UDP
+    port: 49231
+    name: coturn-udp-49231
+    targetPort: 49231
+  - protocol: UDP
+    port: 49232
+    name: coturn-udp-49232
+    targetPort: 49232
+  - protocol: UDP
+    port: 49233
+    name: coturn-udp-49233
+    targetPort: 49233
+  - protocol: UDP
+    port: 49234
+    name: coturn-udp-49234
+    targetPort: 49234
+  - protocol: UDP
+    port: 49235
+    name: coturn-udp-49235
+    targetPort: 49235
+  - protocol: UDP
+    port: 49236
+    name: coturn-udp-49236
+    targetPort: 49236
+  - protocol: UDP
+    port: 49237
+    name: coturn-udp-49237
+    targetPort: 49237
+  - protocol: UDP
+    port: 49238
+    name: coturn-udp-49238
+    targetPort: 49238
+  - protocol: UDP
+    port: 49239
+    name: coturn-udp-49239
+    targetPort: 49239
+  - protocol: UDP
+    port: 49240
+    name: coturn-udp-49240
+    targetPort: 49240
+  - protocol: UDP
+    port: 49241
+    name: coturn-udp-49241
+    targetPort: 49241
+  - protocol: UDP
+    port: 49242
+    name: coturn-udp-49242
+    targetPort: 49242
+  - protocol: UDP
+    port: 49243
+    name: coturn-udp-49243
+    targetPort: 49243
+  - protocol: UDP
+    port: 49244
+    name: coturn-udp-49244
+    targetPort: 49244
+  - protocol: UDP
+    port: 49245
+    name: coturn-udp-49245
+    targetPort: 49245
+  - protocol: UDP
+    port: 49246
+    name: coturn-udp-49246
+    targetPort: 49246
+  - protocol: UDP
+    port: 49247
+    name: coturn-udp-49247
+    targetPort: 49247
+  - protocol: UDP
+    port: 49248
+    name: coturn-udp-49248
+    targetPort: 49248
+  - protocol: UDP
+    port: 49249
+    name: coturn-udp-49249
+    targetPort: 49249
+  - protocol: UDP
+    port: 49250
+    name: coturn-udp-49250
+    targetPort: 49250
+  - protocol: UDP
+    port: 49251
+    name: coturn-udp-49251
+    targetPort: 49251
+  - protocol: UDP
+    port: 49252
+    name: coturn-udp-49252
+    targetPort: 49252
+  - protocol: UDP
+    port: 49253
+    name: coturn-udp-49253
+    targetPort: 49253
+  - protocol: UDP
+    port: 49254
+    name: coturn-udp-49254
+    targetPort: 49254
+  - protocol: UDP
+    port: 49255
+    name: coturn-udp-49255
+    targetPort: 49255
+  - protocol: UDP
+    port: 49256
+    name: coturn-udp-49256
+    targetPort: 49256
+  - protocol: UDP
+    port: 49257
+    name: coturn-udp-49257
+    targetPort: 49257
+  - protocol: UDP
+    port: 49258
+    name: coturn-udp-49258
+    targetPort: 49258
+  - protocol: UDP
+    port: 49259
+    name: coturn-udp-49259
+    targetPort: 49259
+  - protocol: UDP
+    port: 49260
+    name: coturn-udp-49260
+    targetPort: 49260
+  - protocol: UDP
+    port: 49261
+    name: coturn-udp-49261
+    targetPort: 49261
+  - protocol: UDP
+    port: 49262
+    name: coturn-udp-49262
+    targetPort: 49262
+  - protocol: UDP
+    port: 49263
+    name: coturn-udp-49263
+    targetPort: 49263
+  - protocol: UDP
+    port: 49264
+    name: coturn-udp-49264
+    targetPort: 49264
+  - protocol: UDP
+    port: 49265
+    name: coturn-udp-49265
+    targetPort: 49265
+  - protocol: UDP
+    port: 49266
+    name: coturn-udp-49266
+    targetPort: 49266
+  - protocol: UDP
+    port: 49267
+    name: coturn-udp-49267
+    targetPort: 49267
+  - protocol: UDP
+    port: 49268
+    name: coturn-udp-49268
+    targetPort: 49268
+  - protocol: UDP
+    port: 49269
+    name: coturn-udp-49269
+    targetPort: 49269
+  - protocol: UDP
+    port: 49270
+    name: coturn-udp-49270
+    targetPort: 49270
+  - protocol: UDP
+    port: 49271
+    name: coturn-udp-49271
+    targetPort: 49271
+  - protocol: UDP
+    port: 49272
+    name: coturn-udp-49272
+    targetPort: 49272
+  - protocol: UDP
+    port: 49273
+    name: coturn-udp-49273
+    targetPort: 49273
+  - protocol: UDP
+    port: 49274
+    name: coturn-udp-49274
+    targetPort: 49274
+  - protocol: UDP
+    port: 49275
+    name: coturn-udp-49275
+    targetPort: 49275
+  - protocol: UDP
+    port: 49276
+    name: coturn-udp-49276
+    targetPort: 49276
+  - protocol: UDP
+    port: 49277
+    name: coturn-udp-49277
+    targetPort: 49277
+  - protocol: UDP
+    port: 49278
+    name: coturn-udp-49278
+    targetPort: 49278
+  - protocol: UDP
+    port: 49279
+    name: coturn-udp-49279
+    targetPort: 49279
+  - protocol: UDP
+    port: 49280
+    name: coturn-udp-49280
+    targetPort: 49280
+  - protocol: UDP
+    port: 49281
+    name: coturn-udp-49281
+    targetPort: 49281
+  - protocol: UDP
+    port: 49282
+    name: coturn-udp-49282
+    targetPort: 49282
+  - protocol: UDP
+    port: 49283
+    name: coturn-udp-49283
+    targetPort: 49283
+  - protocol: UDP
+    port: 49284
+    name: coturn-udp-49284
+    targetPort: 49284
+  - protocol: UDP
+    port: 49285
+    name: coturn-udp-49285
+    targetPort: 49285
+  - protocol: UDP
+    port: 49286
+    name: coturn-udp-49286
+    targetPort: 49286
+  - protocol: UDP
+    port: 49287
+    name: coturn-udp-49287
+    targetPort: 49287
+  - protocol: UDP
+    port: 49288
+    name: coturn-udp-49288
+    targetPort: 49288
+  - protocol: UDP
+    port: 49289
+    name: coturn-udp-49289
+    targetPort: 49289
+  - protocol: UDP
+    port: 49290
+    name: coturn-udp-49290
+    targetPort: 49290
+  - protocol: UDP
+    port: 49291
+    name: coturn-udp-49291
+    targetPort: 49291
+  - protocol: UDP
+    port: 49292
+    name: coturn-udp-49292
+    targetPort: 49292
+  - protocol: UDP
+    port: 49293
+    name: coturn-udp-49293
+    targetPort: 49293
+  - protocol: UDP
+    port: 49294
+    name: coturn-udp-49294
+    targetPort: 49294
+  - protocol: UDP
+    port: 49295
+    name: coturn-udp-49295
+    targetPort: 49295
+  - protocol: UDP
+    port: 49296
+    name: coturn-udp-49296
+    targetPort: 49296
+  - protocol: UDP
+    port: 49297
+    name: coturn-udp-49297
+    targetPort: 49297
+  - protocol: UDP
+    port: 49298
+    name: coturn-udp-49298
+    targetPort: 49298
+  - protocol: UDP
+    port: 49299
+    name: coturn-udp-49299
+    targetPort: 49299
+  - protocol: UDP
+    port: 49300
+    name: coturn-udp-49300
+    targetPort: 49300
+  - protocol: UDP
+    port: 49301
+    name: coturn-udp-49301
+    targetPort: 49301
+  - protocol: UDP
+    port: 49302
+    name: coturn-udp-49302
+    targetPort: 49302
+  - protocol: UDP
+    port: 49303
+    name: coturn-udp-49303
+    targetPort: 49303
+  - protocol: UDP
+    port: 49304
+    name: coturn-udp-49304
+    targetPort: 49304
+  - protocol: UDP
+    port: 49305
+    name: coturn-udp-49305
+    targetPort: 49305
+  - protocol: UDP
+    port: 49306
+    name: coturn-udp-49306
+    targetPort: 49306
+  - protocol: UDP
+    port: 49307
+    name: coturn-udp-49307
+    targetPort: 49307
+  - protocol: UDP
+    port: 49308
+    name: coturn-udp-49308
+    targetPort: 49308
+  - protocol: UDP
+    port: 49309
+    name: coturn-udp-49309
+    targetPort: 49309
+  - protocol: UDP
+    port: 49310
+    name: coturn-udp-49310
+    targetPort: 49310
+  - protocol: UDP
+    port: 49311
+    name: coturn-udp-49311
+    targetPort: 49311
+  - protocol: UDP
+    port: 49312
+    name: coturn-udp-49312
+    targetPort: 49312
+  - protocol: UDP
+    port: 49313
+    name: coturn-udp-49313
+    targetPort: 49313
+  - protocol: UDP
+    port: 49314
+    name: coturn-udp-49314
+    targetPort: 49314
+  - protocol: UDP
+    port: 49315
+    name: coturn-udp-49315
+    targetPort: 49315
+  - protocol: UDP
+    port: 49316
+    name: coturn-udp-49316
+    targetPort: 49316
+  - protocol: UDP
+    port: 49317
+    name: coturn-udp-49317
+    targetPort: 49317
+  - protocol: UDP
+    port: 49318
+    name: coturn-udp-49318
+    targetPort: 49318
+  - protocol: UDP
+    port: 49319
+    name: coturn-udp-49319
+    targetPort: 49319
+  - protocol: UDP
+    port: 49320
+    name: coturn-udp-49320
+    targetPort: 49320
+  - protocol: UDP
+    port: 49321
+    name: coturn-udp-49321
+    targetPort: 49321
+  - protocol: UDP
+    port: 49322
+    name: coturn-udp-49322
+    targetPort: 49322
+  - protocol: UDP
+    port: 49323
+    name: coturn-udp-49323
+    targetPort: 49323
+  - protocol: UDP
+    port: 49324
+    name: coturn-udp-49324
+    targetPort: 49324
+  - protocol: UDP
+    port: 49325
+    name: coturn-udp-49325
+    targetPort: 49325
+  - protocol: UDP
+    port: 49326
+    name: coturn-udp-49326
+    targetPort: 49326
+  - protocol: UDP
+    port: 49327
+    name: coturn-udp-49327
+    targetPort: 49327
+  - protocol: UDP
+    port: 49328
+    name: coturn-udp-49328
+    targetPort: 49328
+  - protocol: UDP
+    port: 49329
+    name: coturn-udp-49329
+    targetPort: 49329
+  - protocol: UDP
+    port: 49330
+    name: coturn-udp-49330
+    targetPort: 49330
+  - protocol: UDP
+    port: 49331
+    name: coturn-udp-49331
+    targetPort: 49331
+  - protocol: UDP
+    port: 49332
+    name: coturn-udp-49332
+    targetPort: 49332
+  - protocol: UDP
+    port: 49333
+    name: coturn-udp-49333
+    targetPort: 49333
+  - protocol: UDP
+    port: 49334
+    name: coturn-udp-49334
+    targetPort: 49334
+  - protocol: UDP
+    port: 49335
+    name: coturn-udp-49335
+    targetPort: 49335
+  - protocol: UDP
+    port: 49336
+    name: coturn-udp-49336
+    targetPort: 49336
+  - protocol: UDP
+    port: 49337
+    name: coturn-udp-49337
+    targetPort: 49337
+  - protocol: UDP
+    port: 49338
+    name: coturn-udp-49338
+    targetPort: 49338
+  - protocol: UDP
+    port: 49339
+    name: coturn-udp-49339
+    targetPort: 49339
+  - protocol: UDP
+    port: 49340
+    name: coturn-udp-49340
+    targetPort: 49340
+  - protocol: UDP
+    port: 49341
+    name: coturn-udp-49341
+    targetPort: 49341
+  - protocol: UDP
+    port: 49342
+    name: coturn-udp-49342
+    targetPort: 49342
+  - protocol: UDP
+    port: 49343
+    name: coturn-udp-49343
+    targetPort: 49343
+  - protocol: UDP
+    port: 49344
+    name: coturn-udp-49344
+    targetPort: 49344
+  - protocol: UDP
+    port: 49345
+    name: coturn-udp-49345
+    targetPort: 49345
+  - protocol: UDP
+    port: 49346
+    name: coturn-udp-49346
+    targetPort: 49346
+  - protocol: UDP
+    port: 49347
+    name: coturn-udp-49347
+    targetPort: 49347
+  - protocol: UDP
+    port: 49348
+    name: coturn-udp-49348
+    targetPort: 49348
+  - protocol: UDP
+    port: 49349
+    name: coturn-udp-49349
+    targetPort: 49349
+  - protocol: UDP
+    port: 49350
+    name: coturn-udp-49350
+    targetPort: 49350
+  - protocol: UDP
+    port: 49351
+    name: coturn-udp-49351
+    targetPort: 49351
+  - protocol: UDP
+    port: 49352
+    name: coturn-udp-49352
+    targetPort: 49352
+  selector:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller-admission
+  namespace: ingress-nginx
+spec:
+  ports:
+  - appProtocol: https
+    name: https-webhook
+    port: 443
+    targetPort: webhook
+  selector:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+  type: ClusterIP
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+spec:
+  minReadySeconds: 0
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: controller
+      app.kubernetes.io/instance: ingress-nginx
+      app.kubernetes.io/name: ingress-nginx
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: controller
+        app.kubernetes.io/instance: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
+        app.kubernetes.io/version: 1.7.1
+    spec:
+      containers:
+      - args:
+        - /nginx-ingress-controller
+        - --tcp-services-configmap=ingress-nginx/tcp-services
+        - --udp-services-configmap=ingress-nginx/udp-services
+        - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
+        - --election-id=ingress-nginx-leader
+        - --controller-class=k8s.io/ingress-nginx
+        - --ingress-class=nginx
+        - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
+        - --validating-webhook=:8443
+        - --validating-webhook-certificate=/usr/local/certificates/cert
+        - --validating-webhook-key=/usr/local/certificates/key
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: LD_PRELOAD
+          value: /usr/local/lib/libmimalloc.so
+        image: registry.k8s.io/ingress-nginx/controller:v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
+        imagePullPolicy: IfNotPresent
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - /wait-shutdown
+        livenessProbe:
+          failureThreshold: 5
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+        name: controller
+        ports:
+        - containerPort: 80
+          name: http
+          protocol: TCP
+        - containerPort: 443
+          name: https
+          protocol: TCP
+        - containerPort: 8443
+          name: webhook
+          protocol: TCP
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+        resources:
+          requests:
+            cpu: 100m
+            memory: 90Mi
+        securityContext:
+          allowPrivilegeEscalation: true
+          capabilities:
+            add:
+            - NET_BIND_SERVICE
+            drop:
+            - ALL
+          runAsUser: 101
+        volumeMounts:
+        - mountPath: /usr/local/certificates/
+          name: webhook-cert
+          readOnly: true
+      dnsPolicy: ClusterFirst
+      nodeSelector:
+        kubernetes.io/os: linux
+      serviceAccountName: ingress-nginx
+      terminationGracePeriodSeconds: 300
+      volumes:
+      - name: webhook-cert
+        secret:
+          secretName: ingress-nginx-admission
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission-create
+  namespace: ingress-nginx
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: admission-webhook
+        app.kubernetes.io/instance: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
+        app.kubernetes.io/version: 1.7.1
+      name: ingress-nginx-admission-create
+    spec:
+      containers:
+      - args:
+        - create
+        - --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
+        - --namespace=$(POD_NAMESPACE)
+        - --secret-name=ingress-nginx-admission
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
+        imagePullPolicy: IfNotPresent
+        name: create
+        securityContext:
+          allowPrivilegeEscalation: false
+      nodeSelector:
+        kubernetes.io/os: linux
+      restartPolicy: OnFailure
+      securityContext:
+        fsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      serviceAccountName: ingress-nginx-admission
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission-patch
+  namespace: ingress-nginx
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: admission-webhook
+        app.kubernetes.io/instance: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
+        app.kubernetes.io/version: 1.7.1
+      name: ingress-nginx-admission-patch
+    spec:
+      containers:
+      - args:
+        - patch
+        - --webhook-name=ingress-nginx-admission
+        - --namespace=$(POD_NAMESPACE)
+        - --patch-mutating=false
+        - --secret-name=ingress-nginx-admission
+        - --patch-failure-policy=Fail
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
+        imagePullPolicy: IfNotPresent
+        name: patch
+        securityContext:
+          allowPrivilegeEscalation: false
+      nodeSelector:
+        kubernetes.io/os: linux
+      restartPolicy: OnFailure
+      securityContext:
+        fsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      serviceAccountName: ingress-nginx-admission
+---
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: nginx
+spec:
+  controller: k8s.io/ingress-nginx
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-admission
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: ingress-nginx-controller-admission
+      namespace: ingress-nginx
+      path: /networking/v1/ingresses
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validate.nginx.ingress.kubernetes.io
+  rules:
+  - apiGroups:
+    - networking.k8s.io
+    apiVersions:
+    - v1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - ingresses
+  sideEffects: None
diff --git a/kubernetes/ingress-controller.yaml b/kubernetes/ingress-controller.yaml
index 341a37c30..c24250765 100644
--- a/kubernetes/ingress-controller.yaml
+++ b/kubernetes/ingress-controller.yaml
@@ -244,18 +244,6 @@ metadata:
   name: ingress-nginx
   namespace: ingress-nginx
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -347,26 +335,6 @@ rules:
   - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - create
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
@@ -448,25 +416,6 @@ rules:
   - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-rules:
-- apiGroups:
-  - admissionregistration.k8s.io
-  resources:
-  - validatingwebhookconfigurations
-  verbs:
-  - get
-  - update
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
@@ -487,26 +436,6 @@ subjects:
   namespace: ingress-nginx
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: ingress-nginx-admission
-subjects:
-- kind: ServiceAccount
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
@@ -524,25 +453,6 @@ subjects:
   name: ingress-nginx
   namespace: ingress-nginx
 ---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: ingress-nginx-admission
-subjects:
-- kind: ServiceAccount
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
----
 apiVersion: v1
 data:
   allow-snippet-annotations: "true"
@@ -569,7 +479,7 @@ metadata:
   name: ingress-nginx-controller
   namespace: ingress-nginx
 spec:
-  externalTrafficPolicy: Local
+  externalTrafficPolicy: Cluster
   ipFamilies:
   - IPv4
   ipFamilyPolicy: SingleStack
@@ -1408,30 +1318,9 @@ spec:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: ingress-nginx
     app.kubernetes.io/name: ingress-nginx
-  type: LoadBalancer
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-controller-admission
-  namespace: ingress-nginx
-spec:
-  ports:
-  - appProtocol: https
-    name: https-webhook
-    port: 443
-    targetPort: webhook
-  selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  type: ClusterIP
+  type: NodePort
+  externalIPs:
+    - 170.187.189.92
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -1464,16 +1353,13 @@ spec:
       containers:
       - args:
         - /nginx-ingress-controller
-        - --tcp-services-configmap=ingress-nginx/tcp-services
-        - --udp-services-configmap=ingress-nginx/udp-services
+        - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
+        - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
         - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
         - --election-id=ingress-nginx-leader
         - --controller-class=k8s.io/ingress-nginx
         - --ingress-class=nginx
         - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
-        - --validating-webhook=:8443
-        - --validating-webhook-certificate=/usr/local/certificates/cert
-        - --validating-webhook-key=/usr/local/certificates/key
         env:
         - name: POD_NAME
           valueFrom:
@@ -1510,9 +1396,6 @@ spec:
         - containerPort: 443
           name: https
           protocol: TCP
-        - containerPort: 8443
-          name: webhook
-          protocol: TCP
         readinessProbe:
           failureThreshold: 3
           httpGet:
@@ -1535,116 +1418,13 @@ spec:
             drop:
             - ALL
           runAsUser: 101
-        volumeMounts:
-        - mountPath: /usr/local/certificates/
-          name: webhook-cert
-          readOnly: true
       dnsPolicy: ClusterFirst
       nodeSelector:
         kubernetes.io/os: linux
       serviceAccountName: ingress-nginx
       terminationGracePeriodSeconds: 300
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: ingress-nginx-admission
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission-create
-  namespace: ingress-nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: admission-webhook
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.7.1
-      name: ingress-nginx-admission-create
-    spec:
-      containers:
-      - args:
-        - create
-        - --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
-        - --namespace=$(POD_NAMESPACE)
-        - --secret-name=ingress-nginx-admission
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
-        imagePullPolicy: IfNotPresent
-        name: create
-        securityContext:
-          allowPrivilegeEscalation: false
-      nodeSelector:
-        kubernetes.io/os: linux
-      restartPolicy: OnFailure
-      securityContext:
-        fsGroup: 2000
-        runAsNonRoot: true
-        runAsUser: 2000
-      serviceAccountName: ingress-nginx-admission
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission-patch
-  namespace: ingress-nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: admission-webhook
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.7.1
-      name: ingress-nginx-admission-patch
-    spec:
-      containers:
-      - args:
-        - patch
-        - --webhook-name=ingress-nginx-admission
-        - --namespace=$(POD_NAMESPACE)
-        - --patch-mutating=false
-        - --secret-name=ingress-nginx-admission
-        - --patch-failure-policy=Fail
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
-        imagePullPolicy: IfNotPresent
-        name: patch
-        securityContext:
-          allowPrivilegeEscalation: false
-      nodeSelector:
-        kubernetes.io/os: linux
-      restartPolicy: OnFailure
-      securityContext:
-        fsGroup: 2000
-        runAsNonRoot: true
-        runAsUser: 2000
-      serviceAccountName: ingress-nginx-admission
 ---
+
 apiVersion: networking.k8s.io/v1
 kind: IngressClass
 metadata:
@@ -1657,36 +1437,3 @@ metadata:
   name: nginx
 spec:
   controller: k8s.io/ingress-nginx
----
-apiVersion: admissionregistration.k8s.io/v1
-kind: ValidatingWebhookConfiguration
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-webhooks:
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: ingress-nginx-controller-admission
-      namespace: ingress-nginx
-      path: /networking/v1/ingresses
-  failurePolicy: Fail
-  matchPolicy: Equivalent
-  name: validate.nginx.ingress.kubernetes.io
-  rules:
-  - apiGroups:
-    - networking.k8s.io
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - ingresses
-  sideEffects: None

From 1d4d559f9b7f77fbd0746d01c908cfff05ccaf08 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 23 May 2023 23:03:01 +0300
Subject: [PATCH 165/221] Addde README.md kube

---
 README.md                      | 86 ++++++++++++++++++++++++----------
 kubernetes/backend-secret.yaml | 10 ----
 kubernetes/pv-photo.yaml       |  2 +-
 kubernetes/pv-postfix.yaml     |  8 ++--
 4 files changed, 66 insertions(+), 40 deletions(-)
 delete mode 100644 kubernetes/backend-secret.yaml

diff --git a/README.md b/README.md
index 16b9ecfa8..bb74e7a1a 100644
--- a/README.md
+++ b/README.md
@@ -512,32 +512,42 @@ Cmnd_Alias RESTART_TORNADO = /usr/bin/systemctl restart tornado
 http ALL=(ALL) NOPASSWD: RESTART_TORNADO
 ``` 
 # Kubernetes example with [linode](https://www.linode.com/).
- 1. Go to linode dashboard, kubernetes -> create cluster, if it's not created yet.
- 2. After provisioning has finished, download `kubectl-config.yaml` from the linode dashboard and place it either at `~/.kube/config` or do export KUBECONFIG=/file/path . Verify that you can access the cluster with `kubectl get nodes`
- 3. Install nginx controller:
-I have to come up with using custom yaml file for ingress instead of helm, since I need a few tweaks like tcp/udp port mapping, and purging redundant webhooks and etc.
-You have 2 options, use standard way, with LoadBalancer provided by your k8s provider, which it will aditionally bill you (gcp 20$/m, linode 10$/m). Or inject some hacks which will expose ingress ip to public host.
- 3.1 Provider's load balancer
+
+Minimal requirements: 
+ - kubernetes cluster
+ - own a domain, that's required for webrtc video.
+ - 
+ 0. Go through all files in ./kubernetes directory: 
+  - postfix/main.cf
+  - frontend-old-pychat.org.json
+  - nginx-old-pychat.org.conf
+  - turnserver.conf
+  - and other and replace domain pychat.org to yours.
+ 1. Go to your provider dashboard, kubernetes -> create cluster, if it's not created yet.
+ 2. After provisioning has finished, download `kubectl-config.yaml` from the linode dashboard and place it either at `~/.kube/config` or do export KUBECONFIG=/file/path . Verify that you can access the cluster with `kubectl get nodes`.
+ 3. Create namespace pychat. `kubectl apply -f kubernetes/namespace.yaml`
+ 4. Install nginx controller:
+  I have to come up with using custom yaml file for ingress instead of helm, since I need a few tweaks like tcp/udp port mapping, and purging redundant webhooks and etc.
+  You have 2 options, use standard way, with LoadBalancer provided by your k8s provider, which it will aditionally bill you (gcp 20$/m, linode 10$/m). Or inject some hacks which will expose ingress ip to public host.
+  4.1. Provider's load balancer
  - `kubectl apply -f ./kubernetes/ingress-controller-legacy-provider-load-balancer.yaml`
  - Check that you see load-banancer on your admin dashboard now.
  - Specify load-balancer ip address in your DNS provider.
- - `kubectl apply -f kubernetes/ingress.yaml`
- 3.2 Custom load balancer. This method assumes that you have ingress on some of your nodes. I only checked that it worked with a k8s cluster with a single node.
+  4.2. Custom load balancer. This method assumes that you have ingress on some of your nodes. I only checked that it worked with a k8s cluster with a single node.
  - Edit `kubernetes/ingress-controller.yaml` and replace `externalIPs` to the one that your k8s node has.
  - `kubectl apply -f ./kubernetes/ingress-controller.yaml`
- - Specify your k8s node IP address in your dns provider. 
- - `kubectl apply -f kubernetes/ingress.yaml`
- 4. If you don't have ssl certificate, lets use letsencrypt and certmanager to generate it for us.
+ - Specify your k8s node IP address in your dns provider.
+  5. If you don't have ssl certificate, lets use letsencrypt and certmanager to generate it for us.
  
- 4.1. Install cert-manager
- - kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml
- - helm repo add jetstack https://charts.jetstack.io
- - helm repo update
- - helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f -
+ 5.1. Install cert-manager
+ - `kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml`
+ - `helm repo add jetstack https://charts.jetstack.io`
+ - `helm repo update`
+ - `helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f -`
  
- 4.2. Generate cloudflare token
+ 5.2. Generate cloudflare token
  - In clodflare dashboard: Profile → API Tokens → Create Token.  https://dash.cloudflare.com/profile/api-tokens Permissions: Zone — DNS — Edit, Zone — Zone — Read; Zone Resources: Include — All Zones
- - put token into `kubernetes/cf-secret-yaml`
+ - put token into `kubernetes/cf-secret-yaml`. (mine is at mine private repo)
 ```yaml
  apiVersion: v1
 kind: Secret
@@ -548,25 +558,50 @@ type: Opaque
 stringData:
   api-token: cf-api-token
 ```
- - `kubectl apply -f kubernetes/namespace.yaml`
  - `kubectl apply -f kubernetes/cf-secret.yaml`
  - `kubectl apply -f kubernetes/cert-manager.yaml`
  
- 4.3. Verify certificate
+ 5.3. Verify certificate
  - Check that it's created `kubectl get secret pychat-tls -o yaml -n pychat`
  - save it to file: `echo base64certfrom-tls.cert |base64 -d > lol.cert`
  - Should give your domain `openssl x509 -in ./lol.cert  -noout -text`
- 
- 5. Build images and upload it to docker registry:
+ 6. Edit backend secret and deploy it: `kubernetes/backend-secret.yaml` (mine is at mine private repo). Check chat/settings_example.py to understand how to fill values:
+```
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: backend-secret
+  namespace: pychat
+stringData:
+  MYSQL_ROOT_PASSWORD: pypass
+  MYSQL_PASSWORD: pypass
+  MYSQL_USER: pychat
+  EMAIL_PORT: '25'
+  EMAIL_HOST: 'postfix-service'
+  EMAIL_HOST_USER: ''
+  EMAIL_HOST_PASSWORD: ''
+  SECRET_KEY: '***'
+  RECAPTCHA_PRIVATE_KEY: '***'
+  RECAPTCHA_PUBLIC_KEY: '****'
+  GOOGLE_OAUTH_2_CLIENT_ID: '****'
+  FACEBOOK_ACCESS_TOKEN: '****'
+  GIPHY_API_KEY: '****'
+  FIREBASE_API_KEY: '****'
+  DEFAULT_PROFILE_ID: '**'
+  SERVER_EMAIL: 'root@pychat.org'
+```
+deploy it with `kubectl apply -f kubernetes/backend-secret.yaml`
+ 8. Build images and upload it to docker registry. Mine registries contain pychat.org domain:
   - `docker build -f ./kubernetes/DockerfileOldFrontend -t deathangel908/pychat-frontend .`; `docker push deathangel908/pychat-frontend`
   - `docker build -f ./kubernetes/DockerfileOldBackend -t deathangel908/pychat-backend .`; `docker push deathangel908/pychat-backend`
   - `docker build -f ./kubernetes/DockerfilePostfix -t deathangel908/pychat-postfix .` ; `docker push deathangel908/pychat-postfix`
- 6. Setup kubernetes env:
+  - `docker build -f ./kubernetes/DockerfilePostfix -t deathangel908/pychat-coturn .` ; `docker push deathangel908/pychat-coturn`
+ 9. Setup kubernetes env:
   - `kubectl apply -f kubernetes/pv-photo.yaml`
   - `kubectl apply -f kubernetes/pv-redis.yaml`
   - `kubectl apply -f kubernetes/pv-mariadb.yaml`
   - `kubectl apply -f kubernetes/config-map.yaml`
-  - `kubectl apply -f kubernetes/backend-secret.yaml`
   - `kubectl apply -f kubernetes/mariadb.yaml`
   - `kubectl apply -f kubernetes/redis.yaml`
   - `kubectl apply -f kubernetes/migrate-backend.yaml`
@@ -574,8 +609,9 @@ stringData:
   - `kubectl apply -f kubernetes/frontend.yaml`
   - `kubectl apply -f kubernetes/ingress.yaml`
   - `kubectl apply -f kubernetes/postfix.yaml`
+  - `kubectl apply -f kubernetes/coturn.yaml`
 
- 7. For postfix (email server) do not forget to add spf record to cloudflare. Create new TXT record on cloudflare with name/alias `@` (for root domain) and value `v=spf1 ip4:34.243.61.237` where 34:243:61:237 is your NODE's ip in kube with postfix instance. Do not confuse it with ingres/nginx instance
+ 10. For postfix (email server) do not forget to add spf record to cloudflare. Create new TXT record on cloudflare with name/alias `@` (for root domain) and value `v=spf1 ip4:34.243.61.237` where 34:243:61:237 is your NODE's ip in kube with postfix instance. Do not confuse it with ingres/nginx instance
 
 # TODO
 * teleport smileys https://vuejsdevelopers.com/2020/03/16/vue-js-tutorial/#teleporting-content
diff --git a/kubernetes/backend-secret.yaml b/kubernetes/backend-secret.yaml
deleted file mode 100644
index 4543042b7..000000000
--- a/kubernetes/backend-secret.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: backend-secret
-  namespace: pychat
-stringData:
-  MYSQL_ROOT_PASSWORD: pypass
-  MYSQL_PASSWORD: pypass
-  MYSQL_USER: pychat
diff --git a/kubernetes/pv-photo.yaml b/kubernetes/pv-photo.yaml
index 8f4595375..7feff77c8 100644
--- a/kubernetes/pv-photo.yaml
+++ b/kubernetes/pv-photo.yaml
@@ -8,7 +8,7 @@ spec:
   capacity:
     storage: 15Gi
   hostPath:
-    path: /data/photo
+    path: /data/backup/backend/photos
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
diff --git a/kubernetes/pv-postfix.yaml b/kubernetes/pv-postfix.yaml
index eb9cee766..fbe132a40 100644
--- a/kubernetes/pv-postfix.yaml
+++ b/kubernetes/pv-postfix.yaml
@@ -1,19 +1,19 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-photo
+  name: pv-postfix
 spec:
   accessModes:
     - ReadWriteOnce
   capacity:
     storage: 512Mi
   hostPath:
-    path: /data/photo
+    path: /data/postfix
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pvc-photo
+  name: pvc-posftix
   namespace: pychat
 spec:
   accessModes:
@@ -22,4 +22,4 @@ spec:
     requests:
       storage: 15Gi
   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
-  volumeName: pv-photo
+  volumeName: pv-posftix

From 369c0430e80161b90e519d981465d66386c6cb26 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 23 May 2023 23:07:42 +0300
Subject: [PATCH 166/221] Fixed proxy body size

---
 kubernetes/ingress.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml
index a8d5fd766..be75101c0 100644
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/ingress.yaml
@@ -3,6 +3,7 @@ kind: Ingress
 metadata:
   annotations:
     cert-manager.io/issuer: "letsencrypt-prod"
+    nginx.ingress.kubernetes.io/proxy-body-size: 75m
   name: ingress
   namespace: pychat
 spec:

From 12934320907bf3c748a82e927d73fa31ad96060d Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 23 May 2023 23:10:34 +0300
Subject: [PATCH 167/221] 12

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index bb74e7a1a..120064527 100644
--- a/README.md
+++ b/README.md
@@ -613,6 +613,12 @@ deploy it with `kubectl apply -f kubernetes/backend-secret.yaml`
 
  10. For postfix (email server) do not forget to add spf record to cloudflare. Create new TXT record on cloudflare with name/alias `@` (for root domain) and value `v=spf1 ip4:34.243.61.237` where 34:243:61:237 is your NODE's ip in kube with postfix instance. Do not confuse it with ingres/nginx instance
 
+
+# Troubleshooting
+1. How to icrease maximum upload file:
+ - Change nginx configuration  ``   client_max_body_size 75M;`
+ - In addition to above, if you're using k8s + ingress, change `ingress.yaml` nginx.ingress.kubernetes.io/proxy-body-size: 75m 
+ 
 # TODO
 * teleport smileys https://vuejsdevelopers.com/2020/03/16/vue-js-tutorial/#teleporting-content
 * user1 writes a message, user1 goes offline, user 2 opens a chat from 1st devices and goes offline, user 2 opens a chat from 2nd devices and responds in its thread and goes offline, user2 opens first deviecs and thread messages count = 0

From cbf985f869c318e92370caade9fee7260b893fc4 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 24 May 2023 02:24:03 +0300
Subject: [PATCH 168/221] Fixed storage price

---
 kubernetes/pv-mariadb.yaml |  6 ++++--
 kubernetes/pv-postfix.yaml | 25 -------------------------
 kubernetes/pv-redis.yaml   |  2 ++
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 kubernetes/pv-postfix.yaml

diff --git a/kubernetes/pv-mariadb.yaml b/kubernetes/pv-mariadb.yaml
index faf22b941..1f74b75f4 100644
--- a/kubernetes/pv-mariadb.yaml
+++ b/kubernetes/pv-mariadb.yaml
@@ -6,7 +6,7 @@ spec:
   accessModes:
     - ReadWriteOnce
   capacity:
-    storage: 2Gi
+    storage: 5Gi
   hostPath:
     path: /data/mariadb
 ---
@@ -20,4 +20,6 @@ spec:
      - ReadWriteOnce
    resources:
      requests:
-       storage: 2Gi
+       storage: 5Gi
+   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
+   volumeName: pv-mariadb
diff --git a/kubernetes/pv-postfix.yaml b/kubernetes/pv-postfix.yaml
deleted file mode 100644
index fbe132a40..000000000
--- a/kubernetes/pv-postfix.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-postfix
-spec:
-  accessModes:
-    - ReadWriteOnce
-  capacity:
-    storage: 512Mi
-  hostPath:
-    path: /data/postfix
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: pvc-posftix
-  namespace: pychat
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 15Gi
-  storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
-  volumeName: pv-posftix
diff --git a/kubernetes/pv-redis.yaml b/kubernetes/pv-redis.yaml
index 4616a92c5..035ecb1c7 100644
--- a/kubernetes/pv-redis.yaml
+++ b/kubernetes/pv-redis.yaml
@@ -21,3 +21,5 @@ spec:
    resources:
      requests:
        storage: 1Gi
+   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
+   volumeName: pv-redis

From 29c5cb705e0da033bd2fbb72b7051ebc212a4473 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 24 May 2023 20:25:32 +0300
Subject: [PATCH 169/221] README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 120064527..8ed5c9b04 100644
--- a/README.md
+++ b/README.md
@@ -591,7 +591,7 @@ stringData:
   DEFAULT_PROFILE_ID: '**'
   SERVER_EMAIL: 'root@pychat.org'
 ```
-deploy it with `kubectl apply -f kubernetes/backend-secret.yaml`
+deploy it with `kubectl apply -f kubernetes/backend-secret.yaml`. (Tip for myself For local minikube it's better to use pychat_data)
  8. Build images and upload it to docker registry. Mine registries contain pychat.org domain:
   - `docker build -f ./kubernetes/DockerfileOldFrontend -t deathangel908/pychat-frontend .`; `docker push deathangel908/pychat-frontend`
   - `docker build -f ./kubernetes/DockerfileOldBackend -t deathangel908/pychat-backend .`; `docker push deathangel908/pychat-backend`

From cfe7b60f31bc64ff79ab5fb7e16430ab6ec54dd6 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 26 May 2023 20:02:14 +0300
Subject: [PATCH 170/221] Adding terraform

---
 README.md                                     | 13 ++++
 kubernetes/.gitignore                         |  3 +
 kubernetes/.terraform.lock.hcl                | 66 +++++++++++++++++++
 kubernetes/backend/templates/config-map.yaml  | 13 ++++
 kubernetes/backend/templates/deployment.yaml  | 44 +++++++++++++
 kubernetes/backend/templates/service.yaml     | 12 ++++
 kubernetes/cloudflare/main.tf                 | 57 ++++++++++++++++
 kubernetes/cloudflare/variables.tf            |  7 ++
 kubernetes/helm/main.tf                       | 16 +++++
 kubernetes/linode/main.tf                     | 47 +++++++++++++
 kubernetes/linode/output.tf                   | 24 +++++++
 kubernetes/linode/variables.tf                | 22 +++++++
 kubernetes/main.tf                            | 24 +++++++
 kubernetes/mariadb/Chart.yaml                 | 24 +++++++
 .../templates/deployment.yaml}                | 14 ----
 kubernetes/mariadb/templates/service.yaml     | 12 ++++
 kubernetes/mariadb/values.yaml                |  4 ++
 17 files changed, 388 insertions(+), 14 deletions(-)
 create mode 100644 kubernetes/.gitignore
 create mode 100644 kubernetes/.terraform.lock.hcl
 create mode 100644 kubernetes/backend/templates/config-map.yaml
 create mode 100644 kubernetes/backend/templates/deployment.yaml
 create mode 100644 kubernetes/backend/templates/service.yaml
 create mode 100644 kubernetes/cloudflare/main.tf
 create mode 100644 kubernetes/cloudflare/variables.tf
 create mode 100644 kubernetes/helm/main.tf
 create mode 100644 kubernetes/linode/main.tf
 create mode 100644 kubernetes/linode/output.tf
 create mode 100644 kubernetes/linode/variables.tf
 create mode 100644 kubernetes/main.tf
 create mode 100644 kubernetes/mariadb/Chart.yaml
 rename kubernetes/{mariadb.yaml => mariadb/templates/deployment.yaml} (83%)
 create mode 100644 kubernetes/mariadb/templates/service.yaml
 create mode 100644 kubernetes/mariadb/values.yaml

diff --git a/README.md b/README.md
index 8ed5c9b04..399d20a81 100644
--- a/README.md
+++ b/README.md
@@ -511,6 +511,19 @@ In order to setup continuous delivery via github:
 Cmnd_Alias RESTART_TORNADO = /usr/bin/systemctl restart tornado
 http ALL=(ALL) NOPASSWD: RESTART_TORNADO
 ``` 
+
+
+# Terraform
+ I'm hosting pychat with:
+ - Cloudflare as CDN and DNS (free of charge)
+ - Linode as Kubernetes provider (10$ per month of total for 1 instance of 2GB ram and 1vCPU)
+ - Letsencrypt as SSL certificate (free of charge)
+ - Domain address (you have to decide on your own )
+ 
+1. Go cloudflare and copy ZoneID and API token 
+ - Copy zoneID: Go to https://dash.cloudflare.com/ - create a new site (or use existing one) grab an API Zone ID and place it into `kubernetes/terraform.tfvars`
+ - Copy API token: go to https://dash.cloudflare.com/profile/api-tokens and create a new api token and place it into `kubernetes/terraform.tfvars`
+ - 
 # Kubernetes example with [linode](https://www.linode.com/).
 
 Minimal requirements: 
diff --git a/kubernetes/.gitignore b/kubernetes/.gitignore
new file mode 100644
index 000000000..76a546c2c
--- /dev/null
+++ b/kubernetes/.gitignore
@@ -0,0 +1,3 @@
+.terraform
+terraform.tfvars
+terraform.tfstate
diff --git a/kubernetes/.terraform.lock.hcl b/kubernetes/.terraform.lock.hcl
new file mode 100644
index 000000000..a94137a97
--- /dev/null
+++ b/kubernetes/.terraform.lock.hcl
@@ -0,0 +1,66 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/cloudflare/cloudflare" {
+  version     = "3.35.0"
+  constraints = "~> 3.0"
+  hashes = [
+    "h1:SFvdgX5bTGhOTMhywgjSOWlkET2el7STxdUSzxjz2pc=",
+    "zh:13aabc00fee823422831bcc870227650cc765fc4c9622074d24d6d62a4ac0e37",
+    "zh:1544405f0ea6b388dad7eb25c434427b2682417396da9186e1b33551e6b4adff",
+    "zh:5d58394cb8e71bd4bf6ef0135f1ca6a4ad2cec937f3731b224125eb34ee059f7",
+    "zh:648596ed545ed01ae757d5a0b37c20e8050cfb51d42e9a2c82fcc94d883ff11d",
+    "zh:68d75e14eef4f073faa975ed6baf4db7e0e1f2fc61a4e54fd95325df42793810",
+    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
+    "zh:9916cc626fef57428c4c60db7897b34068c65639b68482e94f62d97d773d64bc",
+    "zh:9c8c9f369eb30e7360a0ebd7918e4846ca4d5bca430b861fdbde7522a3146459",
+    "zh:a40e244688bbcb6f1a771e6ea89fb0b0b7bb53be3fab718abc66b3593e0f8133",
+    "zh:cc5a6191aa8713275550ff2b6adda6e6d56e4780c9cbe3d1da1dc23ea893bfff",
+    "zh:d1dd435780e8c7e79bff26b46a76df0e123971849355ad17877d1e24dc5953c3",
+    "zh:d751fc72f2833f2bdb897fa89de2bb5b6efbad1e648896642f0e6fe5cde789c8",
+    "zh:dfc4c90b3605ec1bb7cc7a9f1fb1b67235578bdd6b9be78e7b3516b55d0422db",
+    "zh:e6101a80fe24e2df3ab60152458ff1666a4a1befc87c62e459a219cdbb53e6df",
+    "zh:e9bcf26c44dd231f74703b6a6717470021a3ba7e1d7531dcf7287a6441300e27",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/helm" {
+  version     = "2.9.0"
+  constraints = ">= 1.3.2"
+  hashes = [
+    "h1:D5BLFN82WndhQZQleXE5rO0hUDnlyqb60XeUJKDhuo4=",
+    "zh:1471cb45908b426104687c962007b2980cfde294fa3530fabc4798ce9fb6c20c",
+    "zh:1572e9cec20591ec08ece797b3630802be816a5adde36ca91a93359f2430b130",
+    "zh:1b10ae03cf5ab1ae21ffaac2251de99797294ae4242b156b3b0beebbdbcb7e0f",
+    "zh:3bd043b68de967d8d0b549d3f71485193d81167d5656f5507d743dedfe60e352",
+    "zh:538911921c729185900176cc22eb8edcb822bc8d22b9ebb48103a1d9bb53cc38",
+    "zh:69a6a2d40c0463662c3fb1621e37a3ee65024ea4479adf4d5f7f19fb0dea48c2",
+    "zh:94b58daa0c351a49d01f6d8f1caae46c95c2d6c3f29753e2b9ea3e3c0e7c9ab4",
+    "zh:9d0543331a4a32241e1ab5457f30b41df745acb235a0391205c725a5311e4809",
+    "zh:a6789306524ca121512a95e873e3949b4175114a6c5db32bed2df2551a79368f",
+    "zh:d146b94cd9502cca7f2044797a328d71c7ec2a98e2d138270d8a28c872f04289",
+    "zh:d14ccd14511f0446eacf43a9243f22de7c1427ceb059cf67d7bf9803be2cb15d",
+    "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
+  ]
+}
+
+provider "registry.terraform.io/linode/linode" {
+  version = "2.2.0"
+  hashes = [
+    "h1:YG2urGW0CqbGwwayR+j1e25CEpVgm6D2wkIqg6zXxHw=",
+    "zh:0768aa158caa098c36627e012714a25610c2e8c15e828e18d2fc94557d8abdfa",
+    "zh:1a756c4e51a9c3fdb3eaa74b02358d266ea0635d061420386fbda1a55d6567e1",
+    "zh:48033efdfcfeaa84f50974cd1630c57f39a9a0fc7cc0f66b98d6ef9817d0ec86",
+    "zh:49ede702aba633f6f743fea0ba3ee638a161b83fc4d95d69f8019e2a9bb9d778",
+    "zh:588b9b22ec1de42565fecce5f7d27c3eeed975055189c755595af0e15aac67db",
+    "zh:69753dbb5f635838d18544225f39a6dd354dafdc9854a46a9c422e5d567e8d14",
+    "zh:9884aa8cd1104e5b133a0be4b147b864e3e50b44a370e0c7d7e57d78f0046590",
+    "zh:bee48eba86eb464e59a4da3a6b26e9f9b63b19fc02a3017bc6c92fd3f444cc01",
+    "zh:eb377f18f7bf848e260ac5ac46cf411d14bd883cb9929c30979bbb11c7ef41f5",
+    "zh:f2d3f7895786bd63ec5245d2ec4452b33a4d08852cca1f20da31e64215781f77",
+    "zh:f3f98cdb8ea01a1b50b33c84472304c9752ad92a0a7f8ad44b8f99578108f11b",
+    "zh:f51ae43429f903933d96da736fdc6817fbfebe483775f601a86abe7e26f8b20a",
+    "zh:fd089338fccdc9d34b273ad7ae5cb6f80d6066a07ca9f95e561dcd2a09990020",
+    "zh:ff79195c6bb06eef5883e9f120856578174c2c83dfb0bcb7ec26aa63aeb0d2bd",
+  ]
+}
diff --git a/kubernetes/backend/templates/config-map.yaml b/kubernetes/backend/templates/config-map.yaml
new file mode 100644
index 000000000..4ddbcce75
--- /dev/null
+++ b/kubernetes/backend/templates/config-map.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: config-map
+  namespace: pychat
+data:
+  MYSQL_PORT: '3306'
+  MYSQL_DATABASE: pychat
+  MYSQL_HOST: mariadb-service
+  REDIS_HOST: redis-service
+  REDIS_PORT: '6379'
+  APPLICATION_PORT: '8888'
+
diff --git a/kubernetes/backend/templates/deployment.yaml b/kubernetes/backend/templates/deployment.yaml
new file mode 100644
index 000000000..65955ff7e
--- /dev/null
+++ b/kubernetes/backend/templates/deployment.yaml
@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: backend-deployment
+  namespace: pychat
+  labels:
+    app: backend
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: backend
+  template:
+    metadata:
+      labels:
+        app: backend
+    spec:
+      containers:
+      - name: backend
+        # change this to IfNotPresent
+        imagePullPolicy: Always
+        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
+        ports:
+        - containerPort: 8888
+        readinessProbe:
+          httpGet:
+            path: /api/health
+            port: 8888
+        env:
+        - name: REDIS_PUBSUB
+          value: 'true'
+        envFrom:
+        - secretRef:
+            name: backend-secret
+        - configMapRef:
+            name: config-map
+        volumeMounts:
+          - mountPath: "/usr/src/newback/photos"
+            name: photo
+      volumes:
+        - name: photo
+          persistentVolumeClaim:
+            claimName: pvc-photo
+
diff --git a/kubernetes/backend/templates/service.yaml b/kubernetes/backend/templates/service.yaml
new file mode 100644
index 000000000..c5316ed32
--- /dev/null
+++ b/kubernetes/backend/templates/service.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: backend-service
+  namespace: pychat
+spec:
+  selector:
+    app: backend
+  ports:
+    - protocol: TCP
+      port: 8888
+      targetPort: 8888
diff --git a/kubernetes/cloudflare/main.tf b/kubernetes/cloudflare/main.tf
new file mode 100644
index 000000000..92244df9f
--- /dev/null
+++ b/kubernetes/cloudflare/main.tf
@@ -0,0 +1,57 @@
+terraform {
+  required_providers {
+    cloudflare = {
+      source  = "cloudflare/cloudflare"
+      version = "3.35.0"
+    }
+  }
+}
+
+
+provider "cloudflare" {
+  api_token = var.cloud_flare_api_token
+}
+
+resource "cloudflare_record" "server" {
+  zone_id = var.cloud_flare_zone_id
+  name    = var.domain_name
+  value   = var.ip_address
+  proxied = true // Cloudflare support websockets now
+  type    = "A"
+}
+
+resource "cloudflare_record" "master_pychat" {
+  name    = var.domain_name
+  proxied = false
+  ttl     = 1
+  type    = "A"
+  value   = var.ip_address
+  zone_id = var.cloud_flare_zone_id
+}
+
+resource "cloudflare_record" "static_pychat" {
+  name    = "static"
+  proxied = true
+  ttl     = 1
+  type    = "A"
+  value   =  var.ip_address
+  zone_id = var.cloud_flare_zone_id
+}
+
+resource "cloudflare_record" "www_pychat" {
+  name    = "www"
+  proxied = false
+  ttl     = 1
+  type    = "CNAME"
+  value   = var.domain_name
+  zone_id = var.cloud_flare_zone_id
+}
+
+resource "cloudflare_record" "postfix_pychat" {
+  name    = var.domain_name
+  proxied = false
+  ttl     = 1
+  type    = "TXT"
+  value   = "v=spf1 ip4:${var.ip_address}"
+  zone_id = var.cloud_flare_zone_id
+}
diff --git a/kubernetes/cloudflare/variables.tf b/kubernetes/cloudflare/variables.tf
new file mode 100644
index 000000000..e18a23785
--- /dev/null
+++ b/kubernetes/cloudflare/variables.tf
@@ -0,0 +1,7 @@
+variable "domain_name" {
+  default = "pychat.org"
+}
+
+variable "cloud_flare_zone_id" {}
+variable "cloud_flare_api_token" {}
+variable "ip_address" {}
diff --git a/kubernetes/helm/main.tf b/kubernetes/helm/main.tf
new file mode 100644
index 000000000..559aeb39e
--- /dev/null
+++ b/kubernetes/helm/main.tf
@@ -0,0 +1,16 @@
+terraform {
+  required_providers {
+    helm = {
+      version = "2.9.0"
+      source  = "hashicorp/helm"
+    }
+  }
+}
+
+variable "kubeconfig" {}
+
+provider "helm" {
+  kubernetes {
+    config_context = kubeconfig
+  }
+}
diff --git a/kubernetes/linode/main.tf b/kubernetes/linode/main.tf
new file mode 100644
index 000000000..164f1b11e
--- /dev/null
+++ b/kubernetes/linode/main.tf
@@ -0,0 +1,47 @@
+terraform {
+  required_providers {
+    linode = {
+      source = "linode/linode"
+      version = "2.2.0"
+    }
+  }
+}
+
+provider "linode" {
+  token = var.linode_token
+}
+
+resource "linode_lke_cluster" "pychat" {
+    k8s_version = var.k8s_version
+    label =  "pychat_1"
+    region = var.region
+
+    dynamic "pool" {
+        for_each = var.pools
+        content {
+            type  = pool.value["type"]
+            count = pool.value["count"]
+        }
+    }
+}
+
+data "linode_instances" "pychat_linode" {
+  filter {
+    name = "label"
+    values = ["pychat_1"]
+  }
+}
+
+
+
+
+
+resource "linode_instance" "pychat12" {
+    label = "pychat_1"
+    image = "linode/alpine3.17"
+    region = var.region
+    type = "g6-standard-1"
+    root_pass =  var.linode_instance_root_password
+}
+
+
diff --git a/kubernetes/linode/output.tf b/kubernetes/linode/output.tf
new file mode 100644
index 000000000..ab2f9fcff
--- /dev/null
+++ b/kubernetes/linode/output.tf
@@ -0,0 +1,24 @@
+output "ip_address" {
+  value = data.linode_instances.pychat_linode.instances.0.ip_address
+}
+
+output "kubeconfig" {
+  value = linode_lke_cluster.pychat.kubeconfig
+  sensitive = true
+}
+
+output "api_endpoints" {
+  value = linode_lke_cluster.pychat.api_endpoints
+}
+
+output "status" {
+  value = linode_lke_cluster.pychat.status
+}
+
+output "id" {
+  value = linode_lke_cluster.pychat.id
+}
+
+output "pool" {
+  value = linode_lke_cluster.pychat.pool
+}
diff --git a/kubernetes/linode/variables.tf b/kubernetes/linode/variables.tf
new file mode 100644
index 000000000..7d30ef5ad
--- /dev/null
+++ b/kubernetes/linode/variables.tf
@@ -0,0 +1,22 @@
+variable "linode_instance_root_password" {}
+variable "linode_token" {}
+variable "pools" {
+  description = "The Node Pool specifications for the Kubernetes cluster. (required)"
+  type = list(object({
+    type = string
+    count = number
+  }))
+  default = [
+    {
+      type = "g6-standard-1"
+      count = 1
+    }
+  ]
+}
+
+variable "k8s_version" {
+  default = "1.27"
+}
+variable "region" {
+  default = "eu-west"
+}
diff --git a/kubernetes/main.tf b/kubernetes/main.tf
new file mode 100644
index 000000000..e545de08f
--- /dev/null
+++ b/kubernetes/main.tf
@@ -0,0 +1,24 @@
+variable "linode_token" {}
+variable "cloud_flare_zone_id" {}
+variable "cloud_flare_api_token" {}
+variable "linode_instance_root_password" {}
+variable "domain_name" {}
+
+module "linode" {
+  source                  = "./linode"
+  linode_instance_root_password = var.linode_instance_root_password
+  linode_token = var.linode_token
+}
+
+module "storage_account_test" {
+  source                  = "./cloudflare"
+  cloud_flare_api_token = var.cloud_flare_api_token
+  cloud_flare_zone_id = var.cloud_flare_zone_id
+  domain_name = var.domain_name
+  ip_address = module.linode.ip_address
+}
+
+module "helm" {
+  source = "./helm"
+  kubeconfig = module.linode.kubeconfig
+}
diff --git a/kubernetes/mariadb/Chart.yaml b/kubernetes/mariadb/Chart.yaml
new file mode 100644
index 000000000..c700e89dc
--- /dev/null
+++ b/kubernetes/mariadb/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: backend
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
diff --git a/kubernetes/mariadb.yaml b/kubernetes/mariadb/templates/deployment.yaml
similarity index 83%
rename from kubernetes/mariadb.yaml
rename to kubernetes/mariadb/templates/deployment.yaml
index d11a8665f..ea9a6d285 100644
--- a/kubernetes/mariadb.yaml
+++ b/kubernetes/mariadb/templates/deployment.yaml
@@ -42,17 +42,3 @@ spec:
       - name: mariadb-data
         persistentVolumeClaim:
           claimName: pvc-mariadb
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mariadb-service
-  namespace: pychat
-spec:
-  selector:
-    app: mariadb
-  ports:
-    - protocol: TCP
-      port: 3306
-      targetPort: 3306
-
diff --git a/kubernetes/mariadb/templates/service.yaml b/kubernetes/mariadb/templates/service.yaml
new file mode 100644
index 000000000..ef502d66e
--- /dev/null
+++ b/kubernetes/mariadb/templates/service.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mariadb-service
+  namespace: pychat
+spec:
+  selector:
+    app: mariadb
+  ports:
+    - protocol: TCP
+      port: 3306
+      targetPort: 3306
diff --git a/kubernetes/mariadb/values.yaml b/kubernetes/mariadb/values.yaml
new file mode 100644
index 000000000..000d57af4
--- /dev/null
+++ b/kubernetes/mariadb/values.yaml
@@ -0,0 +1,4 @@
+image:
+  repository_path: deathangel908/pychat-backend
+  pullPolicy: Always
+  tag: "latest"

From f7ca058c604c43d0405aef1e5833f9b510076a7b Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 26 May 2023 20:04:08 +0300
Subject: [PATCH 171/221] Fixed terraform

---
 kubernetes/backend/Chart.yaml                      | 6 ++++++
 kubernetes/backend/values.yaml                     | 4 ++++
 kubernetes/{ => terraform}/.gitignore              | 0
 kubernetes/{ => terraform}/.terraform.lock.hcl     | 0
 kubernetes/{ => terraform}/cloudflare/main.tf      | 0
 kubernetes/{ => terraform}/cloudflare/variables.tf | 0
 kubernetes/{ => terraform}/helm/main.tf            | 0
 kubernetes/{ => terraform}/linode/main.tf          | 0
 kubernetes/{ => terraform}/linode/output.tf        | 0
 kubernetes/{ => terraform}/linode/variables.tf     | 0
 kubernetes/{ => terraform}/main.tf                 | 0
 11 files changed, 10 insertions(+)
 create mode 100644 kubernetes/backend/Chart.yaml
 create mode 100644 kubernetes/backend/values.yaml
 rename kubernetes/{ => terraform}/.gitignore (100%)
 rename kubernetes/{ => terraform}/.terraform.lock.hcl (100%)
 rename kubernetes/{ => terraform}/cloudflare/main.tf (100%)
 rename kubernetes/{ => terraform}/cloudflare/variables.tf (100%)
 rename kubernetes/{ => terraform}/helm/main.tf (100%)
 rename kubernetes/{ => terraform}/linode/main.tf (100%)
 rename kubernetes/{ => terraform}/linode/output.tf (100%)
 rename kubernetes/{ => terraform}/linode/variables.tf (100%)
 rename kubernetes/{ => terraform}/main.tf (100%)

diff --git a/kubernetes/backend/Chart.yaml b/kubernetes/backend/Chart.yaml
new file mode 100644
index 000000000..e7d0fd189
--- /dev/null
+++ b/kubernetes/backend/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: backend
+description: Python backend
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/backend/values.yaml b/kubernetes/backend/values.yaml
new file mode 100644
index 000000000..000d57af4
--- /dev/null
+++ b/kubernetes/backend/values.yaml
@@ -0,0 +1,4 @@
+image:
+  repository_path: deathangel908/pychat-backend
+  pullPolicy: Always
+  tag: "latest"
diff --git a/kubernetes/.gitignore b/kubernetes/terraform/.gitignore
similarity index 100%
rename from kubernetes/.gitignore
rename to kubernetes/terraform/.gitignore
diff --git a/kubernetes/.terraform.lock.hcl b/kubernetes/terraform/.terraform.lock.hcl
similarity index 100%
rename from kubernetes/.terraform.lock.hcl
rename to kubernetes/terraform/.terraform.lock.hcl
diff --git a/kubernetes/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
similarity index 100%
rename from kubernetes/cloudflare/main.tf
rename to kubernetes/terraform/cloudflare/main.tf
diff --git a/kubernetes/cloudflare/variables.tf b/kubernetes/terraform/cloudflare/variables.tf
similarity index 100%
rename from kubernetes/cloudflare/variables.tf
rename to kubernetes/terraform/cloudflare/variables.tf
diff --git a/kubernetes/helm/main.tf b/kubernetes/terraform/helm/main.tf
similarity index 100%
rename from kubernetes/helm/main.tf
rename to kubernetes/terraform/helm/main.tf
diff --git a/kubernetes/linode/main.tf b/kubernetes/terraform/linode/main.tf
similarity index 100%
rename from kubernetes/linode/main.tf
rename to kubernetes/terraform/linode/main.tf
diff --git a/kubernetes/linode/output.tf b/kubernetes/terraform/linode/output.tf
similarity index 100%
rename from kubernetes/linode/output.tf
rename to kubernetes/terraform/linode/output.tf
diff --git a/kubernetes/linode/variables.tf b/kubernetes/terraform/linode/variables.tf
similarity index 100%
rename from kubernetes/linode/variables.tf
rename to kubernetes/terraform/linode/variables.tf
diff --git a/kubernetes/main.tf b/kubernetes/terraform/main.tf
similarity index 100%
rename from kubernetes/main.tf
rename to kubernetes/terraform/main.tf

From 18c14b0d6f41e19eb41df8e8776302b735ef5a42 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 26 May 2023 20:49:15 +0300
Subject: [PATCH 172/221] moved more to helms

---
 kubernetes/backend.yaml                       |  57 --
 kubernetes/backend/values.yaml                |   4 -
 kubernetes/coturn.yaml                        | 864 ------------------
 kubernetes/mariadb/Chart.yaml                 |  24 -
 kubernetes/mariadb/values.yaml                |   4 -
 .../helm/charts}/backend/Chart.yaml           |   2 +-
 .../charts}/backend/templates/config-map.yaml |   0
 .../charts}/backend/templates/deployment.yaml |   3 +-
 .../charts/backend/templates/pv-photo.yaml    |  11 +
 .../charts/backend/templates/pvc-photo.yaml}  |  14 +-
 .../charts}/backend/templates/service.yaml    |   0
 .../terraform/helm/charts/backend/values.yaml |   6 +
 .../terraform/helm/charts/coturn/Chart.yaml   |   6 +
 .../charts/coturn/templates/deployment.yaml   |  34 +
 .../helm/charts/coturn/templates/service.yaml |  32 +
 .../terraform/helm/charts/coturn/values.yaml  |   2 +
 .../terraform/helm/charts/frontend/Chart.yaml |   6 +
 .../frontend/templates/deployment.yaml}       |  19 +-
 .../charts/frontend/templates/service.yaml    |  12 +
 .../terraform/helm/charts/mariadb/Chart.yaml  |   6 +
 .../charts}/mariadb/templates/deployment.yaml |   3 +-
 .../helm/charts/mariadb/templates/pv.yaml     |  11 +
 .../helm/charts/mariadb/templates/pvc.yaml}   |  14 +-
 .../charts}/mariadb/templates/service.yaml    |   0
 .../terraform/helm/charts/mariadb/values.yaml |   2 +
 .../terraform/helm/charts/redis/Chart.yaml    |   6 +
 .../charts/redis/templates/deployment.yaml}   |  14 -
 .../helm/charts/redis/templates/pv.yaml       |  11 +
 .../helm/charts/redis/templates/pvc.yaml}     |  12 -
 .../helm/charts/redis/templates/service.yaml  |  12 +
 .../terraform/helm/charts/redis/values.yaml   |   2 +
 kubernetes/terraform/helm/main.tf             |   7 +-
 kubernetes/terraform/main.tf                  |   2 +-
 33 files changed, 174 insertions(+), 1028 deletions(-)
 delete mode 100644 kubernetes/backend.yaml
 delete mode 100644 kubernetes/backend/values.yaml
 delete mode 100644 kubernetes/mariadb/Chart.yaml
 delete mode 100644 kubernetes/mariadb/values.yaml
 rename kubernetes/{ => terraform/helm/charts}/backend/Chart.yaml (74%)
 rename kubernetes/{ => terraform/helm/charts}/backend/templates/config-map.yaml (100%)
 rename kubernetes/{ => terraform/helm/charts}/backend/templates/deployment.yaml (92%)
 create mode 100644 kubernetes/terraform/helm/charts/backend/templates/pv-photo.yaml
 rename kubernetes/{pv-photo.yaml => terraform/helm/charts/backend/templates/pvc-photo.yaml} (57%)
 rename kubernetes/{ => terraform/helm/charts}/backend/templates/service.yaml (100%)
 create mode 100644 kubernetes/terraform/helm/charts/backend/values.yaml
 create mode 100644 kubernetes/terraform/helm/charts/coturn/Chart.yaml
 create mode 100644 kubernetes/terraform/helm/charts/coturn/templates/deployment.yaml
 create mode 100644 kubernetes/terraform/helm/charts/coturn/templates/service.yaml
 create mode 100644 kubernetes/terraform/helm/charts/coturn/values.yaml
 create mode 100644 kubernetes/terraform/helm/charts/frontend/Chart.yaml
 rename kubernetes/{frontend.yaml => terraform/helm/charts/frontend/templates/deployment.yaml} (66%)
 create mode 100644 kubernetes/terraform/helm/charts/frontend/templates/service.yaml
 create mode 100644 kubernetes/terraform/helm/charts/mariadb/Chart.yaml
 rename kubernetes/{ => terraform/helm/charts}/mariadb/templates/deployment.yaml (89%)
 create mode 100644 kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
 rename kubernetes/{pv-mariadb.yaml => terraform/helm/charts/mariadb/templates/pvc.yaml} (60%)
 rename kubernetes/{ => terraform/helm/charts}/mariadb/templates/service.yaml (100%)
 create mode 100644 kubernetes/terraform/helm/charts/mariadb/values.yaml
 create mode 100644 kubernetes/terraform/helm/charts/redis/Chart.yaml
 rename kubernetes/{redis.yaml => terraform/helm/charts/redis/templates/deployment.yaml} (74%)
 create mode 100644 kubernetes/terraform/helm/charts/redis/templates/pv.yaml
 rename kubernetes/{pv-redis.yaml => terraform/helm/charts/redis/templates/pvc.yaml} (64%)
 create mode 100644 kubernetes/terraform/helm/charts/redis/templates/service.yaml
 create mode 100644 kubernetes/terraform/helm/charts/redis/values.yaml

diff --git a/kubernetes/backend.yaml b/kubernetes/backend.yaml
deleted file mode 100644
index 08ccfe8dd..000000000
--- a/kubernetes/backend.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: backend-deployment
-  namespace: pychat
-  labels:
-    app: backend
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: backend
-  template:
-    metadata:
-      labels:
-        app: backend
-    spec:
-      containers:
-      - name: backend
-        # change this to IfNotPresent
-        imagePullPolicy: Always
-        image: deathangel908/pychat-backend
-        ports:
-        - containerPort: 8888
-        readinessProbe:
-          httpGet:
-            path: /api/health
-            port: 8888
-        env:
-        - name: REDIS_PUBSUB
-          value: 'true'
-        envFrom:
-        - secretRef:
-            name: backend-secret
-        - configMapRef:
-            name: config-map
-        volumeMounts:
-          - mountPath: "/usr/src/newback/photos"
-            name: photo
-      volumes:
-        - name: photo
-          persistentVolumeClaim:
-            claimName: pvc-photo
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: backend-service
-  namespace: pychat
-spec:
-  selector:
-    app: backend
-  ports:
-    - protocol: TCP
-      port: 8888
-      targetPort: 8888
-
diff --git a/kubernetes/backend/values.yaml b/kubernetes/backend/values.yaml
deleted file mode 100644
index 000d57af4..000000000
--- a/kubernetes/backend/values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-image:
-  repository_path: deathangel908/pychat-backend
-  pullPolicy: Always
-  tag: "latest"
diff --git a/kubernetes/coturn.yaml b/kubernetes/coturn.yaml
index 9bf53cf1c..e69de29bb 100644
--- a/kubernetes/coturn.yaml
+++ b/kubernetes/coturn.yaml
@@ -1,864 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: coturn-deployment
-  namespace: pychat
-  labels:
-    app: coturn
-spec:
-  selector:
-    matchLabels:
-      app: coturn
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: coturn
-    spec:
-      volumes:
-        - name: pychat-coturn-tls
-          secret:
-            secretName: pychat-tls
-            items:
-              - key: tls.crt
-                path: crt.pem
-              - key: tls.key
-                path: key.pem
-      containers:
-        - name: coturn
-          imagePullPolicy: Always
-          image: deathangel908/pychat-coturn
-          volumeMounts:
-          - name: pychat-coturn-tls
-            mountPath: "/etc/tls"
-            readOnly: true
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: coturn-service
-  namespace: pychat
-spec:
-  selector:
-    app: coturn
-  ports:
-    - protocol: TCP
-      name: coturn-main-port-tcp
-      port: 5349
-      targetPort: 5349
-    - protocol: TCP
-      port: 3478
-      name: coturn-secondary-port-tcp
-      targetPort: 3478
-    - protocol: UDP
-      port: 5349
-      name: coturn-main-port-udp
-      targetPort: 5349
-    - protocol: UDP
-      port: 3478
-      name: coturn-secondary-port-udp
-      targetPort: 3478
-    - protocol: UDP
-      port: 49152
-      name: coturn-udp-49152
-      targetPort: 49152
-    - protocol: UDP
-      port: 49153
-      name: coturn-udp-49153
-      targetPort: 49153
-    - protocol: UDP
-      port: 49154
-      name: coturn-udp-49154
-      targetPort: 49154
-    - protocol: UDP
-      port: 49155
-      name: coturn-udp-49155
-      targetPort: 49155
-    - protocol: UDP
-      port: 49156
-      name: coturn-udp-49156
-      targetPort: 49156
-    - protocol: UDP
-      port: 49157
-      name: coturn-udp-49157
-      targetPort: 49157
-    - protocol: UDP
-      port: 49158
-      name: coturn-udp-49158
-      targetPort: 49158
-    - protocol: UDP
-      port: 49159
-      name: coturn-udp-49159
-      targetPort: 49159
-    - protocol: UDP
-      port: 49160
-      name: coturn-udp-49160
-      targetPort: 49160
-    - protocol: UDP
-      port: 49161
-      name: coturn-udp-49161
-      targetPort: 49161
-    - protocol: UDP
-      port: 49162
-      name: coturn-udp-49162
-      targetPort: 49162
-    - protocol: UDP
-      port: 49163
-      name: coturn-udp-49163
-      targetPort: 49163
-    - protocol: UDP
-      port: 49164
-      name: coturn-udp-49164
-      targetPort: 49164
-    - protocol: UDP
-      port: 49165
-      name: coturn-udp-49165
-      targetPort: 49165
-    - protocol: UDP
-      port: 49166
-      name: coturn-udp-49166
-      targetPort: 49166
-    - protocol: UDP
-      port: 49167
-      name: coturn-udp-49167
-      targetPort: 49167
-    - protocol: UDP
-      port: 49168
-      name: coturn-udp-49168
-      targetPort: 49168
-    - protocol: UDP
-      port: 49169
-      name: coturn-udp-49169
-      targetPort: 49169
-    - protocol: UDP
-      port: 49170
-      name: coturn-udp-49170
-      targetPort: 49170
-    - protocol: UDP
-      port: 49171
-      name: coturn-udp-49171
-      targetPort: 49171
-    - protocol: UDP
-      port: 49172
-      name: coturn-udp-49172
-      targetPort: 49172
-    - protocol: UDP
-      port: 49173
-      name: coturn-udp-49173
-      targetPort: 49173
-    - protocol: UDP
-      port: 49174
-      name: coturn-udp-49174
-      targetPort: 49174
-    - protocol: UDP
-      port: 49175
-      name: coturn-udp-49175
-      targetPort: 49175
-    - protocol: UDP
-      port: 49176
-      name: coturn-udp-49176
-      targetPort: 49176
-    - protocol: UDP
-      port: 49177
-      name: coturn-udp-49177
-      targetPort: 49177
-    - protocol: UDP
-      port: 49178
-      name: coturn-udp-49178
-      targetPort: 49178
-    - protocol: UDP
-      port: 49179
-      name: coturn-udp-49179
-      targetPort: 49179
-    - protocol: UDP
-      port: 49180
-      name: coturn-udp-49180
-      targetPort: 49180
-    - protocol: UDP
-      port: 49181
-      name: coturn-udp-49181
-      targetPort: 49181
-    - protocol: UDP
-      port: 49182
-      name: coturn-udp-49182
-      targetPort: 49182
-    - protocol: UDP
-      port: 49183
-      name: coturn-udp-49183
-      targetPort: 49183
-    - protocol: UDP
-      port: 49184
-      name: coturn-udp-49184
-      targetPort: 49184
-    - protocol: UDP
-      port: 49185
-      name: coturn-udp-49185
-      targetPort: 49185
-    - protocol: UDP
-      port: 49186
-      name: coturn-udp-49186
-      targetPort: 49186
-    - protocol: UDP
-      port: 49187
-      name: coturn-udp-49187
-      targetPort: 49187
-    - protocol: UDP
-      port: 49188
-      name: coturn-udp-49188
-      targetPort: 49188
-    - protocol: UDP
-      port: 49189
-      name: coturn-udp-49189
-      targetPort: 49189
-    - protocol: UDP
-      port: 49190
-      name: coturn-udp-49190
-      targetPort: 49190
-    - protocol: UDP
-      port: 49191
-      name: coturn-udp-49191
-      targetPort: 49191
-    - protocol: UDP
-      port: 49192
-      name: coturn-udp-49192
-      targetPort: 49192
-    - protocol: UDP
-      port: 49193
-      name: coturn-udp-49193
-      targetPort: 49193
-    - protocol: UDP
-      port: 49194
-      name: coturn-udp-49194
-      targetPort: 49194
-    - protocol: UDP
-      port: 49195
-      name: coturn-udp-49195
-      targetPort: 49195
-    - protocol: UDP
-      port: 49196
-      name: coturn-udp-49196
-      targetPort: 49196
-    - protocol: UDP
-      port: 49197
-      name: coturn-udp-49197
-      targetPort: 49197
-    - protocol: UDP
-      port: 49198
-      name: coturn-udp-49198
-      targetPort: 49198
-    - protocol: UDP
-      port: 49199
-      name: coturn-udp-49199
-      targetPort: 49199
-    - protocol: UDP
-      port: 49200
-      name: coturn-udp-49200
-      targetPort: 49200
-    - protocol: UDP
-      port: 49201
-      name: coturn-udp-49201
-      targetPort: 49201
-    - protocol: UDP
-      port: 49202
-      name: coturn-udp-49202
-      targetPort: 49202
-    - protocol: UDP
-      port: 49203
-      name: coturn-udp-49203
-      targetPort: 49203
-    - protocol: UDP
-      port: 49204
-      name: coturn-udp-49204
-      targetPort: 49204
-    - protocol: UDP
-      port: 49205
-      name: coturn-udp-49205
-      targetPort: 49205
-    - protocol: UDP
-      port: 49206
-      name: coturn-udp-49206
-      targetPort: 49206
-    - protocol: UDP
-      port: 49207
-      name: coturn-udp-49207
-      targetPort: 49207
-    - protocol: UDP
-      port: 49208
-      name: coturn-udp-49208
-      targetPort: 49208
-    - protocol: UDP
-      port: 49209
-      name: coturn-udp-49209
-      targetPort: 49209
-    - protocol: UDP
-      port: 49210
-      name: coturn-udp-49210
-      targetPort: 49210
-    - protocol: UDP
-      port: 49211
-      name: coturn-udp-49211
-      targetPort: 49211
-    - protocol: UDP
-      port: 49212
-      name: coturn-udp-49212
-      targetPort: 49212
-    - protocol: UDP
-      port: 49213
-      name: coturn-udp-49213
-      targetPort: 49213
-    - protocol: UDP
-      port: 49214
-      name: coturn-udp-49214
-      targetPort: 49214
-    - protocol: UDP
-      port: 49215
-      name: coturn-udp-49215
-      targetPort: 49215
-    - protocol: UDP
-      port: 49216
-      name: coturn-udp-49216
-      targetPort: 49216
-    - protocol: UDP
-      port: 49217
-      name: coturn-udp-49217
-      targetPort: 49217
-    - protocol: UDP
-      port: 49218
-      name: coturn-udp-49218
-      targetPort: 49218
-    - protocol: UDP
-      port: 49219
-      name: coturn-udp-49219
-      targetPort: 49219
-    - protocol: UDP
-      port: 49220
-      name: coturn-udp-49220
-      targetPort: 49220
-    - protocol: UDP
-      port: 49221
-      name: coturn-udp-49221
-      targetPort: 49221
-    - protocol: UDP
-      port: 49222
-      name: coturn-udp-49222
-      targetPort: 49222
-    - protocol: UDP
-      port: 49223
-      name: coturn-udp-49223
-      targetPort: 49223
-    - protocol: UDP
-      port: 49224
-      name: coturn-udp-49224
-      targetPort: 49224
-    - protocol: UDP
-      port: 49225
-      name: coturn-udp-49225
-      targetPort: 49225
-    - protocol: UDP
-      port: 49226
-      name: coturn-udp-49226
-      targetPort: 49226
-    - protocol: UDP
-      port: 49227
-      name: coturn-udp-49227
-      targetPort: 49227
-    - protocol: UDP
-      port: 49228
-      name: coturn-udp-49228
-      targetPort: 49228
-    - protocol: UDP
-      port: 49229
-      name: coturn-udp-49229
-      targetPort: 49229
-    - protocol: UDP
-      port: 49230
-      name: coturn-udp-49230
-      targetPort: 49230
-    - protocol: UDP
-      port: 49231
-      name: coturn-udp-49231
-      targetPort: 49231
-    - protocol: UDP
-      port: 49232
-      name: coturn-udp-49232
-      targetPort: 49232
-    - protocol: UDP
-      port: 49233
-      name: coturn-udp-49233
-      targetPort: 49233
-    - protocol: UDP
-      port: 49234
-      name: coturn-udp-49234
-      targetPort: 49234
-    - protocol: UDP
-      port: 49235
-      name: coturn-udp-49235
-      targetPort: 49235
-    - protocol: UDP
-      port: 49236
-      name: coturn-udp-49236
-      targetPort: 49236
-    - protocol: UDP
-      port: 49237
-      name: coturn-udp-49237
-      targetPort: 49237
-    - protocol: UDP
-      port: 49238
-      name: coturn-udp-49238
-      targetPort: 49238
-    - protocol: UDP
-      port: 49239
-      name: coturn-udp-49239
-      targetPort: 49239
-    - protocol: UDP
-      port: 49240
-      name: coturn-udp-49240
-      targetPort: 49240
-    - protocol: UDP
-      port: 49241
-      name: coturn-udp-49241
-      targetPort: 49241
-    - protocol: UDP
-      port: 49242
-      name: coturn-udp-49242
-      targetPort: 49242
-    - protocol: UDP
-      port: 49243
-      name: coturn-udp-49243
-      targetPort: 49243
-    - protocol: UDP
-      port: 49244
-      name: coturn-udp-49244
-      targetPort: 49244
-    - protocol: UDP
-      port: 49245
-      name: coturn-udp-49245
-      targetPort: 49245
-    - protocol: UDP
-      port: 49246
-      name: coturn-udp-49246
-      targetPort: 49246
-    - protocol: UDP
-      port: 49247
-      name: coturn-udp-49247
-      targetPort: 49247
-    - protocol: UDP
-      port: 49248
-      name: coturn-udp-49248
-      targetPort: 49248
-    - protocol: UDP
-      port: 49249
-      name: coturn-udp-49249
-      targetPort: 49249
-    - protocol: UDP
-      port: 49250
-      name: coturn-udp-49250
-      targetPort: 49250
-    - protocol: UDP
-      port: 49251
-      name: coturn-udp-49251
-      targetPort: 49251
-    - protocol: UDP
-      port: 49252
-      name: coturn-udp-49252
-      targetPort: 49252
-    - protocol: UDP
-      port: 49253
-      name: coturn-udp-49253
-      targetPort: 49253
-    - protocol: UDP
-      port: 49254
-      name: coturn-udp-49254
-      targetPort: 49254
-    - protocol: UDP
-      port: 49255
-      name: coturn-udp-49255
-      targetPort: 49255
-    - protocol: UDP
-      port: 49256
-      name: coturn-udp-49256
-      targetPort: 49256
-    - protocol: UDP
-      port: 49257
-      name: coturn-udp-49257
-      targetPort: 49257
-    - protocol: UDP
-      port: 49258
-      name: coturn-udp-49258
-      targetPort: 49258
-    - protocol: UDP
-      port: 49259
-      name: coturn-udp-49259
-      targetPort: 49259
-    - protocol: UDP
-      port: 49260
-      name: coturn-udp-49260
-      targetPort: 49260
-    - protocol: UDP
-      port: 49261
-      name: coturn-udp-49261
-      targetPort: 49261
-    - protocol: UDP
-      port: 49262
-      name: coturn-udp-49262
-      targetPort: 49262
-    - protocol: UDP
-      port: 49263
-      name: coturn-udp-49263
-      targetPort: 49263
-    - protocol: UDP
-      port: 49264
-      name: coturn-udp-49264
-      targetPort: 49264
-    - protocol: UDP
-      port: 49265
-      name: coturn-udp-49265
-      targetPort: 49265
-    - protocol: UDP
-      port: 49266
-      name: coturn-udp-49266
-      targetPort: 49266
-    - protocol: UDP
-      port: 49267
-      name: coturn-udp-49267
-      targetPort: 49267
-    - protocol: UDP
-      port: 49268
-      name: coturn-udp-49268
-      targetPort: 49268
-    - protocol: UDP
-      port: 49269
-      name: coturn-udp-49269
-      targetPort: 49269
-    - protocol: UDP
-      port: 49270
-      name: coturn-udp-49270
-      targetPort: 49270
-    - protocol: UDP
-      port: 49271
-      name: coturn-udp-49271
-      targetPort: 49271
-    - protocol: UDP
-      port: 49272
-      name: coturn-udp-49272
-      targetPort: 49272
-    - protocol: UDP
-      port: 49273
-      name: coturn-udp-49273
-      targetPort: 49273
-    - protocol: UDP
-      port: 49274
-      name: coturn-udp-49274
-      targetPort: 49274
-    - protocol: UDP
-      port: 49275
-      name: coturn-udp-49275
-      targetPort: 49275
-    - protocol: UDP
-      port: 49276
-      name: coturn-udp-49276
-      targetPort: 49276
-    - protocol: UDP
-      port: 49277
-      name: coturn-udp-49277
-      targetPort: 49277
-    - protocol: UDP
-      port: 49278
-      name: coturn-udp-49278
-      targetPort: 49278
-    - protocol: UDP
-      port: 49279
-      name: coturn-udp-49279
-      targetPort: 49279
-    - protocol: UDP
-      port: 49280
-      name: coturn-udp-49280
-      targetPort: 49280
-    - protocol: UDP
-      port: 49281
-      name: coturn-udp-49281
-      targetPort: 49281
-    - protocol: UDP
-      port: 49282
-      name: coturn-udp-49282
-      targetPort: 49282
-    - protocol: UDP
-      port: 49283
-      name: coturn-udp-49283
-      targetPort: 49283
-    - protocol: UDP
-      port: 49284
-      name: coturn-udp-49284
-      targetPort: 49284
-    - protocol: UDP
-      port: 49285
-      name: coturn-udp-49285
-      targetPort: 49285
-    - protocol: UDP
-      port: 49286
-      name: coturn-udp-49286
-      targetPort: 49286
-    - protocol: UDP
-      port: 49287
-      name: coturn-udp-49287
-      targetPort: 49287
-    - protocol: UDP
-      port: 49288
-      name: coturn-udp-49288
-      targetPort: 49288
-    - protocol: UDP
-      port: 49289
-      name: coturn-udp-49289
-      targetPort: 49289
-    - protocol: UDP
-      port: 49290
-      name: coturn-udp-49290
-      targetPort: 49290
-    - protocol: UDP
-      port: 49291
-      name: coturn-udp-49291
-      targetPort: 49291
-    - protocol: UDP
-      port: 49292
-      name: coturn-udp-49292
-      targetPort: 49292
-    - protocol: UDP
-      port: 49293
-      name: coturn-udp-49293
-      targetPort: 49293
-    - protocol: UDP
-      port: 49294
-      name: coturn-udp-49294
-      targetPort: 49294
-    - protocol: UDP
-      port: 49295
-      name: coturn-udp-49295
-      targetPort: 49295
-    - protocol: UDP
-      port: 49296
-      name: coturn-udp-49296
-      targetPort: 49296
-    - protocol: UDP
-      port: 49297
-      name: coturn-udp-49297
-      targetPort: 49297
-    - protocol: UDP
-      port: 49298
-      name: coturn-udp-49298
-      targetPort: 49298
-    - protocol: UDP
-      port: 49299
-      name: coturn-udp-49299
-      targetPort: 49299
-    - protocol: UDP
-      port: 49300
-      name: coturn-udp-49300
-      targetPort: 49300
-    - protocol: UDP
-      port: 49301
-      name: coturn-udp-49301
-      targetPort: 49301
-    - protocol: UDP
-      port: 49302
-      name: coturn-udp-49302
-      targetPort: 49302
-    - protocol: UDP
-      port: 49303
-      name: coturn-udp-49303
-      targetPort: 49303
-    - protocol: UDP
-      port: 49304
-      name: coturn-udp-49304
-      targetPort: 49304
-    - protocol: UDP
-      port: 49305
-      name: coturn-udp-49305
-      targetPort: 49305
-    - protocol: UDP
-      port: 49306
-      name: coturn-udp-49306
-      targetPort: 49306
-    - protocol: UDP
-      port: 49307
-      name: coturn-udp-49307
-      targetPort: 49307
-    - protocol: UDP
-      port: 49308
-      name: coturn-udp-49308
-      targetPort: 49308
-    - protocol: UDP
-      port: 49309
-      name: coturn-udp-49309
-      targetPort: 49309
-    - protocol: UDP
-      port: 49310
-      name: coturn-udp-49310
-      targetPort: 49310
-    - protocol: UDP
-      port: 49311
-      name: coturn-udp-49311
-      targetPort: 49311
-    - protocol: UDP
-      port: 49312
-      name: coturn-udp-49312
-      targetPort: 49312
-    - protocol: UDP
-      port: 49313
-      name: coturn-udp-49313
-      targetPort: 49313
-    - protocol: UDP
-      port: 49314
-      name: coturn-udp-49314
-      targetPort: 49314
-    - protocol: UDP
-      port: 49315
-      name: coturn-udp-49315
-      targetPort: 49315
-    - protocol: UDP
-      port: 49316
-      name: coturn-udp-49316
-      targetPort: 49316
-    - protocol: UDP
-      port: 49317
-      name: coturn-udp-49317
-      targetPort: 49317
-    - protocol: UDP
-      port: 49318
-      name: coturn-udp-49318
-      targetPort: 49318
-    - protocol: UDP
-      port: 49319
-      name: coturn-udp-49319
-      targetPort: 49319
-    - protocol: UDP
-      port: 49320
-      name: coturn-udp-49320
-      targetPort: 49320
-    - protocol: UDP
-      port: 49321
-      name: coturn-udp-49321
-      targetPort: 49321
-    - protocol: UDP
-      port: 49322
-      name: coturn-udp-49322
-      targetPort: 49322
-    - protocol: UDP
-      port: 49323
-      name: coturn-udp-49323
-      targetPort: 49323
-    - protocol: UDP
-      port: 49324
-      name: coturn-udp-49324
-      targetPort: 49324
-    - protocol: UDP
-      port: 49325
-      name: coturn-udp-49325
-      targetPort: 49325
-    - protocol: UDP
-      port: 49326
-      name: coturn-udp-49326
-      targetPort: 49326
-    - protocol: UDP
-      port: 49327
-      name: coturn-udp-49327
-      targetPort: 49327
-    - protocol: UDP
-      port: 49328
-      name: coturn-udp-49328
-      targetPort: 49328
-    - protocol: UDP
-      port: 49329
-      name: coturn-udp-49329
-      targetPort: 49329
-    - protocol: UDP
-      port: 49330
-      name: coturn-udp-49330
-      targetPort: 49330
-    - protocol: UDP
-      port: 49331
-      name: coturn-udp-49331
-      targetPort: 49331
-    - protocol: UDP
-      port: 49332
-      name: coturn-udp-49332
-      targetPort: 49332
-    - protocol: UDP
-      port: 49333
-      name: coturn-udp-49333
-      targetPort: 49333
-    - protocol: UDP
-      port: 49334
-      name: coturn-udp-49334
-      targetPort: 49334
-    - protocol: UDP
-      port: 49335
-      name: coturn-udp-49335
-      targetPort: 49335
-    - protocol: UDP
-      port: 49336
-      name: coturn-udp-49336
-      targetPort: 49336
-    - protocol: UDP
-      port: 49337
-      name: coturn-udp-49337
-      targetPort: 49337
-    - protocol: UDP
-      port: 49338
-      name: coturn-udp-49338
-      targetPort: 49338
-    - protocol: UDP
-      port: 49339
-      name: coturn-udp-49339
-      targetPort: 49339
-    - protocol: UDP
-      port: 49340
-      name: coturn-udp-49340
-      targetPort: 49340
-    - protocol: UDP
-      port: 49341
-      name: coturn-udp-49341
-      targetPort: 49341
-    - protocol: UDP
-      port: 49342
-      name: coturn-udp-49342
-      targetPort: 49342
-    - protocol: UDP
-      port: 49343
-      name: coturn-udp-49343
-      targetPort: 49343
-    - protocol: UDP
-      port: 49344
-      name: coturn-udp-49344
-      targetPort: 49344
-    - protocol: UDP
-      port: 49345
-      name: coturn-udp-49345
-      targetPort: 49345
-    - protocol: UDP
-      port: 49346
-      name: coturn-udp-49346
-      targetPort: 49346
-    - protocol: UDP
-      port: 49347
-      name: coturn-udp-49347
-      targetPort: 49347
-    - protocol: UDP
-      port: 49348
-      name: coturn-udp-49348
-      targetPort: 49348
-    - protocol: UDP
-      port: 49349
-      name: coturn-udp-49349
-      targetPort: 49349
-    - protocol: UDP
-      port: 49350
-      name: coturn-udp-49350
-      targetPort: 49350
-    - protocol: UDP
-      port: 49351
-      name: coturn-udp-49351
-      targetPort: 49351
-    - protocol: UDP
-      port: 49352
-      name: coturn-udp-49352
-      targetPort: 49352
diff --git a/kubernetes/mariadb/Chart.yaml b/kubernetes/mariadb/Chart.yaml
deleted file mode 100644
index c700e89dc..000000000
--- a/kubernetes/mariadb/Chart.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v2
-name: backend
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
diff --git a/kubernetes/mariadb/values.yaml b/kubernetes/mariadb/values.yaml
deleted file mode 100644
index 000d57af4..000000000
--- a/kubernetes/mariadb/values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-image:
-  repository_path: deathangel908/pychat-backend
-  pullPolicy: Always
-  tag: "latest"
diff --git a/kubernetes/backend/Chart.yaml b/kubernetes/terraform/helm/charts/backend/Chart.yaml
similarity index 74%
rename from kubernetes/backend/Chart.yaml
rename to kubernetes/terraform/helm/charts/backend/Chart.yaml
index e7d0fd189..31106be13 100644
--- a/kubernetes/backend/Chart.yaml
+++ b/kubernetes/terraform/helm/charts/backend/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: backend
-description: Python backend
+description: python backend
 type: application
 version: 0.1.0
 appVersion: "1.16.0"
diff --git a/kubernetes/backend/templates/config-map.yaml b/kubernetes/terraform/helm/charts/backend/templates/config-map.yaml
similarity index 100%
rename from kubernetes/backend/templates/config-map.yaml
rename to kubernetes/terraform/helm/charts/backend/templates/config-map.yaml
diff --git a/kubernetes/backend/templates/deployment.yaml b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
similarity index 92%
rename from kubernetes/backend/templates/deployment.yaml
rename to kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
index 65955ff7e..2d27a0839 100644
--- a/kubernetes/backend/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
@@ -17,8 +17,7 @@ spec:
     spec:
       containers:
       - name: backend
-        # change this to IfNotPresent
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
         ports:
         - containerPort: 8888
diff --git a/kubernetes/terraform/helm/charts/backend/templates/pv-photo.yaml b/kubernetes/terraform/helm/charts/backend/templates/pv-photo.yaml
new file mode 100644
index 000000000..c78a78b4f
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backend/templates/pv-photo.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-photo
+spec:
+  accessModes:
+    - ReadWriteMany
+  capacity:
+    storage: {{ .Values.disk.photo_size }}
+  hostPath:
+    path: /data/backup/backend/photos
diff --git a/kubernetes/pv-photo.yaml b/kubernetes/terraform/helm/charts/backend/templates/pvc-photo.yaml
similarity index 57%
rename from kubernetes/pv-photo.yaml
rename to kubernetes/terraform/helm/charts/backend/templates/pvc-photo.yaml
index 7feff77c8..de252eaa1 100644
--- a/kubernetes/pv-photo.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/pvc-photo.yaml
@@ -1,16 +1,4 @@
 apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-photo
-spec:
-  accessModes:
-    - ReadWriteMany
-  capacity:
-    storage: 15Gi
-  hostPath:
-    path: /data/backup/backend/photos
----
-apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: pvc-photo
@@ -20,6 +8,6 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: 15Gi
+      storage: {{ .Values.disk.photo_size }}
   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
   volumeName: pv-photo
diff --git a/kubernetes/backend/templates/service.yaml b/kubernetes/terraform/helm/charts/backend/templates/service.yaml
similarity index 100%
rename from kubernetes/backend/templates/service.yaml
rename to kubernetes/terraform/helm/charts/backend/templates/service.yaml
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
new file mode 100644
index 000000000..1b8d1a7db
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -0,0 +1,6 @@
+image:
+  repository_path: deathangel908/pychat-backend
+  pullPolicy: Always # change to IfNotPresent for minikube
+  tag: "latest"
+disk:
+  photo_size: "15Gi"
diff --git a/kubernetes/terraform/helm/charts/coturn/Chart.yaml b/kubernetes/terraform/helm/charts/coturn/Chart.yaml
new file mode 100644
index 000000000..78e8a2f64
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/coturn/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: mariadb
+description: coturn sip server
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/terraform/helm/charts/coturn/templates/deployment.yaml b/kubernetes/terraform/helm/charts/coturn/templates/deployment.yaml
new file mode 100644
index 000000000..07cb28655
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/coturn/templates/deployment.yaml
@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: coturn-deployment
+  namespace: pychat
+  labels:
+    app: coturn
+spec:
+  selector:
+    matchLabels:
+      app: coturn
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: coturn
+    spec:
+      volumes:
+        - name: pychat-coturn-tls
+          secret:
+            secretName: pychat-tls
+            items:
+              - key: tls.crt
+                path: crt.pem
+              - key: tls.key
+                path: key.pem
+      containers:
+        - name: coturn
+          imagePullPolicy: Always
+          image: deathangel908/pychat-coturn
+          volumeMounts:
+          - name: pychat-coturn-tls
+            mountPath: "/etc/tls"
+            readOnly: true
diff --git a/kubernetes/terraform/helm/charts/coturn/templates/service.yaml b/kubernetes/terraform/helm/charts/coturn/templates/service.yaml
new file mode 100644
index 000000000..f69aca289
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/coturn/templates/service.yaml
@@ -0,0 +1,32 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: coturn-service
+  namespace: pychat
+spec:
+  selector:
+    app: coturn
+  ports:
+    - protocol: TCP
+      name: coturn-main-port-tcp
+      port: 5349
+      targetPort: 5349
+    - protocol: TCP
+      port: 3478
+      name: coturn-secondary-port-tcp
+      targetPort: 3478
+    - protocol: UDP
+      port: 5349
+      name: coturn-main-port-udp
+      targetPort: 5349
+    - protocol: UDP
+      port: 3478
+      name: coturn-secondary-port-udp
+      targetPort: 3478
+    {{ $portGen:= untilStep (.Values.udp_port_range_start | int) ( .Values.udp_port_range_end | int) 1 }} {{ range $index, $port := $portGen }}
+    - protocol: UDP
+      port: {{ $port }}
+      name: coturn-udp-{{ $port }}
+      targetPort: {{ $port }}
+       {{- end }}
+
diff --git a/kubernetes/terraform/helm/charts/coturn/values.yaml b/kubernetes/terraform/helm/charts/coturn/values.yaml
new file mode 100644
index 000000000..c6996a599
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/coturn/values.yaml
@@ -0,0 +1,2 @@
+udp_port_range_start: 49152
+udp_port_range_end: 49252
diff --git a/kubernetes/terraform/helm/charts/frontend/Chart.yaml b/kubernetes/terraform/helm/charts/frontend/Chart.yaml
new file mode 100644
index 000000000..c8a594114
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/frontend/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: frontend
+description: nginx frontend
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/frontend.yaml b/kubernetes/terraform/helm/charts/frontend/templates/deployment.yaml
similarity index 66%
rename from kubernetes/frontend.yaml
rename to kubernetes/terraform/helm/charts/frontend/templates/deployment.yaml
index 3f6ee0b79..74ad95031 100644
--- a/kubernetes/frontend.yaml
+++ b/kubernetes/terraform/helm/charts/frontend/templates/deployment.yaml
@@ -17,9 +17,8 @@ spec:
     spec:
       containers:
       - name: frontend
-        # change to IfNotPresent for minikube
-        imagePullPolicy: Always
-        image: deathangel908/pychat-frontend
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
         ports:
         - containerPort: 80
         readinessProbe:
@@ -33,17 +32,3 @@ spec:
         - name: photo
           persistentVolumeClaim:
             claimName: pvc-photo
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontend-service
-  namespace: pychat
-spec:
-  selector:
-    app: frontend
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 80
-
diff --git a/kubernetes/terraform/helm/charts/frontend/templates/service.yaml b/kubernetes/terraform/helm/charts/frontend/templates/service.yaml
new file mode 100644
index 000000000..81f3d70d8
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/frontend/templates/service.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend-service
+  namespace: pychat
+spec:
+  selector:
+    app: frontend
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
diff --git a/kubernetes/terraform/helm/charts/mariadb/Chart.yaml b/kubernetes/terraform/helm/charts/mariadb/Chart.yaml
new file mode 100644
index 000000000..32c144289
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/mariadb/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: mariadb
+description: main sql database
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/mariadb/templates/deployment.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/deployment.yaml
similarity index 89%
rename from kubernetes/mariadb/templates/deployment.yaml
rename to kubernetes/terraform/helm/charts/mariadb/templates/deployment.yaml
index ea9a6d285..800d0403d 100644
--- a/kubernetes/mariadb/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/deployment.yaml
@@ -22,7 +22,8 @@ spec:
     spec:
       containers:
       - name: mariadb
-        image: yobasystems/alpine-mariadb:10.6.7
+        image: "yobasystems/alpine-mariadb:{{ .Values.mysql_version }}"
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3306
         env:
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
new file mode 100644
index 000000000..32192ec9f
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-mariadb
+spec:
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: {{ .Values.disk_size }}
+  hostPath:
+    path: /data/mariadb
diff --git a/kubernetes/pv-mariadb.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/pvc.yaml
similarity index 60%
rename from kubernetes/pv-mariadb.yaml
rename to kubernetes/terraform/helm/charts/mariadb/templates/pvc.yaml
index 1f74b75f4..5fa8abeaa 100644
--- a/kubernetes/pv-mariadb.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/pvc.yaml
@@ -1,15 +1,3 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-mariadb
-spec:
-  accessModes:
-    - ReadWriteOnce
-  capacity:
-    storage: 5Gi
-  hostPath:
-    path: /data/mariadb
----
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -20,6 +8,6 @@ spec:
      - ReadWriteOnce
    resources:
      requests:
-       storage: 5Gi
+       storage: {{ .Values.disk_size }}
    storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
    volumeName: pv-mariadb
diff --git a/kubernetes/mariadb/templates/service.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/service.yaml
similarity index 100%
rename from kubernetes/mariadb/templates/service.yaml
rename to kubernetes/terraform/helm/charts/mariadb/templates/service.yaml
diff --git a/kubernetes/terraform/helm/charts/mariadb/values.yaml b/kubernetes/terraform/helm/charts/mariadb/values.yaml
new file mode 100644
index 000000000..5c9b01f81
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/mariadb/values.yaml
@@ -0,0 +1,2 @@
+disk_size: "5Gi"
+mysql_version: "10.6.7"
diff --git a/kubernetes/terraform/helm/charts/redis/Chart.yaml b/kubernetes/terraform/helm/charts/redis/Chart.yaml
new file mode 100644
index 000000000..79b438efe
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/redis/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: redis
+description: redis storage pubsub
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/redis.yaml b/kubernetes/terraform/helm/charts/redis/templates/deployment.yaml
similarity index 74%
rename from kubernetes/redis.yaml
rename to kubernetes/terraform/helm/charts/redis/templates/deployment.yaml
index 36dbfdbd0..ba3a74012 100644
--- a/kubernetes/redis.yaml
+++ b/kubernetes/terraform/helm/charts/redis/templates/deployment.yaml
@@ -27,17 +27,3 @@ spec:
       - name: redis-data
         persistentVolumeClaim:
           claimName: pvc-redis
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis-service
-  namespace: pychat
-spec:
-  selector:
-    app: redis
-  ports:
-    - protocol: TCP
-      port: 6379
-      targetPort: 6379
-
diff --git a/kubernetes/terraform/helm/charts/redis/templates/pv.yaml b/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
new file mode 100644
index 000000000..b76efbcd8
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-redis
+spec:
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: 1Gi
+  hostPath:
+    path: /data/redis
diff --git a/kubernetes/pv-redis.yaml b/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
similarity index 64%
rename from kubernetes/pv-redis.yaml
rename to kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
index 035ecb1c7..da57acf6b 100644
--- a/kubernetes/pv-redis.yaml
+++ b/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
@@ -1,15 +1,3 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-redis
-spec:
-  accessModes:
-    - ReadWriteOnce
-  capacity:
-    storage: 1Gi
-  hostPath:
-    path: /data/redis
----
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
diff --git a/kubernetes/terraform/helm/charts/redis/templates/service.yaml b/kubernetes/terraform/helm/charts/redis/templates/service.yaml
new file mode 100644
index 000000000..e75823efe
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/redis/templates/service.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-service
+  namespace: pychat
+spec:
+  selector:
+    app: redis
+  ports:
+    - protocol: TCP
+      port: 6379
+      targetPort: 6379
diff --git a/kubernetes/terraform/helm/charts/redis/values.yaml b/kubernetes/terraform/helm/charts/redis/values.yaml
new file mode 100644
index 000000000..5c9b01f81
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/redis/values.yaml
@@ -0,0 +1,2 @@
+disk_size: "5Gi"
+mysql_version: "10.6.7"
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 559aeb39e..84f49d5d4 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -11,6 +11,11 @@ variable "kubeconfig" {}
 
 provider "helm" {
   kubernetes {
-    config_context = kubeconfig
+    config_context = var.kubeconfig
   }
 }
+
+resource "helm_release" "backend" {
+  name = "backend"
+  chart = "./charts/backend"
+}
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index e545de08f..a5b1ea43f 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -10,7 +10,7 @@ module "linode" {
   linode_token = var.linode_token
 }
 
-module "storage_account_test" {
+module "cloudflare" {
   source                  = "./cloudflare"
   cloud_flare_api_token = var.cloud_flare_api_token
   cloud_flare_zone_id = var.cloud_flare_zone_id

From 62c58a7037800d7a1f292d7edfcd145e158873fd Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 26 May 2023 21:08:53 +0300
Subject: [PATCH 173/221] Added ingress

---
 kubernetes/cert-manager.yaml                  |   35 -
 kubernetes/coturn.yaml                        |    0
 kubernetes/ingress-controller.yaml            | 1439 -----------------
 .../helm/charts/certmanager/Chart.yaml        |    6 +
 .../certmanager/templates/certificate.yaml    |   15 +
 .../charts/certmanager/templates/issues.yaml  |   18 +
 .../helm/charts/certmanager/values.yaml       |    2 +
 .../terraform/helm/charts/ingress/Chart.yaml  |    6 +
 .../templates/cluster-role-binding.yaml       |   17 +
 .../ingress/templates/cluster-role.yaml       |   80 +
 .../helm/charts/ingress/templates/cm.yaml     |   13 +
 .../charts/ingress/templates/deployment.yaml  |  101 ++
 .../ingress/templates/ingress-class.yaml      |   12 +
 .../charts/ingress/templates}/ingress.yaml    |    8 +-
 .../helm/charts/ingress/templates/ns.yaml     |    7 +
 .../ingress/templates/role-binding.yaml       |   20 +
 .../helm/charts/ingress/templates/role.yaml   |   89 +
 .../helm/charts/ingress/templates/sa.yaml     |   12 +
 .../charts/ingress/templates/service.yaml     |   56 +
 .../helm/charts/ingress/templates/tcp-cm.yaml |   11 +
 .../helm/charts/ingress/templates/udp-cm.yaml |   11 +
 .../terraform/helm/charts/ingress/values.yaml |    4 +
 .../terraform/helm/charts/postfix/Chart.yaml  |    6 +
 .../charts/postfix/templates/deployment.yaml} |   18 +-
 .../charts/postfix/templates/service.yaml     |   13 +
 .../terraform/helm/charts/postfix/values.yaml |    4 +
 26 files changed, 509 insertions(+), 1494 deletions(-)
 delete mode 100644 kubernetes/cert-manager.yaml
 delete mode 100644 kubernetes/coturn.yaml
 delete mode 100644 kubernetes/ingress-controller.yaml
 create mode 100644 kubernetes/terraform/helm/charts/certmanager/Chart.yaml
 create mode 100644 kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
 create mode 100644 kubernetes/terraform/helm/charts/certmanager/templates/issues.yaml
 create mode 100644 kubernetes/terraform/helm/charts/certmanager/values.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/Chart.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/cluster-role-binding.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/cluster-role.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/cm.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/deployment.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/ingress-class.yaml
 rename kubernetes/{ => terraform/helm/charts/ingress/templates}/ingress.yaml (88%)
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/ns.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/role-binding.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/role.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/sa.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/service.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/tcp-cm.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/templates/udp-cm.yaml
 create mode 100644 kubernetes/terraform/helm/charts/ingress/values.yaml
 create mode 100644 kubernetes/terraform/helm/charts/postfix/Chart.yaml
 rename kubernetes/{postfix.yaml => terraform/helm/charts/postfix/templates/deployment.yaml} (69%)
 create mode 100644 kubernetes/terraform/helm/charts/postfix/templates/service.yaml
 create mode 100644 kubernetes/terraform/helm/charts/postfix/values.yaml

diff --git a/kubernetes/cert-manager.yaml b/kubernetes/cert-manager.yaml
deleted file mode 100644
index f2cb12af0..000000000
--- a/kubernetes/cert-manager.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: letsencrypt-prod
-  namespace: pychat
-spec:
-  acme:
-    email: deathangel908@gmail.com
-    server: https://acme-v02.api.letsencrypt.org/directory
-    privateKeySecretRef:
-      name: letsencrypt-prod
-    solvers:
-    - dns01:
-        cloudflare:
-          email: deathangel908@gmail.com
-          apiTokenSecretRef:
-            name: cloudflare-api-token-secret
-            key: api-token
----
-
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: pychat-domain
-  namespace: pychat
-spec:
-  secretName: pychat-tls
-  issuerRef:
-    name: letsencrypt-prod
-
-  duration: 2160h # 90d
-  renewBefore: 720h # 30d before SSL will expire, renew it
-  dnsNames:
-    - "pychat.org"
-    - "*.pychat.org"
diff --git a/kubernetes/coturn.yaml b/kubernetes/coturn.yaml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/kubernetes/ingress-controller.yaml b/kubernetes/ingress-controller.yaml
deleted file mode 100644
index c24250765..000000000
--- a/kubernetes/ingress-controller.yaml
+++ /dev/null
@@ -1,1439 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  name: ingress-nginx
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: tcp-services
-  namespace: ingress-nginx
-data:
-#  25: "pychat/postfix-service:25"
-#  587: "pychat/postfix-service:587"
-#  465: "pychat/postfix-service:465"
-  3478: "pychat/coturn-service:3478"
-  5349: "pychat/coturn-service:5349"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: udp-services
-  namespace: ingress-nginx
-data:
-  #for (let i = 49152; i < 49353; i++) {
-  #console.log(`  ${i}: "pychat/coturn-service:${i}"`)
-  #}
-  3478: "pychat/coturn-service:3478"
-  5349: "pychat/coturn-service:5349"
-  49152: "pychat/coturn-service:49152"
-  49153: "pychat/coturn-service:49153"
-  49154: "pychat/coturn-service:49154"
-  49155: "pychat/coturn-service:49155"
-  49156: "pychat/coturn-service:49156"
-  49157: "pychat/coturn-service:49157"
-  49158: "pychat/coturn-service:49158"
-  49159: "pychat/coturn-service:49159"
-  49160: "pychat/coturn-service:49160"
-  49161: "pychat/coturn-service:49161"
-  49162: "pychat/coturn-service:49162"
-  49163: "pychat/coturn-service:49163"
-  49164: "pychat/coturn-service:49164"
-  49165: "pychat/coturn-service:49165"
-  49166: "pychat/coturn-service:49166"
-  49167: "pychat/coturn-service:49167"
-  49168: "pychat/coturn-service:49168"
-  49169: "pychat/coturn-service:49169"
-  49170: "pychat/coturn-service:49170"
-  49171: "pychat/coturn-service:49171"
-  49172: "pychat/coturn-service:49172"
-  49173: "pychat/coturn-service:49173"
-  49174: "pychat/coturn-service:49174"
-  49175: "pychat/coturn-service:49175"
-  49176: "pychat/coturn-service:49176"
-  49177: "pychat/coturn-service:49177"
-  49178: "pychat/coturn-service:49178"
-  49179: "pychat/coturn-service:49179"
-  49180: "pychat/coturn-service:49180"
-  49181: "pychat/coturn-service:49181"
-  49182: "pychat/coturn-service:49182"
-  49183: "pychat/coturn-service:49183"
-  49184: "pychat/coturn-service:49184"
-  49185: "pychat/coturn-service:49185"
-  49186: "pychat/coturn-service:49186"
-  49187: "pychat/coturn-service:49187"
-  49188: "pychat/coturn-service:49188"
-  49189: "pychat/coturn-service:49189"
-  49190: "pychat/coturn-service:49190"
-  49191: "pychat/coturn-service:49191"
-  49192: "pychat/coturn-service:49192"
-  49193: "pychat/coturn-service:49193"
-  49194: "pychat/coturn-service:49194"
-  49195: "pychat/coturn-service:49195"
-  49196: "pychat/coturn-service:49196"
-  49197: "pychat/coturn-service:49197"
-  49198: "pychat/coturn-service:49198"
-  49199: "pychat/coturn-service:49199"
-  49200: "pychat/coturn-service:49200"
-  49201: "pychat/coturn-service:49201"
-  49202: "pychat/coturn-service:49202"
-  49203: "pychat/coturn-service:49203"
-  49204: "pychat/coturn-service:49204"
-  49205: "pychat/coturn-service:49205"
-  49206: "pychat/coturn-service:49206"
-  49207: "pychat/coturn-service:49207"
-  49208: "pychat/coturn-service:49208"
-  49209: "pychat/coturn-service:49209"
-  49210: "pychat/coturn-service:49210"
-  49211: "pychat/coturn-service:49211"
-  49212: "pychat/coturn-service:49212"
-  49213: "pychat/coturn-service:49213"
-  49214: "pychat/coturn-service:49214"
-  49215: "pychat/coturn-service:49215"
-  49216: "pychat/coturn-service:49216"
-  49217: "pychat/coturn-service:49217"
-  49218: "pychat/coturn-service:49218"
-  49219: "pychat/coturn-service:49219"
-  49220: "pychat/coturn-service:49220"
-  49221: "pychat/coturn-service:49221"
-  49222: "pychat/coturn-service:49222"
-  49223: "pychat/coturn-service:49223"
-  49224: "pychat/coturn-service:49224"
-  49225: "pychat/coturn-service:49225"
-  49226: "pychat/coturn-service:49226"
-  49227: "pychat/coturn-service:49227"
-  49228: "pychat/coturn-service:49228"
-  49229: "pychat/coturn-service:49229"
-  49230: "pychat/coturn-service:49230"
-  49231: "pychat/coturn-service:49231"
-  49232: "pychat/coturn-service:49232"
-  49233: "pychat/coturn-service:49233"
-  49234: "pychat/coturn-service:49234"
-  49235: "pychat/coturn-service:49235"
-  49236: "pychat/coturn-service:49236"
-  49237: "pychat/coturn-service:49237"
-  49238: "pychat/coturn-service:49238"
-  49239: "pychat/coturn-service:49239"
-  49240: "pychat/coturn-service:49240"
-  49241: "pychat/coturn-service:49241"
-  49242: "pychat/coturn-service:49242"
-  49243: "pychat/coturn-service:49243"
-  49244: "pychat/coturn-service:49244"
-  49245: "pychat/coturn-service:49245"
-  49246: "pychat/coturn-service:49246"
-  49247: "pychat/coturn-service:49247"
-  49248: "pychat/coturn-service:49248"
-  49249: "pychat/coturn-service:49249"
-  49250: "pychat/coturn-service:49250"
-  49251: "pychat/coturn-service:49251"
-  49252: "pychat/coturn-service:49252"
-  49253: "pychat/coturn-service:49253"
-  49254: "pychat/coturn-service:49254"
-  49255: "pychat/coturn-service:49255"
-  49256: "pychat/coturn-service:49256"
-  49257: "pychat/coturn-service:49257"
-  49258: "pychat/coturn-service:49258"
-  49259: "pychat/coturn-service:49259"
-  49260: "pychat/coturn-service:49260"
-  49261: "pychat/coturn-service:49261"
-  49262: "pychat/coturn-service:49262"
-  49263: "pychat/coturn-service:49263"
-  49264: "pychat/coturn-service:49264"
-  49265: "pychat/coturn-service:49265"
-  49266: "pychat/coturn-service:49266"
-  49267: "pychat/coturn-service:49267"
-  49268: "pychat/coturn-service:49268"
-  49269: "pychat/coturn-service:49269"
-  49270: "pychat/coturn-service:49270"
-  49271: "pychat/coturn-service:49271"
-  49272: "pychat/coturn-service:49272"
-  49273: "pychat/coturn-service:49273"
-  49274: "pychat/coturn-service:49274"
-  49275: "pychat/coturn-service:49275"
-  49276: "pychat/coturn-service:49276"
-  49277: "pychat/coturn-service:49277"
-  49278: "pychat/coturn-service:49278"
-  49279: "pychat/coturn-service:49279"
-  49280: "pychat/coturn-service:49280"
-  49281: "pychat/coturn-service:49281"
-  49282: "pychat/coturn-service:49282"
-  49283: "pychat/coturn-service:49283"
-  49284: "pychat/coturn-service:49284"
-  49285: "pychat/coturn-service:49285"
-  49286: "pychat/coturn-service:49286"
-  49287: "pychat/coturn-service:49287"
-  49288: "pychat/coturn-service:49288"
-  49289: "pychat/coturn-service:49289"
-  49290: "pychat/coturn-service:49290"
-  49291: "pychat/coturn-service:49291"
-  49292: "pychat/coturn-service:49292"
-  49293: "pychat/coturn-service:49293"
-  49294: "pychat/coturn-service:49294"
-  49295: "pychat/coturn-service:49295"
-  49296: "pychat/coturn-service:49296"
-  49297: "pychat/coturn-service:49297"
-  49298: "pychat/coturn-service:49298"
-  49299: "pychat/coturn-service:49299"
-  49300: "pychat/coturn-service:49300"
-  49301: "pychat/coturn-service:49301"
-  49302: "pychat/coturn-service:49302"
-  49303: "pychat/coturn-service:49303"
-  49304: "pychat/coturn-service:49304"
-  49305: "pychat/coturn-service:49305"
-  49306: "pychat/coturn-service:49306"
-  49307: "pychat/coturn-service:49307"
-  49308: "pychat/coturn-service:49308"
-  49309: "pychat/coturn-service:49309"
-  49310: "pychat/coturn-service:49310"
-  49311: "pychat/coturn-service:49311"
-  49312: "pychat/coturn-service:49312"
-  49313: "pychat/coturn-service:49313"
-  49314: "pychat/coturn-service:49314"
-  49315: "pychat/coturn-service:49315"
-  49316: "pychat/coturn-service:49316"
-  49317: "pychat/coturn-service:49317"
-  49318: "pychat/coturn-service:49318"
-  49319: "pychat/coturn-service:49319"
-  49320: "pychat/coturn-service:49320"
-  49321: "pychat/coturn-service:49321"
-  49322: "pychat/coturn-service:49322"
-  49323: "pychat/coturn-service:49323"
-  49324: "pychat/coturn-service:49324"
-  49325: "pychat/coturn-service:49325"
-  49326: "pychat/coturn-service:49326"
-  49327: "pychat/coturn-service:49327"
-  49328: "pychat/coturn-service:49328"
-  49329: "pychat/coturn-service:49329"
-  49330: "pychat/coturn-service:49330"
-  49331: "pychat/coturn-service:49331"
-  49332: "pychat/coturn-service:49332"
-  49333: "pychat/coturn-service:49333"
-  49334: "pychat/coturn-service:49334"
-  49335: "pychat/coturn-service:49335"
-  49336: "pychat/coturn-service:49336"
-  49337: "pychat/coturn-service:49337"
-  49338: "pychat/coturn-service:49338"
-  49339: "pychat/coturn-service:49339"
-  49340: "pychat/coturn-service:49340"
-  49341: "pychat/coturn-service:49341"
-  49342: "pychat/coturn-service:49342"
-  49343: "pychat/coturn-service:49343"
-  49344: "pychat/coturn-service:49344"
-  49345: "pychat/coturn-service:49345"
-  49346: "pychat/coturn-service:49346"
-  49347: "pychat/coturn-service:49347"
-  49348: "pychat/coturn-service:49348"
-  49349: "pychat/coturn-service:49349"
-  49350: "pychat/coturn-service:49350"
-  49351: "pychat/coturn-service:49351"
-  49352: "pychat/coturn-service:49352"
----
-apiVersion: v1
-automountServiceAccountToken: true
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-  namespace: ingress-nginx
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-  namespace: ingress-nginx
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - pods
-  - secrets
-  - endpoints
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - update
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingressclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - coordination.k8s.io
-  resourceNames:
-  - ingress-nginx-leader
-  resources:
-  - leases
-  verbs:
-  - get
-  - update
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - list
-  - watch
-  - get
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - endpoints
-  - nodes
-  - pods
-  - secrets
-  - namespaces
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - update
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingressclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - list
-  - watch
-  - get
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-  namespace: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: ingress-nginx
-subjects:
-- kind: ServiceAccount
-  name: ingress-nginx
-  namespace: ingress-nginx
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: ingress-nginx
-subjects:
-- kind: ServiceAccount
-  name: ingress-nginx
-  namespace: ingress-nginx
----
-apiVersion: v1
-data:
-  allow-snippet-annotations: "true"
-kind: ConfigMap
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
-spec:
-  externalTrafficPolicy: Cluster
-  ipFamilies:
-  - IPv4
-  ipFamilyPolicy: SingleStack
-  ports:
-  - appProtocol: http
-    name: http
-    port: 80
-    protocol: TCP
-    targetPort: http
-  - appProtocol: https
-    name: https
-    port: 443
-    protocol: TCP
-    targetPort: https
-  - name: proxied-tcp-5349
-    port: 5349
-    targetPort: 5349
-    protocol: TCP
-  - name: proxied-tcp-3478
-    port: 3478
-    targetPort: 3478
-    protocol: TCP
-  - name: proxied-udp-5349
-    port: 5349
-    targetPort: 5349
-    protocol: UDP
-  - name: proxied-udp-3478
-    port: 3478
-    targetPort: 3478
-    protocol: UDP
-  - protocol: UDP
-    port: 49152
-    name: coturn-udp-49152
-    targetPort: 49152
-  - protocol: UDP
-    port: 49153
-    name: coturn-udp-49153
-    targetPort: 49153
-  - protocol: UDP
-    port: 49154
-    name: coturn-udp-49154
-    targetPort: 49154
-  - protocol: UDP
-    port: 49155
-    name: coturn-udp-49155
-    targetPort: 49155
-  - protocol: UDP
-    port: 49156
-    name: coturn-udp-49156
-    targetPort: 49156
-  - protocol: UDP
-    port: 49157
-    name: coturn-udp-49157
-    targetPort: 49157
-  - protocol: UDP
-    port: 49158
-    name: coturn-udp-49158
-    targetPort: 49158
-  - protocol: UDP
-    port: 49159
-    name: coturn-udp-49159
-    targetPort: 49159
-  - protocol: UDP
-    port: 49160
-    name: coturn-udp-49160
-    targetPort: 49160
-  - protocol: UDP
-    port: 49161
-    name: coturn-udp-49161
-    targetPort: 49161
-  - protocol: UDP
-    port: 49162
-    name: coturn-udp-49162
-    targetPort: 49162
-  - protocol: UDP
-    port: 49163
-    name: coturn-udp-49163
-    targetPort: 49163
-  - protocol: UDP
-    port: 49164
-    name: coturn-udp-49164
-    targetPort: 49164
-  - protocol: UDP
-    port: 49165
-    name: coturn-udp-49165
-    targetPort: 49165
-  - protocol: UDP
-    port: 49166
-    name: coturn-udp-49166
-    targetPort: 49166
-  - protocol: UDP
-    port: 49167
-    name: coturn-udp-49167
-    targetPort: 49167
-  - protocol: UDP
-    port: 49168
-    name: coturn-udp-49168
-    targetPort: 49168
-  - protocol: UDP
-    port: 49169
-    name: coturn-udp-49169
-    targetPort: 49169
-  - protocol: UDP
-    port: 49170
-    name: coturn-udp-49170
-    targetPort: 49170
-  - protocol: UDP
-    port: 49171
-    name: coturn-udp-49171
-    targetPort: 49171
-  - protocol: UDP
-    port: 49172
-    name: coturn-udp-49172
-    targetPort: 49172
-  - protocol: UDP
-    port: 49173
-    name: coturn-udp-49173
-    targetPort: 49173
-  - protocol: UDP
-    port: 49174
-    name: coturn-udp-49174
-    targetPort: 49174
-  - protocol: UDP
-    port: 49175
-    name: coturn-udp-49175
-    targetPort: 49175
-  - protocol: UDP
-    port: 49176
-    name: coturn-udp-49176
-    targetPort: 49176
-  - protocol: UDP
-    port: 49177
-    name: coturn-udp-49177
-    targetPort: 49177
-  - protocol: UDP
-    port: 49178
-    name: coturn-udp-49178
-    targetPort: 49178
-  - protocol: UDP
-    port: 49179
-    name: coturn-udp-49179
-    targetPort: 49179
-  - protocol: UDP
-    port: 49180
-    name: coturn-udp-49180
-    targetPort: 49180
-  - protocol: UDP
-    port: 49181
-    name: coturn-udp-49181
-    targetPort: 49181
-  - protocol: UDP
-    port: 49182
-    name: coturn-udp-49182
-    targetPort: 49182
-  - protocol: UDP
-    port: 49183
-    name: coturn-udp-49183
-    targetPort: 49183
-  - protocol: UDP
-    port: 49184
-    name: coturn-udp-49184
-    targetPort: 49184
-  - protocol: UDP
-    port: 49185
-    name: coturn-udp-49185
-    targetPort: 49185
-  - protocol: UDP
-    port: 49186
-    name: coturn-udp-49186
-    targetPort: 49186
-  - protocol: UDP
-    port: 49187
-    name: coturn-udp-49187
-    targetPort: 49187
-  - protocol: UDP
-    port: 49188
-    name: coturn-udp-49188
-    targetPort: 49188
-  - protocol: UDP
-    port: 49189
-    name: coturn-udp-49189
-    targetPort: 49189
-  - protocol: UDP
-    port: 49190
-    name: coturn-udp-49190
-    targetPort: 49190
-  - protocol: UDP
-    port: 49191
-    name: coturn-udp-49191
-    targetPort: 49191
-  - protocol: UDP
-    port: 49192
-    name: coturn-udp-49192
-    targetPort: 49192
-  - protocol: UDP
-    port: 49193
-    name: coturn-udp-49193
-    targetPort: 49193
-  - protocol: UDP
-    port: 49194
-    name: coturn-udp-49194
-    targetPort: 49194
-  - protocol: UDP
-    port: 49195
-    name: coturn-udp-49195
-    targetPort: 49195
-  - protocol: UDP
-    port: 49196
-    name: coturn-udp-49196
-    targetPort: 49196
-  - protocol: UDP
-    port: 49197
-    name: coturn-udp-49197
-    targetPort: 49197
-  - protocol: UDP
-    port: 49198
-    name: coturn-udp-49198
-    targetPort: 49198
-  - protocol: UDP
-    port: 49199
-    name: coturn-udp-49199
-    targetPort: 49199
-  - protocol: UDP
-    port: 49200
-    name: coturn-udp-49200
-    targetPort: 49200
-  - protocol: UDP
-    port: 49201
-    name: coturn-udp-49201
-    targetPort: 49201
-  - protocol: UDP
-    port: 49202
-    name: coturn-udp-49202
-    targetPort: 49202
-  - protocol: UDP
-    port: 49203
-    name: coturn-udp-49203
-    targetPort: 49203
-  - protocol: UDP
-    port: 49204
-    name: coturn-udp-49204
-    targetPort: 49204
-  - protocol: UDP
-    port: 49205
-    name: coturn-udp-49205
-    targetPort: 49205
-  - protocol: UDP
-    port: 49206
-    name: coturn-udp-49206
-    targetPort: 49206
-  - protocol: UDP
-    port: 49207
-    name: coturn-udp-49207
-    targetPort: 49207
-  - protocol: UDP
-    port: 49208
-    name: coturn-udp-49208
-    targetPort: 49208
-  - protocol: UDP
-    port: 49209
-    name: coturn-udp-49209
-    targetPort: 49209
-  - protocol: UDP
-    port: 49210
-    name: coturn-udp-49210
-    targetPort: 49210
-  - protocol: UDP
-    port: 49211
-    name: coturn-udp-49211
-    targetPort: 49211
-  - protocol: UDP
-    port: 49212
-    name: coturn-udp-49212
-    targetPort: 49212
-  - protocol: UDP
-    port: 49213
-    name: coturn-udp-49213
-    targetPort: 49213
-  - protocol: UDP
-    port: 49214
-    name: coturn-udp-49214
-    targetPort: 49214
-  - protocol: UDP
-    port: 49215
-    name: coturn-udp-49215
-    targetPort: 49215
-  - protocol: UDP
-    port: 49216
-    name: coturn-udp-49216
-    targetPort: 49216
-  - protocol: UDP
-    port: 49217
-    name: coturn-udp-49217
-    targetPort: 49217
-  - protocol: UDP
-    port: 49218
-    name: coturn-udp-49218
-    targetPort: 49218
-  - protocol: UDP
-    port: 49219
-    name: coturn-udp-49219
-    targetPort: 49219
-  - protocol: UDP
-    port: 49220
-    name: coturn-udp-49220
-    targetPort: 49220
-  - protocol: UDP
-    port: 49221
-    name: coturn-udp-49221
-    targetPort: 49221
-  - protocol: UDP
-    port: 49222
-    name: coturn-udp-49222
-    targetPort: 49222
-  - protocol: UDP
-    port: 49223
-    name: coturn-udp-49223
-    targetPort: 49223
-  - protocol: UDP
-    port: 49224
-    name: coturn-udp-49224
-    targetPort: 49224
-  - protocol: UDP
-    port: 49225
-    name: coturn-udp-49225
-    targetPort: 49225
-  - protocol: UDP
-    port: 49226
-    name: coturn-udp-49226
-    targetPort: 49226
-  - protocol: UDP
-    port: 49227
-    name: coturn-udp-49227
-    targetPort: 49227
-  - protocol: UDP
-    port: 49228
-    name: coturn-udp-49228
-    targetPort: 49228
-  - protocol: UDP
-    port: 49229
-    name: coturn-udp-49229
-    targetPort: 49229
-  - protocol: UDP
-    port: 49230
-    name: coturn-udp-49230
-    targetPort: 49230
-  - protocol: UDP
-    port: 49231
-    name: coturn-udp-49231
-    targetPort: 49231
-  - protocol: UDP
-    port: 49232
-    name: coturn-udp-49232
-    targetPort: 49232
-  - protocol: UDP
-    port: 49233
-    name: coturn-udp-49233
-    targetPort: 49233
-  - protocol: UDP
-    port: 49234
-    name: coturn-udp-49234
-    targetPort: 49234
-  - protocol: UDP
-    port: 49235
-    name: coturn-udp-49235
-    targetPort: 49235
-  - protocol: UDP
-    port: 49236
-    name: coturn-udp-49236
-    targetPort: 49236
-  - protocol: UDP
-    port: 49237
-    name: coturn-udp-49237
-    targetPort: 49237
-  - protocol: UDP
-    port: 49238
-    name: coturn-udp-49238
-    targetPort: 49238
-  - protocol: UDP
-    port: 49239
-    name: coturn-udp-49239
-    targetPort: 49239
-  - protocol: UDP
-    port: 49240
-    name: coturn-udp-49240
-    targetPort: 49240
-  - protocol: UDP
-    port: 49241
-    name: coturn-udp-49241
-    targetPort: 49241
-  - protocol: UDP
-    port: 49242
-    name: coturn-udp-49242
-    targetPort: 49242
-  - protocol: UDP
-    port: 49243
-    name: coturn-udp-49243
-    targetPort: 49243
-  - protocol: UDP
-    port: 49244
-    name: coturn-udp-49244
-    targetPort: 49244
-  - protocol: UDP
-    port: 49245
-    name: coturn-udp-49245
-    targetPort: 49245
-  - protocol: UDP
-    port: 49246
-    name: coturn-udp-49246
-    targetPort: 49246
-  - protocol: UDP
-    port: 49247
-    name: coturn-udp-49247
-    targetPort: 49247
-  - protocol: UDP
-    port: 49248
-    name: coturn-udp-49248
-    targetPort: 49248
-  - protocol: UDP
-    port: 49249
-    name: coturn-udp-49249
-    targetPort: 49249
-  - protocol: UDP
-    port: 49250
-    name: coturn-udp-49250
-    targetPort: 49250
-  - protocol: UDP
-    port: 49251
-    name: coturn-udp-49251
-    targetPort: 49251
-  - protocol: UDP
-    port: 49252
-    name: coturn-udp-49252
-    targetPort: 49252
-  - protocol: UDP
-    port: 49253
-    name: coturn-udp-49253
-    targetPort: 49253
-  - protocol: UDP
-    port: 49254
-    name: coturn-udp-49254
-    targetPort: 49254
-  - protocol: UDP
-    port: 49255
-    name: coturn-udp-49255
-    targetPort: 49255
-  - protocol: UDP
-    port: 49256
-    name: coturn-udp-49256
-    targetPort: 49256
-  - protocol: UDP
-    port: 49257
-    name: coturn-udp-49257
-    targetPort: 49257
-  - protocol: UDP
-    port: 49258
-    name: coturn-udp-49258
-    targetPort: 49258
-  - protocol: UDP
-    port: 49259
-    name: coturn-udp-49259
-    targetPort: 49259
-  - protocol: UDP
-    port: 49260
-    name: coturn-udp-49260
-    targetPort: 49260
-  - protocol: UDP
-    port: 49261
-    name: coturn-udp-49261
-    targetPort: 49261
-  - protocol: UDP
-    port: 49262
-    name: coturn-udp-49262
-    targetPort: 49262
-  - protocol: UDP
-    port: 49263
-    name: coturn-udp-49263
-    targetPort: 49263
-  - protocol: UDP
-    port: 49264
-    name: coturn-udp-49264
-    targetPort: 49264
-  - protocol: UDP
-    port: 49265
-    name: coturn-udp-49265
-    targetPort: 49265
-  - protocol: UDP
-    port: 49266
-    name: coturn-udp-49266
-    targetPort: 49266
-  - protocol: UDP
-    port: 49267
-    name: coturn-udp-49267
-    targetPort: 49267
-  - protocol: UDP
-    port: 49268
-    name: coturn-udp-49268
-    targetPort: 49268
-  - protocol: UDP
-    port: 49269
-    name: coturn-udp-49269
-    targetPort: 49269
-  - protocol: UDP
-    port: 49270
-    name: coturn-udp-49270
-    targetPort: 49270
-  - protocol: UDP
-    port: 49271
-    name: coturn-udp-49271
-    targetPort: 49271
-  - protocol: UDP
-    port: 49272
-    name: coturn-udp-49272
-    targetPort: 49272
-  - protocol: UDP
-    port: 49273
-    name: coturn-udp-49273
-    targetPort: 49273
-  - protocol: UDP
-    port: 49274
-    name: coturn-udp-49274
-    targetPort: 49274
-  - protocol: UDP
-    port: 49275
-    name: coturn-udp-49275
-    targetPort: 49275
-  - protocol: UDP
-    port: 49276
-    name: coturn-udp-49276
-    targetPort: 49276
-  - protocol: UDP
-    port: 49277
-    name: coturn-udp-49277
-    targetPort: 49277
-  - protocol: UDP
-    port: 49278
-    name: coturn-udp-49278
-    targetPort: 49278
-  - protocol: UDP
-    port: 49279
-    name: coturn-udp-49279
-    targetPort: 49279
-  - protocol: UDP
-    port: 49280
-    name: coturn-udp-49280
-    targetPort: 49280
-  - protocol: UDP
-    port: 49281
-    name: coturn-udp-49281
-    targetPort: 49281
-  - protocol: UDP
-    port: 49282
-    name: coturn-udp-49282
-    targetPort: 49282
-  - protocol: UDP
-    port: 49283
-    name: coturn-udp-49283
-    targetPort: 49283
-  - protocol: UDP
-    port: 49284
-    name: coturn-udp-49284
-    targetPort: 49284
-  - protocol: UDP
-    port: 49285
-    name: coturn-udp-49285
-    targetPort: 49285
-  - protocol: UDP
-    port: 49286
-    name: coturn-udp-49286
-    targetPort: 49286
-  - protocol: UDP
-    port: 49287
-    name: coturn-udp-49287
-    targetPort: 49287
-  - protocol: UDP
-    port: 49288
-    name: coturn-udp-49288
-    targetPort: 49288
-  - protocol: UDP
-    port: 49289
-    name: coturn-udp-49289
-    targetPort: 49289
-  - protocol: UDP
-    port: 49290
-    name: coturn-udp-49290
-    targetPort: 49290
-  - protocol: UDP
-    port: 49291
-    name: coturn-udp-49291
-    targetPort: 49291
-  - protocol: UDP
-    port: 49292
-    name: coturn-udp-49292
-    targetPort: 49292
-  - protocol: UDP
-    port: 49293
-    name: coturn-udp-49293
-    targetPort: 49293
-  - protocol: UDP
-    port: 49294
-    name: coturn-udp-49294
-    targetPort: 49294
-  - protocol: UDP
-    port: 49295
-    name: coturn-udp-49295
-    targetPort: 49295
-  - protocol: UDP
-    port: 49296
-    name: coturn-udp-49296
-    targetPort: 49296
-  - protocol: UDP
-    port: 49297
-    name: coturn-udp-49297
-    targetPort: 49297
-  - protocol: UDP
-    port: 49298
-    name: coturn-udp-49298
-    targetPort: 49298
-  - protocol: UDP
-    port: 49299
-    name: coturn-udp-49299
-    targetPort: 49299
-  - protocol: UDP
-    port: 49300
-    name: coturn-udp-49300
-    targetPort: 49300
-  - protocol: UDP
-    port: 49301
-    name: coturn-udp-49301
-    targetPort: 49301
-  - protocol: UDP
-    port: 49302
-    name: coturn-udp-49302
-    targetPort: 49302
-  - protocol: UDP
-    port: 49303
-    name: coturn-udp-49303
-    targetPort: 49303
-  - protocol: UDP
-    port: 49304
-    name: coturn-udp-49304
-    targetPort: 49304
-  - protocol: UDP
-    port: 49305
-    name: coturn-udp-49305
-    targetPort: 49305
-  - protocol: UDP
-    port: 49306
-    name: coturn-udp-49306
-    targetPort: 49306
-  - protocol: UDP
-    port: 49307
-    name: coturn-udp-49307
-    targetPort: 49307
-  - protocol: UDP
-    port: 49308
-    name: coturn-udp-49308
-    targetPort: 49308
-  - protocol: UDP
-    port: 49309
-    name: coturn-udp-49309
-    targetPort: 49309
-  - protocol: UDP
-    port: 49310
-    name: coturn-udp-49310
-    targetPort: 49310
-  - protocol: UDP
-    port: 49311
-    name: coturn-udp-49311
-    targetPort: 49311
-  - protocol: UDP
-    port: 49312
-    name: coturn-udp-49312
-    targetPort: 49312
-  - protocol: UDP
-    port: 49313
-    name: coturn-udp-49313
-    targetPort: 49313
-  - protocol: UDP
-    port: 49314
-    name: coturn-udp-49314
-    targetPort: 49314
-  - protocol: UDP
-    port: 49315
-    name: coturn-udp-49315
-    targetPort: 49315
-  - protocol: UDP
-    port: 49316
-    name: coturn-udp-49316
-    targetPort: 49316
-  - protocol: UDP
-    port: 49317
-    name: coturn-udp-49317
-    targetPort: 49317
-  - protocol: UDP
-    port: 49318
-    name: coturn-udp-49318
-    targetPort: 49318
-  - protocol: UDP
-    port: 49319
-    name: coturn-udp-49319
-    targetPort: 49319
-  - protocol: UDP
-    port: 49320
-    name: coturn-udp-49320
-    targetPort: 49320
-  - protocol: UDP
-    port: 49321
-    name: coturn-udp-49321
-    targetPort: 49321
-  - protocol: UDP
-    port: 49322
-    name: coturn-udp-49322
-    targetPort: 49322
-  - protocol: UDP
-    port: 49323
-    name: coturn-udp-49323
-    targetPort: 49323
-  - protocol: UDP
-    port: 49324
-    name: coturn-udp-49324
-    targetPort: 49324
-  - protocol: UDP
-    port: 49325
-    name: coturn-udp-49325
-    targetPort: 49325
-  - protocol: UDP
-    port: 49326
-    name: coturn-udp-49326
-    targetPort: 49326
-  - protocol: UDP
-    port: 49327
-    name: coturn-udp-49327
-    targetPort: 49327
-  - protocol: UDP
-    port: 49328
-    name: coturn-udp-49328
-    targetPort: 49328
-  - protocol: UDP
-    port: 49329
-    name: coturn-udp-49329
-    targetPort: 49329
-  - protocol: UDP
-    port: 49330
-    name: coturn-udp-49330
-    targetPort: 49330
-  - protocol: UDP
-    port: 49331
-    name: coturn-udp-49331
-    targetPort: 49331
-  - protocol: UDP
-    port: 49332
-    name: coturn-udp-49332
-    targetPort: 49332
-  - protocol: UDP
-    port: 49333
-    name: coturn-udp-49333
-    targetPort: 49333
-  - protocol: UDP
-    port: 49334
-    name: coturn-udp-49334
-    targetPort: 49334
-  - protocol: UDP
-    port: 49335
-    name: coturn-udp-49335
-    targetPort: 49335
-  - protocol: UDP
-    port: 49336
-    name: coturn-udp-49336
-    targetPort: 49336
-  - protocol: UDP
-    port: 49337
-    name: coturn-udp-49337
-    targetPort: 49337
-  - protocol: UDP
-    port: 49338
-    name: coturn-udp-49338
-    targetPort: 49338
-  - protocol: UDP
-    port: 49339
-    name: coturn-udp-49339
-    targetPort: 49339
-  - protocol: UDP
-    port: 49340
-    name: coturn-udp-49340
-    targetPort: 49340
-  - protocol: UDP
-    port: 49341
-    name: coturn-udp-49341
-    targetPort: 49341
-  - protocol: UDP
-    port: 49342
-    name: coturn-udp-49342
-    targetPort: 49342
-  - protocol: UDP
-    port: 49343
-    name: coturn-udp-49343
-    targetPort: 49343
-  - protocol: UDP
-    port: 49344
-    name: coturn-udp-49344
-    targetPort: 49344
-  - protocol: UDP
-    port: 49345
-    name: coturn-udp-49345
-    targetPort: 49345
-  - protocol: UDP
-    port: 49346
-    name: coturn-udp-49346
-    targetPort: 49346
-  - protocol: UDP
-    port: 49347
-    name: coturn-udp-49347
-    targetPort: 49347
-  - protocol: UDP
-    port: 49348
-    name: coturn-udp-49348
-    targetPort: 49348
-  - protocol: UDP
-    port: 49349
-    name: coturn-udp-49349
-    targetPort: 49349
-  - protocol: UDP
-    port: 49350
-    name: coturn-udp-49350
-    targetPort: 49350
-  - protocol: UDP
-    port: 49351
-    name: coturn-udp-49351
-    targetPort: 49351
-  - protocol: UDP
-    port: 49352
-    name: coturn-udp-49352
-    targetPort: 49352
-  selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  type: NodePort
-  externalIPs:
-    - 170.187.189.92
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
-spec:
-  minReadySeconds: 0
-  revisionHistoryLimit: 10
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: controller
-      app.kubernetes.io/instance: ingress-nginx
-      app.kubernetes.io/name: ingress-nginx
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: controller
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.7.1
-    spec:
-      containers:
-      - args:
-        - /nginx-ingress-controller
-        - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
-        - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
-        - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
-        - --election-id=ingress-nginx-leader
-        - --controller-class=k8s.io/ingress-nginx
-        - --ingress-class=nginx
-        - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: LD_PRELOAD
-          value: /usr/local/lib/libmimalloc.so
-        image: registry.k8s.io/ingress-nginx/controller:v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
-        imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        name: controller
-        ports:
-        - containerPort: 80
-          name: http
-          protocol: TCP
-        - containerPort: 443
-          name: https
-          protocol: TCP
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        resources:
-          requests:
-            cpu: 100m
-            memory: 90Mi
-        securityContext:
-          allowPrivilegeEscalation: true
-          capabilities:
-            add:
-            - NET_BIND_SERVICE
-            drop:
-            - ALL
-          runAsUser: 101
-      dnsPolicy: ClusterFirst
-      nodeSelector:
-        kubernetes.io/os: linux
-      serviceAccountName: ingress-nginx
-      terminationGracePeriodSeconds: 300
----
-
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: nginx
-spec:
-  controller: k8s.io/ingress-nginx
diff --git a/kubernetes/terraform/helm/charts/certmanager/Chart.yaml b/kubernetes/terraform/helm/charts/certmanager/Chart.yaml
new file mode 100644
index 000000000..362640da0
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/certmanager/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: certmanager
+description: this chart automatically generates and updates ssl certificates from letsencrypt
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
new file mode 100644
index 000000000..0011ce33b
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
@@ -0,0 +1,15 @@
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: pychat-domain
+  namespace: pychat
+spec:
+  secretName: pychat-tls
+  issuerRef:
+    name: letsencrypt-prod
+
+  duration: 2160h # 90d
+  renewBefore: 720h # 30d before SSL will expire, renew it
+  dnsNames:
+    - {{ .Values.domain }}
+    - "static.{{ .Values.domain }}"
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/issues.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/issues.yaml
new file mode 100644
index 000000000..ff45d8aca
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/issues.yaml
@@ -0,0 +1,18 @@
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: letsencrypt-prod
+  namespace: pychat
+spec:
+  acme:
+    email: {{ .Values.email }}
+    server: https://acme-v02.api.letsencrypt.org/directory
+    privateKeySecretRef:
+      name: letsencrypt-prod
+    solvers:
+    - dns01:
+        cloudflare:
+          email: {{ .Values.email }}
+          apiTokenSecretRef:
+            name: cloudflare-api-token-secret
+            key: api-token
diff --git a/kubernetes/terraform/helm/charts/certmanager/values.yaml b/kubernetes/terraform/helm/charts/certmanager/values.yaml
new file mode 100644
index 000000000..66d152304
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/certmanager/values.yaml
@@ -0,0 +1,2 @@
+email: "deathangel908@gmail.com"
+domain: "pychat.org"
diff --git a/kubernetes/terraform/helm/charts/ingress/Chart.yaml b/kubernetes/terraform/helm/charts/ingress/Chart.yaml
new file mode 100644
index 000000000..9e385c2a7
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: ingress
+description: nginx ingress edge proxy and load balancer
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/cluster-role-binding.yaml b/kubernetes/terraform/helm/charts/ingress/templates/cluster-role-binding.yaml
new file mode 100644
index 000000000..85d7a799d
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/cluster-role-binding.yaml
@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ingress-nginx
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx
+  namespace: ingress-nginx
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/cluster-role.yaml b/kubernetes/terraform/helm/charts/ingress/templates/cluster-role.yaml
new file mode 100644
index 000000000..5340c4339
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/cluster-role.yaml
@@ -0,0 +1,80 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - endpoints
+  - nodes
+  - pods
+  - secrets
+  - namespaces
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - update
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - list
+  - watch
+  - get
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/cm.yaml b/kubernetes/terraform/helm/charts/ingress/templates/cm.yaml
new file mode 100644
index 000000000..d1d31495a
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/cm.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+data:
+  allow-snippet-annotations: "true"
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/deployment.yaml b/kubernetes/terraform/helm/charts/ingress/templates/deployment.yaml
new file mode 100644
index 000000000..6baf5dd0d
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/deployment.yaml
@@ -0,0 +1,101 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+spec:
+  minReadySeconds: 0
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: controller
+      app.kubernetes.io/instance: ingress-nginx
+      app.kubernetes.io/name: ingress-nginx
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: controller
+        app.kubernetes.io/instance: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
+        app.kubernetes.io/part-of: ingress-nginx
+        app.kubernetes.io/version: 1.7.1
+    spec:
+      containers:
+      - args:
+        - /nginx-ingress-controller
+        - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
+        - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
+        - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
+        - --election-id=ingress-nginx-leader
+        - --controller-class=k8s.io/ingress-nginx
+        - --ingress-class=nginx
+        - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: LD_PRELOAD
+          value: /usr/local/lib/libmimalloc.so
+        image: registry.k8s.io/ingress-nginx/controller:v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
+        imagePullPolicy: IfNotPresent
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - /wait-shutdown
+        livenessProbe:
+          failureThreshold: 5
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+        name: controller
+        ports:
+        - containerPort: 80
+          name: http
+          protocol: TCP
+        - containerPort: 443
+          name: https
+          protocol: TCP
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+        resources:
+          requests:
+            cpu: 100m
+            memory: 90Mi
+        securityContext:
+          allowPrivilegeEscalation: true
+          capabilities:
+            add:
+            - NET_BIND_SERVICE
+            drop:
+            - ALL
+          runAsUser: 101
+      dnsPolicy: ClusterFirst
+      nodeSelector:
+        kubernetes.io/os: linux
+      serviceAccountName: ingress-nginx
+      terminationGracePeriodSeconds: 300
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress-class.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress-class.yaml
new file mode 100644
index 000000000..6cfb5fb97
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress-class.yaml
@@ -0,0 +1,12 @@
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: nginx
+spec:
+  controller: k8s.io/ingress-nginx
diff --git a/kubernetes/ingress.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
similarity index 88%
rename from kubernetes/ingress.yaml
rename to kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
index be75101c0..2a8d51d08 100644
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
@@ -10,8 +10,8 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-    - pychat.org
-    - static.pychat.org
+    - {{ .Values.domain }}
+    - "static.{{ .Values.domain }}"
     secretName: pychat-tls
   defaultBackend:
     service:
@@ -19,7 +19,7 @@ spec:
       port:
         number: 80
   rules:
-  - host: static.pychat.org
+  - host: "static.{{ .Values.domain }}"
     http:
       paths:
       - path: /
@@ -29,7 +29,7 @@ spec:
             name: frontend-service
             port:
               number: 80
-  - host: pychat.org
+  - host: {{ .Values.domain }}
     http:
       paths:
       - path: /api
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ns.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ns.yaml
new file mode 100644
index 000000000..cc2bc3dae
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ns.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+  name: ingress-nginx
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/role-binding.yaml b/kubernetes/terraform/helm/charts/ingress/templates/role-binding.yaml
new file mode 100644
index 000000000..ef7bb5b36
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/role-binding.yaml
@@ -0,0 +1,20 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: ingress-nginx
+subjects:
+- kind: ServiceAccount
+  name: ingress-nginx
+  namespace: ingress-nginx
+---
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/role.yaml b/kubernetes/terraform/helm/charts/ingress/templates/role.yaml
new file mode 100644
index 000000000..8cce109eb
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/role.yaml
@@ -0,0 +1,89 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - pods
+  - secrets
+  - endpoints
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses/status
+  verbs:
+  - update
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingressclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - coordination.k8s.io
+  resourceNames:
+  - ingress-nginx-leader
+  resources:
+  - leases
+  verbs:
+  - get
+  - update
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - list
+  - watch
+  - get
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/sa.yaml b/kubernetes/terraform/helm/charts/ingress/templates/sa.yaml
new file mode 100644
index 000000000..3635bfa50
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/sa.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+automountServiceAccountToken: true
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx
+  namespace: ingress-nginx
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/service.yaml b/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
new file mode 100644
index 000000000..3d62066c6
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
@@ -0,0 +1,56 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+    app.kubernetes.io/version: 1.7.1
+  name: ingress-nginx-controller
+  namespace: ingress-nginx
+spec:
+  externalTrafficPolicy: Cluster
+  ipFamilies:
+  - IPv4
+  ipFamilyPolicy: SingleStack
+  ports:
+  - appProtocol: http
+    name: http
+    port: 80
+    protocol: TCP
+    targetPort: http
+  - appProtocol: https
+    name: https
+    port: 443
+    protocol: TCP
+    targetPort: https
+  - name: proxied-tcp-5349
+    port: 5349
+    targetPort: 5349
+    protocol: TCP
+  - name: proxied-tcp-3478
+    port: 3478
+    targetPort: 3478
+    protocol: TCP
+  - name: proxied-udp-5349
+    port: 5349
+    targetPort: 5349
+    protocol: UDP
+  - name: proxied-udp-3478
+    port: 3478
+    targetPort: 3478
+    protocol: UDP
+{{ $portGen:= untilStep (.Values.udp_port_range_start | int) ( .Values.udp_port_range_end | int) 1 }} {{ range $index, $port := $portGen }}
+  - protocol: UDP
+    port: {{ $port }}
+    name: coturn-udp-{{ $port }}
+    targetPort: {{ $port }}
+   {{- end }}
+  selector:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+  type: NodePort
+  externalIPs:
+    - {{ .Values.external_ip }}
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/tcp-cm.yaml b/kubernetes/terraform/helm/charts/ingress/templates/tcp-cm.yaml
new file mode 100644
index 000000000..e600731d7
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/tcp-cm.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: tcp-services
+  namespace: ingress-nginx
+data:
+#  25: "pychat/postfix-service:25"
+#  587: "pychat/postfix-service:587"
+#  465: "pychat/postfix-service:465"
+  3478: "pychat/coturn-service:3478"
+  5349: "pychat/coturn-service:5349"
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/udp-cm.yaml b/kubernetes/terraform/helm/charts/ingress/templates/udp-cm.yaml
new file mode 100644
index 000000000..317e549f0
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/templates/udp-cm.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: udp-services
+  namespace: ingress-nginx
+data:
+  3478: "pychat/coturn-service:3478"
+  5349: "pychat/coturn-service:5349"
+{{ $portGen:= untilStep (.Values.udp_port_range_start | int) ( .Values.udp_port_range_end | int) 1 }} {{ range $index, $port := $portGen }}
+  {{ $port }}: "pychat/coturn-service:{{ $port }}"
+   {{- end }}
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
new file mode 100644
index 000000000..57f9132d2
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -0,0 +1,4 @@
+domain: "pychat.org"
+udp_port_range_start: 49152
+udp_port_range_end: 49252
+external_ip: "170.187.189.92"
diff --git a/kubernetes/terraform/helm/charts/postfix/Chart.yaml b/kubernetes/terraform/helm/charts/postfix/Chart.yaml
new file mode 100644
index 000000000..b41dd3c22
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/postfix/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: postfix
+description: email sender server
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/postfix.yaml b/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
similarity index 69%
rename from kubernetes/postfix.yaml
rename to kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
index e21aeef33..037a51e0e 100644
--- a/kubernetes/postfix.yaml
+++ b/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
@@ -26,23 +26,9 @@ spec:
                 path: key.pem
       containers:
         - name: postfix
-          imagePullPolicy: Always
-          image: deathangel908/pychat-postfix
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
           volumeMounts:
           - name: pychat-postfix-tls
             mountPath: "/etc/tls"
             readOnly: true
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: postfix-service
-  namespace: pychat
-spec:
-  selector:
-    app: postfix
-  ports:
-    - protocol: TCP
-      port: 25
-      name: smtp-tls
-      targetPort: 25
diff --git a/kubernetes/terraform/helm/charts/postfix/templates/service.yaml b/kubernetes/terraform/helm/charts/postfix/templates/service.yaml
new file mode 100644
index 000000000..3c43fd323
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/postfix/templates/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: postfix-service
+  namespace: pychat
+spec:
+  selector:
+    app: postfix
+  ports:
+    - protocol: TCP
+      port: 25
+      name: smtp-tls
+      targetPort: 25
diff --git a/kubernetes/terraform/helm/charts/postfix/values.yaml b/kubernetes/terraform/helm/charts/postfix/values.yaml
new file mode 100644
index 000000000..ba19bb924
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/postfix/values.yaml
@@ -0,0 +1,4 @@
+image:
+  repository_path: deathangel908/pychat-postfix
+  pullPolicy: Always # change to IfNotPresent for minikube
+  tag: "latest"

From f99b84809a3f06f6a95746534b79e1e0f1b7e238 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 26 May 2023 21:22:09 +0300
Subject: [PATCH 174/221] Moved all helm to charts

---
 ...troller-legacy-provider-load-balancer.yaml | 1692 -----------------
 kubernetes/terraform/helm/.helmignore         |    2 +
 .../helm/charts/backend/templates/cm.yaml}    |    4 +-
 .../charts/backend/templates/config-map.yaml  |   13 -
 .../charts/backend/templates/deployment.yaml  |    2 +-
 .../charts/backend/templates/migrate.yaml}    |    6 +-
 .../terraform/helm/charts/backend/values.yaml |    2 +
 .../templates}/self-signed-certificate.yaml   |    0
 .../terraform/helm/charts/global/Chart.yaml   |    6 +
 .../helm/charts/global/templates/ns.yaml}     |    0
 .../helm/charts/mariadb/templates/cm.yaml     |    9 +
 .../terraform/helm/charts/mariadb/values.yaml |    1 +
 12 files changed, 26 insertions(+), 1711 deletions(-)
 delete mode 100644 kubernetes/ingress-controller-legacy-provider-load-balancer.yaml
 create mode 100644 kubernetes/terraform/helm/.helmignore
 rename kubernetes/{config-map.yaml => terraform/helm/charts/backend/templates/cm.yaml} (72%)
 delete mode 100644 kubernetes/terraform/helm/charts/backend/templates/config-map.yaml
 rename kubernetes/{migrate-backend.yaml => terraform/helm/charts/backend/templates/migrate.yaml} (67%)
 rename kubernetes/{ => terraform/helm/charts/certmanager/templates}/self-signed-certificate.yaml (100%)
 create mode 100644 kubernetes/terraform/helm/charts/global/Chart.yaml
 rename kubernetes/{namespace.yaml => terraform/helm/charts/global/templates/ns.yaml} (100%)
 create mode 100644 kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml

diff --git a/kubernetes/ingress-controller-legacy-provider-load-balancer.yaml b/kubernetes/ingress-controller-legacy-provider-load-balancer.yaml
deleted file mode 100644
index 341a37c30..000000000
--- a/kubernetes/ingress-controller-legacy-provider-load-balancer.yaml
+++ /dev/null
@@ -1,1692 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  name: ingress-nginx
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: tcp-services
-  namespace: ingress-nginx
-data:
-#  25: "pychat/postfix-service:25"
-#  587: "pychat/postfix-service:587"
-#  465: "pychat/postfix-service:465"
-  3478: "pychat/coturn-service:3478"
-  5349: "pychat/coturn-service:5349"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: udp-services
-  namespace: ingress-nginx
-data:
-  #for (let i = 49152; i < 49353; i++) {
-  #console.log(`  ${i}: "pychat/coturn-service:${i}"`)
-  #}
-  3478: "pychat/coturn-service:3478"
-  5349: "pychat/coturn-service:5349"
-  49152: "pychat/coturn-service:49152"
-  49153: "pychat/coturn-service:49153"
-  49154: "pychat/coturn-service:49154"
-  49155: "pychat/coturn-service:49155"
-  49156: "pychat/coturn-service:49156"
-  49157: "pychat/coturn-service:49157"
-  49158: "pychat/coturn-service:49158"
-  49159: "pychat/coturn-service:49159"
-  49160: "pychat/coturn-service:49160"
-  49161: "pychat/coturn-service:49161"
-  49162: "pychat/coturn-service:49162"
-  49163: "pychat/coturn-service:49163"
-  49164: "pychat/coturn-service:49164"
-  49165: "pychat/coturn-service:49165"
-  49166: "pychat/coturn-service:49166"
-  49167: "pychat/coturn-service:49167"
-  49168: "pychat/coturn-service:49168"
-  49169: "pychat/coturn-service:49169"
-  49170: "pychat/coturn-service:49170"
-  49171: "pychat/coturn-service:49171"
-  49172: "pychat/coturn-service:49172"
-  49173: "pychat/coturn-service:49173"
-  49174: "pychat/coturn-service:49174"
-  49175: "pychat/coturn-service:49175"
-  49176: "pychat/coturn-service:49176"
-  49177: "pychat/coturn-service:49177"
-  49178: "pychat/coturn-service:49178"
-  49179: "pychat/coturn-service:49179"
-  49180: "pychat/coturn-service:49180"
-  49181: "pychat/coturn-service:49181"
-  49182: "pychat/coturn-service:49182"
-  49183: "pychat/coturn-service:49183"
-  49184: "pychat/coturn-service:49184"
-  49185: "pychat/coturn-service:49185"
-  49186: "pychat/coturn-service:49186"
-  49187: "pychat/coturn-service:49187"
-  49188: "pychat/coturn-service:49188"
-  49189: "pychat/coturn-service:49189"
-  49190: "pychat/coturn-service:49190"
-  49191: "pychat/coturn-service:49191"
-  49192: "pychat/coturn-service:49192"
-  49193: "pychat/coturn-service:49193"
-  49194: "pychat/coturn-service:49194"
-  49195: "pychat/coturn-service:49195"
-  49196: "pychat/coturn-service:49196"
-  49197: "pychat/coturn-service:49197"
-  49198: "pychat/coturn-service:49198"
-  49199: "pychat/coturn-service:49199"
-  49200: "pychat/coturn-service:49200"
-  49201: "pychat/coturn-service:49201"
-  49202: "pychat/coturn-service:49202"
-  49203: "pychat/coturn-service:49203"
-  49204: "pychat/coturn-service:49204"
-  49205: "pychat/coturn-service:49205"
-  49206: "pychat/coturn-service:49206"
-  49207: "pychat/coturn-service:49207"
-  49208: "pychat/coturn-service:49208"
-  49209: "pychat/coturn-service:49209"
-  49210: "pychat/coturn-service:49210"
-  49211: "pychat/coturn-service:49211"
-  49212: "pychat/coturn-service:49212"
-  49213: "pychat/coturn-service:49213"
-  49214: "pychat/coturn-service:49214"
-  49215: "pychat/coturn-service:49215"
-  49216: "pychat/coturn-service:49216"
-  49217: "pychat/coturn-service:49217"
-  49218: "pychat/coturn-service:49218"
-  49219: "pychat/coturn-service:49219"
-  49220: "pychat/coturn-service:49220"
-  49221: "pychat/coturn-service:49221"
-  49222: "pychat/coturn-service:49222"
-  49223: "pychat/coturn-service:49223"
-  49224: "pychat/coturn-service:49224"
-  49225: "pychat/coturn-service:49225"
-  49226: "pychat/coturn-service:49226"
-  49227: "pychat/coturn-service:49227"
-  49228: "pychat/coturn-service:49228"
-  49229: "pychat/coturn-service:49229"
-  49230: "pychat/coturn-service:49230"
-  49231: "pychat/coturn-service:49231"
-  49232: "pychat/coturn-service:49232"
-  49233: "pychat/coturn-service:49233"
-  49234: "pychat/coturn-service:49234"
-  49235: "pychat/coturn-service:49235"
-  49236: "pychat/coturn-service:49236"
-  49237: "pychat/coturn-service:49237"
-  49238: "pychat/coturn-service:49238"
-  49239: "pychat/coturn-service:49239"
-  49240: "pychat/coturn-service:49240"
-  49241: "pychat/coturn-service:49241"
-  49242: "pychat/coturn-service:49242"
-  49243: "pychat/coturn-service:49243"
-  49244: "pychat/coturn-service:49244"
-  49245: "pychat/coturn-service:49245"
-  49246: "pychat/coturn-service:49246"
-  49247: "pychat/coturn-service:49247"
-  49248: "pychat/coturn-service:49248"
-  49249: "pychat/coturn-service:49249"
-  49250: "pychat/coturn-service:49250"
-  49251: "pychat/coturn-service:49251"
-  49252: "pychat/coturn-service:49252"
-  49253: "pychat/coturn-service:49253"
-  49254: "pychat/coturn-service:49254"
-  49255: "pychat/coturn-service:49255"
-  49256: "pychat/coturn-service:49256"
-  49257: "pychat/coturn-service:49257"
-  49258: "pychat/coturn-service:49258"
-  49259: "pychat/coturn-service:49259"
-  49260: "pychat/coturn-service:49260"
-  49261: "pychat/coturn-service:49261"
-  49262: "pychat/coturn-service:49262"
-  49263: "pychat/coturn-service:49263"
-  49264: "pychat/coturn-service:49264"
-  49265: "pychat/coturn-service:49265"
-  49266: "pychat/coturn-service:49266"
-  49267: "pychat/coturn-service:49267"
-  49268: "pychat/coturn-service:49268"
-  49269: "pychat/coturn-service:49269"
-  49270: "pychat/coturn-service:49270"
-  49271: "pychat/coturn-service:49271"
-  49272: "pychat/coturn-service:49272"
-  49273: "pychat/coturn-service:49273"
-  49274: "pychat/coturn-service:49274"
-  49275: "pychat/coturn-service:49275"
-  49276: "pychat/coturn-service:49276"
-  49277: "pychat/coturn-service:49277"
-  49278: "pychat/coturn-service:49278"
-  49279: "pychat/coturn-service:49279"
-  49280: "pychat/coturn-service:49280"
-  49281: "pychat/coturn-service:49281"
-  49282: "pychat/coturn-service:49282"
-  49283: "pychat/coturn-service:49283"
-  49284: "pychat/coturn-service:49284"
-  49285: "pychat/coturn-service:49285"
-  49286: "pychat/coturn-service:49286"
-  49287: "pychat/coturn-service:49287"
-  49288: "pychat/coturn-service:49288"
-  49289: "pychat/coturn-service:49289"
-  49290: "pychat/coturn-service:49290"
-  49291: "pychat/coturn-service:49291"
-  49292: "pychat/coturn-service:49292"
-  49293: "pychat/coturn-service:49293"
-  49294: "pychat/coturn-service:49294"
-  49295: "pychat/coturn-service:49295"
-  49296: "pychat/coturn-service:49296"
-  49297: "pychat/coturn-service:49297"
-  49298: "pychat/coturn-service:49298"
-  49299: "pychat/coturn-service:49299"
-  49300: "pychat/coturn-service:49300"
-  49301: "pychat/coturn-service:49301"
-  49302: "pychat/coturn-service:49302"
-  49303: "pychat/coturn-service:49303"
-  49304: "pychat/coturn-service:49304"
-  49305: "pychat/coturn-service:49305"
-  49306: "pychat/coturn-service:49306"
-  49307: "pychat/coturn-service:49307"
-  49308: "pychat/coturn-service:49308"
-  49309: "pychat/coturn-service:49309"
-  49310: "pychat/coturn-service:49310"
-  49311: "pychat/coturn-service:49311"
-  49312: "pychat/coturn-service:49312"
-  49313: "pychat/coturn-service:49313"
-  49314: "pychat/coturn-service:49314"
-  49315: "pychat/coturn-service:49315"
-  49316: "pychat/coturn-service:49316"
-  49317: "pychat/coturn-service:49317"
-  49318: "pychat/coturn-service:49318"
-  49319: "pychat/coturn-service:49319"
-  49320: "pychat/coturn-service:49320"
-  49321: "pychat/coturn-service:49321"
-  49322: "pychat/coturn-service:49322"
-  49323: "pychat/coturn-service:49323"
-  49324: "pychat/coturn-service:49324"
-  49325: "pychat/coturn-service:49325"
-  49326: "pychat/coturn-service:49326"
-  49327: "pychat/coturn-service:49327"
-  49328: "pychat/coturn-service:49328"
-  49329: "pychat/coturn-service:49329"
-  49330: "pychat/coturn-service:49330"
-  49331: "pychat/coturn-service:49331"
-  49332: "pychat/coturn-service:49332"
-  49333: "pychat/coturn-service:49333"
-  49334: "pychat/coturn-service:49334"
-  49335: "pychat/coturn-service:49335"
-  49336: "pychat/coturn-service:49336"
-  49337: "pychat/coturn-service:49337"
-  49338: "pychat/coturn-service:49338"
-  49339: "pychat/coturn-service:49339"
-  49340: "pychat/coturn-service:49340"
-  49341: "pychat/coturn-service:49341"
-  49342: "pychat/coturn-service:49342"
-  49343: "pychat/coturn-service:49343"
-  49344: "pychat/coturn-service:49344"
-  49345: "pychat/coturn-service:49345"
-  49346: "pychat/coturn-service:49346"
-  49347: "pychat/coturn-service:49347"
-  49348: "pychat/coturn-service:49348"
-  49349: "pychat/coturn-service:49349"
-  49350: "pychat/coturn-service:49350"
-  49351: "pychat/coturn-service:49351"
-  49352: "pychat/coturn-service:49352"
----
-apiVersion: v1
-automountServiceAccountToken: true
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-  namespace: ingress-nginx
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-  namespace: ingress-nginx
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - pods
-  - secrets
-  - endpoints
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - update
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingressclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - coordination.k8s.io
-  resourceNames:
-  - ingress-nginx-leader
-  resources:
-  - leases
-  verbs:
-  - get
-  - update
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - list
-  - watch
-  - get
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - create
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - endpoints
-  - nodes
-  - pods
-  - secrets
-  - namespaces
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - update
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingressclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - discovery.k8s.io
-  resources:
-  - endpointslices
-  verbs:
-  - list
-  - watch
-  - get
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-rules:
-- apiGroups:
-  - admissionregistration.k8s.io
-  resources:
-  - validatingwebhookconfigurations
-  verbs:
-  - get
-  - update
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-  namespace: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: ingress-nginx
-subjects:
-- kind: ServiceAccount
-  name: ingress-nginx
-  namespace: ingress-nginx
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: ingress-nginx-admission
-subjects:
-- kind: ServiceAccount
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: ingress-nginx
-subjects:
-- kind: ServiceAccount
-  name: ingress-nginx
-  namespace: ingress-nginx
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: ingress-nginx-admission
-subjects:
-- kind: ServiceAccount
-  name: ingress-nginx-admission
-  namespace: ingress-nginx
----
-apiVersion: v1
-data:
-  allow-snippet-annotations: "true"
-kind: ConfigMap
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
-spec:
-  externalTrafficPolicy: Local
-  ipFamilies:
-  - IPv4
-  ipFamilyPolicy: SingleStack
-  ports:
-  - appProtocol: http
-    name: http
-    port: 80
-    protocol: TCP
-    targetPort: http
-  - appProtocol: https
-    name: https
-    port: 443
-    protocol: TCP
-    targetPort: https
-  - name: proxied-tcp-5349
-    port: 5349
-    targetPort: 5349
-    protocol: TCP
-  - name: proxied-tcp-3478
-    port: 3478
-    targetPort: 3478
-    protocol: TCP
-  - name: proxied-udp-5349
-    port: 5349
-    targetPort: 5349
-    protocol: UDP
-  - name: proxied-udp-3478
-    port: 3478
-    targetPort: 3478
-    protocol: UDP
-  - protocol: UDP
-    port: 49152
-    name: coturn-udp-49152
-    targetPort: 49152
-  - protocol: UDP
-    port: 49153
-    name: coturn-udp-49153
-    targetPort: 49153
-  - protocol: UDP
-    port: 49154
-    name: coturn-udp-49154
-    targetPort: 49154
-  - protocol: UDP
-    port: 49155
-    name: coturn-udp-49155
-    targetPort: 49155
-  - protocol: UDP
-    port: 49156
-    name: coturn-udp-49156
-    targetPort: 49156
-  - protocol: UDP
-    port: 49157
-    name: coturn-udp-49157
-    targetPort: 49157
-  - protocol: UDP
-    port: 49158
-    name: coturn-udp-49158
-    targetPort: 49158
-  - protocol: UDP
-    port: 49159
-    name: coturn-udp-49159
-    targetPort: 49159
-  - protocol: UDP
-    port: 49160
-    name: coturn-udp-49160
-    targetPort: 49160
-  - protocol: UDP
-    port: 49161
-    name: coturn-udp-49161
-    targetPort: 49161
-  - protocol: UDP
-    port: 49162
-    name: coturn-udp-49162
-    targetPort: 49162
-  - protocol: UDP
-    port: 49163
-    name: coturn-udp-49163
-    targetPort: 49163
-  - protocol: UDP
-    port: 49164
-    name: coturn-udp-49164
-    targetPort: 49164
-  - protocol: UDP
-    port: 49165
-    name: coturn-udp-49165
-    targetPort: 49165
-  - protocol: UDP
-    port: 49166
-    name: coturn-udp-49166
-    targetPort: 49166
-  - protocol: UDP
-    port: 49167
-    name: coturn-udp-49167
-    targetPort: 49167
-  - protocol: UDP
-    port: 49168
-    name: coturn-udp-49168
-    targetPort: 49168
-  - protocol: UDP
-    port: 49169
-    name: coturn-udp-49169
-    targetPort: 49169
-  - protocol: UDP
-    port: 49170
-    name: coturn-udp-49170
-    targetPort: 49170
-  - protocol: UDP
-    port: 49171
-    name: coturn-udp-49171
-    targetPort: 49171
-  - protocol: UDP
-    port: 49172
-    name: coturn-udp-49172
-    targetPort: 49172
-  - protocol: UDP
-    port: 49173
-    name: coturn-udp-49173
-    targetPort: 49173
-  - protocol: UDP
-    port: 49174
-    name: coturn-udp-49174
-    targetPort: 49174
-  - protocol: UDP
-    port: 49175
-    name: coturn-udp-49175
-    targetPort: 49175
-  - protocol: UDP
-    port: 49176
-    name: coturn-udp-49176
-    targetPort: 49176
-  - protocol: UDP
-    port: 49177
-    name: coturn-udp-49177
-    targetPort: 49177
-  - protocol: UDP
-    port: 49178
-    name: coturn-udp-49178
-    targetPort: 49178
-  - protocol: UDP
-    port: 49179
-    name: coturn-udp-49179
-    targetPort: 49179
-  - protocol: UDP
-    port: 49180
-    name: coturn-udp-49180
-    targetPort: 49180
-  - protocol: UDP
-    port: 49181
-    name: coturn-udp-49181
-    targetPort: 49181
-  - protocol: UDP
-    port: 49182
-    name: coturn-udp-49182
-    targetPort: 49182
-  - protocol: UDP
-    port: 49183
-    name: coturn-udp-49183
-    targetPort: 49183
-  - protocol: UDP
-    port: 49184
-    name: coturn-udp-49184
-    targetPort: 49184
-  - protocol: UDP
-    port: 49185
-    name: coturn-udp-49185
-    targetPort: 49185
-  - protocol: UDP
-    port: 49186
-    name: coturn-udp-49186
-    targetPort: 49186
-  - protocol: UDP
-    port: 49187
-    name: coturn-udp-49187
-    targetPort: 49187
-  - protocol: UDP
-    port: 49188
-    name: coturn-udp-49188
-    targetPort: 49188
-  - protocol: UDP
-    port: 49189
-    name: coturn-udp-49189
-    targetPort: 49189
-  - protocol: UDP
-    port: 49190
-    name: coturn-udp-49190
-    targetPort: 49190
-  - protocol: UDP
-    port: 49191
-    name: coturn-udp-49191
-    targetPort: 49191
-  - protocol: UDP
-    port: 49192
-    name: coturn-udp-49192
-    targetPort: 49192
-  - protocol: UDP
-    port: 49193
-    name: coturn-udp-49193
-    targetPort: 49193
-  - protocol: UDP
-    port: 49194
-    name: coturn-udp-49194
-    targetPort: 49194
-  - protocol: UDP
-    port: 49195
-    name: coturn-udp-49195
-    targetPort: 49195
-  - protocol: UDP
-    port: 49196
-    name: coturn-udp-49196
-    targetPort: 49196
-  - protocol: UDP
-    port: 49197
-    name: coturn-udp-49197
-    targetPort: 49197
-  - protocol: UDP
-    port: 49198
-    name: coturn-udp-49198
-    targetPort: 49198
-  - protocol: UDP
-    port: 49199
-    name: coturn-udp-49199
-    targetPort: 49199
-  - protocol: UDP
-    port: 49200
-    name: coturn-udp-49200
-    targetPort: 49200
-  - protocol: UDP
-    port: 49201
-    name: coturn-udp-49201
-    targetPort: 49201
-  - protocol: UDP
-    port: 49202
-    name: coturn-udp-49202
-    targetPort: 49202
-  - protocol: UDP
-    port: 49203
-    name: coturn-udp-49203
-    targetPort: 49203
-  - protocol: UDP
-    port: 49204
-    name: coturn-udp-49204
-    targetPort: 49204
-  - protocol: UDP
-    port: 49205
-    name: coturn-udp-49205
-    targetPort: 49205
-  - protocol: UDP
-    port: 49206
-    name: coturn-udp-49206
-    targetPort: 49206
-  - protocol: UDP
-    port: 49207
-    name: coturn-udp-49207
-    targetPort: 49207
-  - protocol: UDP
-    port: 49208
-    name: coturn-udp-49208
-    targetPort: 49208
-  - protocol: UDP
-    port: 49209
-    name: coturn-udp-49209
-    targetPort: 49209
-  - protocol: UDP
-    port: 49210
-    name: coturn-udp-49210
-    targetPort: 49210
-  - protocol: UDP
-    port: 49211
-    name: coturn-udp-49211
-    targetPort: 49211
-  - protocol: UDP
-    port: 49212
-    name: coturn-udp-49212
-    targetPort: 49212
-  - protocol: UDP
-    port: 49213
-    name: coturn-udp-49213
-    targetPort: 49213
-  - protocol: UDP
-    port: 49214
-    name: coturn-udp-49214
-    targetPort: 49214
-  - protocol: UDP
-    port: 49215
-    name: coturn-udp-49215
-    targetPort: 49215
-  - protocol: UDP
-    port: 49216
-    name: coturn-udp-49216
-    targetPort: 49216
-  - protocol: UDP
-    port: 49217
-    name: coturn-udp-49217
-    targetPort: 49217
-  - protocol: UDP
-    port: 49218
-    name: coturn-udp-49218
-    targetPort: 49218
-  - protocol: UDP
-    port: 49219
-    name: coturn-udp-49219
-    targetPort: 49219
-  - protocol: UDP
-    port: 49220
-    name: coturn-udp-49220
-    targetPort: 49220
-  - protocol: UDP
-    port: 49221
-    name: coturn-udp-49221
-    targetPort: 49221
-  - protocol: UDP
-    port: 49222
-    name: coturn-udp-49222
-    targetPort: 49222
-  - protocol: UDP
-    port: 49223
-    name: coturn-udp-49223
-    targetPort: 49223
-  - protocol: UDP
-    port: 49224
-    name: coturn-udp-49224
-    targetPort: 49224
-  - protocol: UDP
-    port: 49225
-    name: coturn-udp-49225
-    targetPort: 49225
-  - protocol: UDP
-    port: 49226
-    name: coturn-udp-49226
-    targetPort: 49226
-  - protocol: UDP
-    port: 49227
-    name: coturn-udp-49227
-    targetPort: 49227
-  - protocol: UDP
-    port: 49228
-    name: coturn-udp-49228
-    targetPort: 49228
-  - protocol: UDP
-    port: 49229
-    name: coturn-udp-49229
-    targetPort: 49229
-  - protocol: UDP
-    port: 49230
-    name: coturn-udp-49230
-    targetPort: 49230
-  - protocol: UDP
-    port: 49231
-    name: coturn-udp-49231
-    targetPort: 49231
-  - protocol: UDP
-    port: 49232
-    name: coturn-udp-49232
-    targetPort: 49232
-  - protocol: UDP
-    port: 49233
-    name: coturn-udp-49233
-    targetPort: 49233
-  - protocol: UDP
-    port: 49234
-    name: coturn-udp-49234
-    targetPort: 49234
-  - protocol: UDP
-    port: 49235
-    name: coturn-udp-49235
-    targetPort: 49235
-  - protocol: UDP
-    port: 49236
-    name: coturn-udp-49236
-    targetPort: 49236
-  - protocol: UDP
-    port: 49237
-    name: coturn-udp-49237
-    targetPort: 49237
-  - protocol: UDP
-    port: 49238
-    name: coturn-udp-49238
-    targetPort: 49238
-  - protocol: UDP
-    port: 49239
-    name: coturn-udp-49239
-    targetPort: 49239
-  - protocol: UDP
-    port: 49240
-    name: coturn-udp-49240
-    targetPort: 49240
-  - protocol: UDP
-    port: 49241
-    name: coturn-udp-49241
-    targetPort: 49241
-  - protocol: UDP
-    port: 49242
-    name: coturn-udp-49242
-    targetPort: 49242
-  - protocol: UDP
-    port: 49243
-    name: coturn-udp-49243
-    targetPort: 49243
-  - protocol: UDP
-    port: 49244
-    name: coturn-udp-49244
-    targetPort: 49244
-  - protocol: UDP
-    port: 49245
-    name: coturn-udp-49245
-    targetPort: 49245
-  - protocol: UDP
-    port: 49246
-    name: coturn-udp-49246
-    targetPort: 49246
-  - protocol: UDP
-    port: 49247
-    name: coturn-udp-49247
-    targetPort: 49247
-  - protocol: UDP
-    port: 49248
-    name: coturn-udp-49248
-    targetPort: 49248
-  - protocol: UDP
-    port: 49249
-    name: coturn-udp-49249
-    targetPort: 49249
-  - protocol: UDP
-    port: 49250
-    name: coturn-udp-49250
-    targetPort: 49250
-  - protocol: UDP
-    port: 49251
-    name: coturn-udp-49251
-    targetPort: 49251
-  - protocol: UDP
-    port: 49252
-    name: coturn-udp-49252
-    targetPort: 49252
-  - protocol: UDP
-    port: 49253
-    name: coturn-udp-49253
-    targetPort: 49253
-  - protocol: UDP
-    port: 49254
-    name: coturn-udp-49254
-    targetPort: 49254
-  - protocol: UDP
-    port: 49255
-    name: coturn-udp-49255
-    targetPort: 49255
-  - protocol: UDP
-    port: 49256
-    name: coturn-udp-49256
-    targetPort: 49256
-  - protocol: UDP
-    port: 49257
-    name: coturn-udp-49257
-    targetPort: 49257
-  - protocol: UDP
-    port: 49258
-    name: coturn-udp-49258
-    targetPort: 49258
-  - protocol: UDP
-    port: 49259
-    name: coturn-udp-49259
-    targetPort: 49259
-  - protocol: UDP
-    port: 49260
-    name: coturn-udp-49260
-    targetPort: 49260
-  - protocol: UDP
-    port: 49261
-    name: coturn-udp-49261
-    targetPort: 49261
-  - protocol: UDP
-    port: 49262
-    name: coturn-udp-49262
-    targetPort: 49262
-  - protocol: UDP
-    port: 49263
-    name: coturn-udp-49263
-    targetPort: 49263
-  - protocol: UDP
-    port: 49264
-    name: coturn-udp-49264
-    targetPort: 49264
-  - protocol: UDP
-    port: 49265
-    name: coturn-udp-49265
-    targetPort: 49265
-  - protocol: UDP
-    port: 49266
-    name: coturn-udp-49266
-    targetPort: 49266
-  - protocol: UDP
-    port: 49267
-    name: coturn-udp-49267
-    targetPort: 49267
-  - protocol: UDP
-    port: 49268
-    name: coturn-udp-49268
-    targetPort: 49268
-  - protocol: UDP
-    port: 49269
-    name: coturn-udp-49269
-    targetPort: 49269
-  - protocol: UDP
-    port: 49270
-    name: coturn-udp-49270
-    targetPort: 49270
-  - protocol: UDP
-    port: 49271
-    name: coturn-udp-49271
-    targetPort: 49271
-  - protocol: UDP
-    port: 49272
-    name: coturn-udp-49272
-    targetPort: 49272
-  - protocol: UDP
-    port: 49273
-    name: coturn-udp-49273
-    targetPort: 49273
-  - protocol: UDP
-    port: 49274
-    name: coturn-udp-49274
-    targetPort: 49274
-  - protocol: UDP
-    port: 49275
-    name: coturn-udp-49275
-    targetPort: 49275
-  - protocol: UDP
-    port: 49276
-    name: coturn-udp-49276
-    targetPort: 49276
-  - protocol: UDP
-    port: 49277
-    name: coturn-udp-49277
-    targetPort: 49277
-  - protocol: UDP
-    port: 49278
-    name: coturn-udp-49278
-    targetPort: 49278
-  - protocol: UDP
-    port: 49279
-    name: coturn-udp-49279
-    targetPort: 49279
-  - protocol: UDP
-    port: 49280
-    name: coturn-udp-49280
-    targetPort: 49280
-  - protocol: UDP
-    port: 49281
-    name: coturn-udp-49281
-    targetPort: 49281
-  - protocol: UDP
-    port: 49282
-    name: coturn-udp-49282
-    targetPort: 49282
-  - protocol: UDP
-    port: 49283
-    name: coturn-udp-49283
-    targetPort: 49283
-  - protocol: UDP
-    port: 49284
-    name: coturn-udp-49284
-    targetPort: 49284
-  - protocol: UDP
-    port: 49285
-    name: coturn-udp-49285
-    targetPort: 49285
-  - protocol: UDP
-    port: 49286
-    name: coturn-udp-49286
-    targetPort: 49286
-  - protocol: UDP
-    port: 49287
-    name: coturn-udp-49287
-    targetPort: 49287
-  - protocol: UDP
-    port: 49288
-    name: coturn-udp-49288
-    targetPort: 49288
-  - protocol: UDP
-    port: 49289
-    name: coturn-udp-49289
-    targetPort: 49289
-  - protocol: UDP
-    port: 49290
-    name: coturn-udp-49290
-    targetPort: 49290
-  - protocol: UDP
-    port: 49291
-    name: coturn-udp-49291
-    targetPort: 49291
-  - protocol: UDP
-    port: 49292
-    name: coturn-udp-49292
-    targetPort: 49292
-  - protocol: UDP
-    port: 49293
-    name: coturn-udp-49293
-    targetPort: 49293
-  - protocol: UDP
-    port: 49294
-    name: coturn-udp-49294
-    targetPort: 49294
-  - protocol: UDP
-    port: 49295
-    name: coturn-udp-49295
-    targetPort: 49295
-  - protocol: UDP
-    port: 49296
-    name: coturn-udp-49296
-    targetPort: 49296
-  - protocol: UDP
-    port: 49297
-    name: coturn-udp-49297
-    targetPort: 49297
-  - protocol: UDP
-    port: 49298
-    name: coturn-udp-49298
-    targetPort: 49298
-  - protocol: UDP
-    port: 49299
-    name: coturn-udp-49299
-    targetPort: 49299
-  - protocol: UDP
-    port: 49300
-    name: coturn-udp-49300
-    targetPort: 49300
-  - protocol: UDP
-    port: 49301
-    name: coturn-udp-49301
-    targetPort: 49301
-  - protocol: UDP
-    port: 49302
-    name: coturn-udp-49302
-    targetPort: 49302
-  - protocol: UDP
-    port: 49303
-    name: coturn-udp-49303
-    targetPort: 49303
-  - protocol: UDP
-    port: 49304
-    name: coturn-udp-49304
-    targetPort: 49304
-  - protocol: UDP
-    port: 49305
-    name: coturn-udp-49305
-    targetPort: 49305
-  - protocol: UDP
-    port: 49306
-    name: coturn-udp-49306
-    targetPort: 49306
-  - protocol: UDP
-    port: 49307
-    name: coturn-udp-49307
-    targetPort: 49307
-  - protocol: UDP
-    port: 49308
-    name: coturn-udp-49308
-    targetPort: 49308
-  - protocol: UDP
-    port: 49309
-    name: coturn-udp-49309
-    targetPort: 49309
-  - protocol: UDP
-    port: 49310
-    name: coturn-udp-49310
-    targetPort: 49310
-  - protocol: UDP
-    port: 49311
-    name: coturn-udp-49311
-    targetPort: 49311
-  - protocol: UDP
-    port: 49312
-    name: coturn-udp-49312
-    targetPort: 49312
-  - protocol: UDP
-    port: 49313
-    name: coturn-udp-49313
-    targetPort: 49313
-  - protocol: UDP
-    port: 49314
-    name: coturn-udp-49314
-    targetPort: 49314
-  - protocol: UDP
-    port: 49315
-    name: coturn-udp-49315
-    targetPort: 49315
-  - protocol: UDP
-    port: 49316
-    name: coturn-udp-49316
-    targetPort: 49316
-  - protocol: UDP
-    port: 49317
-    name: coturn-udp-49317
-    targetPort: 49317
-  - protocol: UDP
-    port: 49318
-    name: coturn-udp-49318
-    targetPort: 49318
-  - protocol: UDP
-    port: 49319
-    name: coturn-udp-49319
-    targetPort: 49319
-  - protocol: UDP
-    port: 49320
-    name: coturn-udp-49320
-    targetPort: 49320
-  - protocol: UDP
-    port: 49321
-    name: coturn-udp-49321
-    targetPort: 49321
-  - protocol: UDP
-    port: 49322
-    name: coturn-udp-49322
-    targetPort: 49322
-  - protocol: UDP
-    port: 49323
-    name: coturn-udp-49323
-    targetPort: 49323
-  - protocol: UDP
-    port: 49324
-    name: coturn-udp-49324
-    targetPort: 49324
-  - protocol: UDP
-    port: 49325
-    name: coturn-udp-49325
-    targetPort: 49325
-  - protocol: UDP
-    port: 49326
-    name: coturn-udp-49326
-    targetPort: 49326
-  - protocol: UDP
-    port: 49327
-    name: coturn-udp-49327
-    targetPort: 49327
-  - protocol: UDP
-    port: 49328
-    name: coturn-udp-49328
-    targetPort: 49328
-  - protocol: UDP
-    port: 49329
-    name: coturn-udp-49329
-    targetPort: 49329
-  - protocol: UDP
-    port: 49330
-    name: coturn-udp-49330
-    targetPort: 49330
-  - protocol: UDP
-    port: 49331
-    name: coturn-udp-49331
-    targetPort: 49331
-  - protocol: UDP
-    port: 49332
-    name: coturn-udp-49332
-    targetPort: 49332
-  - protocol: UDP
-    port: 49333
-    name: coturn-udp-49333
-    targetPort: 49333
-  - protocol: UDP
-    port: 49334
-    name: coturn-udp-49334
-    targetPort: 49334
-  - protocol: UDP
-    port: 49335
-    name: coturn-udp-49335
-    targetPort: 49335
-  - protocol: UDP
-    port: 49336
-    name: coturn-udp-49336
-    targetPort: 49336
-  - protocol: UDP
-    port: 49337
-    name: coturn-udp-49337
-    targetPort: 49337
-  - protocol: UDP
-    port: 49338
-    name: coturn-udp-49338
-    targetPort: 49338
-  - protocol: UDP
-    port: 49339
-    name: coturn-udp-49339
-    targetPort: 49339
-  - protocol: UDP
-    port: 49340
-    name: coturn-udp-49340
-    targetPort: 49340
-  - protocol: UDP
-    port: 49341
-    name: coturn-udp-49341
-    targetPort: 49341
-  - protocol: UDP
-    port: 49342
-    name: coturn-udp-49342
-    targetPort: 49342
-  - protocol: UDP
-    port: 49343
-    name: coturn-udp-49343
-    targetPort: 49343
-  - protocol: UDP
-    port: 49344
-    name: coturn-udp-49344
-    targetPort: 49344
-  - protocol: UDP
-    port: 49345
-    name: coturn-udp-49345
-    targetPort: 49345
-  - protocol: UDP
-    port: 49346
-    name: coturn-udp-49346
-    targetPort: 49346
-  - protocol: UDP
-    port: 49347
-    name: coturn-udp-49347
-    targetPort: 49347
-  - protocol: UDP
-    port: 49348
-    name: coturn-udp-49348
-    targetPort: 49348
-  - protocol: UDP
-    port: 49349
-    name: coturn-udp-49349
-    targetPort: 49349
-  - protocol: UDP
-    port: 49350
-    name: coturn-udp-49350
-    targetPort: 49350
-  - protocol: UDP
-    port: 49351
-    name: coturn-udp-49351
-    targetPort: 49351
-  - protocol: UDP
-    port: 49352
-    name: coturn-udp-49352
-    targetPort: 49352
-  selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  type: LoadBalancer
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-controller-admission
-  namespace: ingress-nginx
-spec:
-  ports:
-  - appProtocol: https
-    name: https-webhook
-    port: 443
-    targetPort: webhook
-  selector:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-  type: ClusterIP
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-controller
-  namespace: ingress-nginx
-spec:
-  minReadySeconds: 0
-  revisionHistoryLimit: 10
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: controller
-      app.kubernetes.io/instance: ingress-nginx
-      app.kubernetes.io/name: ingress-nginx
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: controller
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.7.1
-    spec:
-      containers:
-      - args:
-        - /nginx-ingress-controller
-        - --tcp-services-configmap=ingress-nginx/tcp-services
-        - --udp-services-configmap=ingress-nginx/udp-services
-        - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
-        - --election-id=ingress-nginx-leader
-        - --controller-class=k8s.io/ingress-nginx
-        - --ingress-class=nginx
-        - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
-        - --validating-webhook=:8443
-        - --validating-webhook-certificate=/usr/local/certificates/cert
-        - --validating-webhook-key=/usr/local/certificates/key
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: LD_PRELOAD
-          value: /usr/local/lib/libmimalloc.so
-        image: registry.k8s.io/ingress-nginx/controller:v1.7.1@sha256:7244b95ea47bddcb8267c1e625fb163fc183ef55448855e3ac52a7b260a60407
-        imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        name: controller
-        ports:
-        - containerPort: 80
-          name: http
-          protocol: TCP
-        - containerPort: 443
-          name: https
-          protocol: TCP
-        - containerPort: 8443
-          name: webhook
-          protocol: TCP
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        resources:
-          requests:
-            cpu: 100m
-            memory: 90Mi
-        securityContext:
-          allowPrivilegeEscalation: true
-          capabilities:
-            add:
-            - NET_BIND_SERVICE
-            drop:
-            - ALL
-          runAsUser: 101
-        volumeMounts:
-        - mountPath: /usr/local/certificates/
-          name: webhook-cert
-          readOnly: true
-      dnsPolicy: ClusterFirst
-      nodeSelector:
-        kubernetes.io/os: linux
-      serviceAccountName: ingress-nginx
-      terminationGracePeriodSeconds: 300
-      volumes:
-      - name: webhook-cert
-        secret:
-          secretName: ingress-nginx-admission
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission-create
-  namespace: ingress-nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: admission-webhook
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.7.1
-      name: ingress-nginx-admission-create
-    spec:
-      containers:
-      - args:
-        - create
-        - --host=ingress-nginx-controller-admission,ingress-nginx-controller-admission.$(POD_NAMESPACE).svc
-        - --namespace=$(POD_NAMESPACE)
-        - --secret-name=ingress-nginx-admission
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
-        imagePullPolicy: IfNotPresent
-        name: create
-        securityContext:
-          allowPrivilegeEscalation: false
-      nodeSelector:
-        kubernetes.io/os: linux
-      restartPolicy: OnFailure
-      securityContext:
-        fsGroup: 2000
-        runAsNonRoot: true
-        runAsUser: 2000
-      serviceAccountName: ingress-nginx-admission
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission-patch
-  namespace: ingress-nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: admission-webhook
-        app.kubernetes.io/instance: ingress-nginx
-        app.kubernetes.io/name: ingress-nginx
-        app.kubernetes.io/part-of: ingress-nginx
-        app.kubernetes.io/version: 1.7.1
-      name: ingress-nginx-admission-patch
-    spec:
-      containers:
-      - args:
-        - patch
-        - --webhook-name=ingress-nginx-admission
-        - --namespace=$(POD_NAMESPACE)
-        - --patch-mutating=false
-        - --secret-name=ingress-nginx-admission
-        - --patch-failure-policy=Fail
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794@sha256:01d181618f270f2a96c04006f33b2699ad3ccb02da48d0f89b22abce084b292f
-        imagePullPolicy: IfNotPresent
-        name: patch
-        securityContext:
-          allowPrivilegeEscalation: false
-      nodeSelector:
-        kubernetes.io/os: linux
-      restartPolicy: OnFailure
-      securityContext:
-        fsGroup: 2000
-        runAsNonRoot: true
-        runAsUser: 2000
-      serviceAccountName: ingress-nginx-admission
----
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
-metadata:
-  labels:
-    app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: nginx
-spec:
-  controller: k8s.io/ingress-nginx
----
-apiVersion: admissionregistration.k8s.io/v1
-kind: ValidatingWebhookConfiguration
-metadata:
-  labels:
-    app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: ingress-nginx
-    app.kubernetes.io/name: ingress-nginx
-    app.kubernetes.io/part-of: ingress-nginx
-    app.kubernetes.io/version: 1.7.1
-  name: ingress-nginx-admission
-webhooks:
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: ingress-nginx-controller-admission
-      namespace: ingress-nginx
-      path: /networking/v1/ingresses
-  failurePolicy: Fail
-  matchPolicy: Equivalent
-  name: validate.nginx.ingress.kubernetes.io
-  rules:
-  - apiGroups:
-    - networking.k8s.io
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - ingresses
-  sideEffects: None
diff --git a/kubernetes/terraform/helm/.helmignore b/kubernetes/terraform/helm/.helmignore
new file mode 100644
index 000000000..48344aec6
--- /dev/null
+++ b/kubernetes/terraform/helm/.helmignore
@@ -0,0 +1,2 @@
+charts/certmanager/templates/self-signed-certificate.yaml
+charts/backend/templates/migrate.yaml
diff --git a/kubernetes/config-map.yaml b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
similarity index 72%
rename from kubernetes/config-map.yaml
rename to kubernetes/terraform/helm/charts/backend/templates/cm.yaml
index 4ddbcce75..2eb0e5dc1 100644
--- a/kubernetes/config-map.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: config-map
+  name: cm-backend
   namespace: pychat
 data:
   MYSQL_PORT: '3306'
-  MYSQL_DATABASE: pychat
+  MYSQL_DATABASE: {{ .Values.app.mysql_database_name }}
   MYSQL_HOST: mariadb-service
   REDIS_HOST: redis-service
   REDIS_PORT: '6379'
diff --git a/kubernetes/terraform/helm/charts/backend/templates/config-map.yaml b/kubernetes/terraform/helm/charts/backend/templates/config-map.yaml
deleted file mode 100644
index 4ddbcce75..000000000
--- a/kubernetes/terraform/helm/charts/backend/templates/config-map.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: config-map
-  namespace: pychat
-data:
-  MYSQL_PORT: '3306'
-  MYSQL_DATABASE: pychat
-  MYSQL_HOST: mariadb-service
-  REDIS_HOST: redis-service
-  REDIS_PORT: '6379'
-  APPLICATION_PORT: '8888'
-
diff --git a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
index 2d27a0839..945546dce 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
         - secretRef:
             name: backend-secret
         - configMapRef:
-            name: config-map
+            name: cm-backend
         volumeMounts:
           - mountPath: "/usr/src/newback/photos"
             name: photo
diff --git a/kubernetes/migrate-backend.yaml b/kubernetes/terraform/helm/charts/backend/templates/migrate.yaml
similarity index 67%
rename from kubernetes/migrate-backend.yaml
rename to kubernetes/terraform/helm/charts/backend/templates/migrate.yaml
index aea09ecb0..df07170ca 100644
--- a/kubernetes/migrate-backend.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/migrate.yaml
@@ -8,13 +8,13 @@ spec:
     spec:
       containers:
       - name: migrate-backend
-        imagePullPolicy: IfNotPresent
-        image: deathangel908/pychat-backend
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
         envFrom:
         - secretRef:
             name: backend-secret
         - configMapRef:
-            name: config-map
+            name: cm-backend
         command: ["yarn",  "migrate"]
       restartPolicy: Never
   backoffLimit: 4
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
index 1b8d1a7db..3a7b9abf1 100644
--- a/kubernetes/terraform/helm/charts/backend/values.yaml
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -4,3 +4,5 @@ image:
   tag: "latest"
 disk:
   photo_size: "15Gi"
+app:
+  mysql_database_name: pychat
diff --git a/kubernetes/self-signed-certificate.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/self-signed-certificate.yaml
similarity index 100%
rename from kubernetes/self-signed-certificate.yaml
rename to kubernetes/terraform/helm/charts/certmanager/templates/self-signed-certificate.yaml
diff --git a/kubernetes/terraform/helm/charts/global/Chart.yaml b/kubernetes/terraform/helm/charts/global/Chart.yaml
new file mode 100644
index 000000000..1448475a8
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/global/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: namespace
+description: global namespace for pychat
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/namespace.yaml b/kubernetes/terraform/helm/charts/global/templates/ns.yaml
similarity index 100%
rename from kubernetes/namespace.yaml
rename to kubernetes/terraform/helm/charts/global/templates/ns.yaml
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
new file mode 100644
index 000000000..6be159733
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm-mariadb
+  namespace: pychat
+data:
+  MYSQL_PORT: '3306'
+  MYSQL_DATABASE: {{ .Values.mysql_database_name }}
+
diff --git a/kubernetes/terraform/helm/charts/mariadb/values.yaml b/kubernetes/terraform/helm/charts/mariadb/values.yaml
index 5c9b01f81..663b1d986 100644
--- a/kubernetes/terraform/helm/charts/mariadb/values.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/values.yaml
@@ -1,2 +1,3 @@
 disk_size: "5Gi"
 mysql_version: "10.6.7"
+mysql_database_name: pychat

From a6bab3efffd836a2f39c94261acb3e2fcea54b1b Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 26 May 2023 21:27:19 +0300
Subject: [PATCH 175/221] Fix terraform chart

---
 .../helm/charts/backend/templates/cm.yaml     |  1 +
 .../charts/backend/templates/deployment.yaml  |  3 --
 kubernetes/terraform/helm/main.tf             | 40 +++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
index 2eb0e5dc1..0f855fd0f 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
@@ -10,4 +10,5 @@ data:
   REDIS_HOST: redis-service
   REDIS_PORT: '6379'
   APPLICATION_PORT: '8888'
+  REDIS_PUBSUB: 'true'
 
diff --git a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
index 945546dce..06691a426 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
@@ -25,9 +25,6 @@ spec:
           httpGet:
             path: /api/health
             port: 8888
-        env:
-        - name: REDIS_PUBSUB
-          value: 'true'
         envFrom:
         - secretRef:
             name: backend-secret
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 84f49d5d4..7556b6f17 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -15,7 +15,47 @@ provider "helm" {
   }
 }
 
+resource "helm_release" "global" {
+  name = "backend"
+  chart = "./charts/global"
+}
+
 resource "helm_release" "backend" {
   name = "backend"
   chart = "./charts/backend"
 }
+
+resource "helm_release" "certmanager" {
+  name = "certmanager"
+  chart = "./charts/certmanager"
+}
+
+resource "helm_release" "coturn" {
+  name = "coturn"
+  chart = "./charts/coturn"
+}
+
+resource "helm_release" "frontend" {
+  name = "frontend"
+  chart = "./charts/frontend"
+}
+
+resource "helm_release" "ingress" {
+  name = "ingress"
+  chart = "./charts/ingress"
+}
+
+resource "helm_release" "mariadb" {
+  name = "mariadb"
+  chart = "./charts/mariadb"
+}
+
+resource "helm_release" "postfix" {
+  name = "postfix"
+  chart = "./charts/postfix"
+}
+
+resource "helm_release" "redis" {
+  name = "redis"
+  chart = "./charts/redis"
+}

From fb21ca0cdf9c059e33feb56b301b7b0f2cad43be Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 26 May 2023 22:03:38 +0300
Subject: [PATCH 176/221] Fixed terraform values

---
 kubernetes/terraform/cloudflare/main.tf             |  1 -
 kubernetes/terraform/cloudflare/variables.tf        |  5 +----
 .../charts/certmanager/templates/certificate.yaml   |  4 ++--
 .../terraform/helm/charts/certmanager/values.yaml   |  1 -
 .../helm/charts/ingress/templates/ingress.yaml      |  8 ++++----
 .../helm/charts/ingress/templates/service.yaml      |  2 +-
 .../terraform/helm/charts/ingress/values.yaml       |  2 --
 kubernetes/terraform/helm/main.tf                   | 13 +++++++++++++
 kubernetes/terraform/helm/variables.tf              |  2 ++
 kubernetes/terraform/linode/main.tf                 | 13 -------------
 kubernetes/terraform/linode/variables.tf            |  1 -
 kubernetes/terraform/main.tf                        |  4 ++--
 12 files changed, 25 insertions(+), 31 deletions(-)
 create mode 100644 kubernetes/terraform/helm/variables.tf

diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 92244df9f..69891c11f 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -7,7 +7,6 @@ terraform {
   }
 }
 
-
 provider "cloudflare" {
   api_token = var.cloud_flare_api_token
 }
diff --git a/kubernetes/terraform/cloudflare/variables.tf b/kubernetes/terraform/cloudflare/variables.tf
index e18a23785..53fe25eb4 100644
--- a/kubernetes/terraform/cloudflare/variables.tf
+++ b/kubernetes/terraform/cloudflare/variables.tf
@@ -1,7 +1,4 @@
-variable "domain_name" {
-  default = "pychat.org"
-}
-
+variable "domain_name" {}
 variable "cloud_flare_zone_id" {}
 variable "cloud_flare_api_token" {}
 variable "ip_address" {}
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
index 0011ce33b..761adc20f 100644
--- a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
@@ -11,5 +11,5 @@ spec:
   duration: 2160h # 90d
   renewBefore: 720h # 30d before SSL will expire, renew it
   dnsNames:
-    - {{ .Values.domain }}
-    - "static.{{ .Values.domain }}"
+    - "${domain}"
+    - "static.{{ $domain }}"
diff --git a/kubernetes/terraform/helm/charts/certmanager/values.yaml b/kubernetes/terraform/helm/charts/certmanager/values.yaml
index 66d152304..962fc3e62 100644
--- a/kubernetes/terraform/helm/charts/certmanager/values.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/values.yaml
@@ -1,2 +1 @@
 email: "deathangel908@gmail.com"
-domain: "pychat.org"
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
index 2a8d51d08..c17c63b40 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
@@ -10,8 +10,8 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-    - {{ .Values.domain }}
-    - "static.{{ .Values.domain }}"
+    - "${domain}"
+    - "static.${domain}"
     secretName: pychat-tls
   defaultBackend:
     service:
@@ -19,7 +19,7 @@ spec:
       port:
         number: 80
   rules:
-  - host: "static.{{ .Values.domain }}"
+  - host: "static.${domain}"
     http:
       paths:
       - path: /
@@ -29,7 +29,7 @@ spec:
             name: frontend-service
             port:
               number: 80
-  - host: {{ .Values.domain }}
+  - host: "${domain}"
     http:
       paths:
       - path: /api
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/service.yaml b/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
index 3d62066c6..fe45ca64a 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
@@ -53,4 +53,4 @@ spec:
     app.kubernetes.io/name: ingress-nginx
   type: NodePort
   externalIPs:
-    - {{ .Values.external_ip }}
+    - "${external_ip}"
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
index 57f9132d2..c6996a599 100644
--- a/kubernetes/terraform/helm/charts/ingress/values.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -1,4 +1,2 @@
-domain: "pychat.org"
 udp_port_range_start: 49152
 udp_port_range_end: 49252
-external_ip: "170.187.189.92"
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 7556b6f17..ffbf08c90 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -28,6 +28,10 @@ resource "helm_release" "backend" {
 resource "helm_release" "certmanager" {
   name = "certmanager"
   chart = "./charts/certmanager"
+  set {
+    name = "domain"
+    value = var.domain
+  }
 }
 
 resource "helm_release" "coturn" {
@@ -43,6 +47,15 @@ resource "helm_release" "frontend" {
 resource "helm_release" "ingress" {
   name = "ingress"
   chart = "./charts/ingress"
+  set  {
+    name = "domain"
+    value = var.domain
+
+  }
+  set {
+    name = "external_ip"
+    value = var.ip_address
+  }
 }
 
 resource "helm_release" "mariadb" {
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
new file mode 100644
index 000000000..39bb1581b
--- /dev/null
+++ b/kubernetes/terraform/helm/variables.tf
@@ -0,0 +1,2 @@
+variable "domain" {}
+variable "ip_address" {}
diff --git a/kubernetes/terraform/linode/main.tf b/kubernetes/terraform/linode/main.tf
index 164f1b11e..d6fda8e55 100644
--- a/kubernetes/terraform/linode/main.tf
+++ b/kubernetes/terraform/linode/main.tf
@@ -32,16 +32,3 @@ data "linode_instances" "pychat_linode" {
   }
 }
 
-
-
-
-
-resource "linode_instance" "pychat12" {
-    label = "pychat_1"
-    image = "linode/alpine3.17"
-    region = var.region
-    type = "g6-standard-1"
-    root_pass =  var.linode_instance_root_password
-}
-
-
diff --git a/kubernetes/terraform/linode/variables.tf b/kubernetes/terraform/linode/variables.tf
index 7d30ef5ad..e96b108d3 100644
--- a/kubernetes/terraform/linode/variables.tf
+++ b/kubernetes/terraform/linode/variables.tf
@@ -1,4 +1,3 @@
-variable "linode_instance_root_password" {}
 variable "linode_token" {}
 variable "pools" {
   description = "The Node Pool specifications for the Kubernetes cluster. (required)"
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index a5b1ea43f..532c7329a 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -1,12 +1,10 @@
 variable "linode_token" {}
 variable "cloud_flare_zone_id" {}
 variable "cloud_flare_api_token" {}
-variable "linode_instance_root_password" {}
 variable "domain_name" {}
 
 module "linode" {
   source                  = "./linode"
-  linode_instance_root_password = var.linode_instance_root_password
   linode_token = var.linode_token
 }
 
@@ -21,4 +19,6 @@ module "cloudflare" {
 module "helm" {
   source = "./helm"
   kubeconfig = module.linode.kubeconfig
+  domain = var.domain_name
+  ip_address = module.linode.ip_address
 }

From 216e753eeb8410629a0b6ddf288c7bc2253c9ea2 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Fri, 26 May 2023 23:45:45 +0300
Subject: [PATCH 177/221] Refactored project a bit

---
 README.md                                    |  8 ++++--
 kubernetes/terraform/.gitignore              |  3 ++
 kubernetes/terraform/cloudflare/main.tf      | 24 ++--------------
 kubernetes/terraform/cloudflare/providers.tf | 12 ++++++++
 kubernetes/terraform/helm/main.tf            | 17 ------------
 kubernetes/terraform/helm/providers.tf       | 14 ++++++++++
 kubernetes/terraform/helm/variables.tf       |  1 +
 kubernetes/terraform/linode/main.tf          | 29 +++-----------------
 kubernetes/terraform/linode/output.tf        |  8 +++---
 kubernetes/terraform/linode/providers.tf     | 12 ++++++++
 kubernetes/terraform/linode/variables.tf     | 20 +++++---------
 11 files changed, 65 insertions(+), 83 deletions(-)
 create mode 100644 kubernetes/terraform/cloudflare/providers.tf
 create mode 100644 kubernetes/terraform/helm/providers.tf
 create mode 100644 kubernetes/terraform/linode/providers.tf

diff --git a/README.md b/README.md
index 399d20a81..b3f519b6f 100644
--- a/README.md
+++ b/README.md
@@ -519,11 +519,15 @@ http ALL=(ALL) NOPASSWD: RESTART_TORNADO
  - Linode as Kubernetes provider (10$ per month of total for 1 instance of 2GB ram and 1vCPU)
  - Letsencrypt as SSL certificate (free of charge)
  - Domain address (you have to decide on your own )
+
  
 1. Go cloudflare and copy ZoneID and API token 
  - Copy zoneID: Go to https://dash.cloudflare.com/ - create a new site (or use existing one) grab an API Zone ID and place it into `kubernetes/terraform.tfvars`
- - Copy API token: go to https://dash.cloudflare.com/profile/api-tokens and create a new api token and place it into `kubernetes/terraform.tfvars`
- - 
+ - Copy API token: go to https://dash.cloudflare.com/profile/api-tokens and create a new api token and place it into `kubernetes/terraform.tfvars`\
+ 
+1. Apply terraform:
+ - `cd kubernetes/terraform; terraform apply`
+ 
 # Kubernetes example with [linode](https://www.linode.com/).
 
 Minimal requirements: 
diff --git a/kubernetes/terraform/.gitignore b/kubernetes/terraform/.gitignore
index 76a546c2c..169fd854f 100644
--- a/kubernetes/terraform/.gitignore
+++ b/kubernetes/terraform/.gitignore
@@ -1,3 +1,6 @@
 .terraform
 terraform.tfvars
 terraform.tfstate
+.terraform.lock.hcl
+terraform.tfstate.backup
+.terraform.tfstate.lock.info
diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 69891c11f..2c2003e05 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -1,31 +1,11 @@
-terraform {
-  required_providers {
-    cloudflare = {
-      source  = "cloudflare/cloudflare"
-      version = "3.35.0"
-    }
-  }
-}
-
-provider "cloudflare" {
-  api_token = var.cloud_flare_api_token
-}
-
-resource "cloudflare_record" "server" {
-  zone_id = var.cloud_flare_zone_id
-  name    = var.domain_name
-  value   = var.ip_address
-  proxied = true // Cloudflare support websockets now
-  type    = "A"
-}
 
 resource "cloudflare_record" "master_pychat" {
   name    = var.domain_name
+  type    = "A"
+  zone_id = var.cloud_flare_zone_id
   proxied = false
   ttl     = 1
-  type    = "A"
   value   = var.ip_address
-  zone_id = var.cloud_flare_zone_id
 }
 
 resource "cloudflare_record" "static_pychat" {
diff --git a/kubernetes/terraform/cloudflare/providers.tf b/kubernetes/terraform/cloudflare/providers.tf
new file mode 100644
index 000000000..ab815744e
--- /dev/null
+++ b/kubernetes/terraform/cloudflare/providers.tf
@@ -0,0 +1,12 @@
+terraform {
+  required_providers {
+    cloudflare = {
+      source  = "cloudflare/cloudflare"
+      version = "3.35.0"
+    }
+  }
+}
+
+provider "cloudflare" {
+  api_token = var.cloud_flare_api_token
+}
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index ffbf08c90..2dd16c89a 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -1,20 +1,3 @@
-terraform {
-  required_providers {
-    helm = {
-      version = "2.9.0"
-      source  = "hashicorp/helm"
-    }
-  }
-}
-
-variable "kubeconfig" {}
-
-provider "helm" {
-  kubernetes {
-    config_context = var.kubeconfig
-  }
-}
-
 resource "helm_release" "global" {
   name = "backend"
   chart = "./charts/global"
diff --git a/kubernetes/terraform/helm/providers.tf b/kubernetes/terraform/helm/providers.tf
new file mode 100644
index 000000000..7df99ce60
--- /dev/null
+++ b/kubernetes/terraform/helm/providers.tf
@@ -0,0 +1,14 @@
+terraform {
+  required_providers {
+    helm = {
+      version = "2.9.0"
+      source  = "hashicorp/helm"
+    }
+  }
+}
+
+provider "helm" {
+  kubernetes {
+    config_context = var.kubeconfig
+  }
+}
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 39bb1581b..70e207ae7 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,2 +1,3 @@
 variable "domain" {}
 variable "ip_address" {}
+variable "kubeconfig" {}
diff --git a/kubernetes/terraform/linode/main.tf b/kubernetes/terraform/linode/main.tf
index d6fda8e55..6707c42be 100644
--- a/kubernetes/terraform/linode/main.tf
+++ b/kubernetes/terraform/linode/main.tf
@@ -1,34 +1,13 @@
-terraform {
-  required_providers {
-    linode = {
-      source = "linode/linode"
-      version = "2.2.0"
-    }
-  }
-}
-
-provider "linode" {
-  token = var.linode_token
-}
-
 resource "linode_lke_cluster" "pychat" {
     k8s_version = var.k8s_version
-    label =  "pychat_1"
+    label =  var.linode_app_label
     region = var.region
 
-    dynamic "pool" {
-        for_each = var.pools
-        content {
-            type  = pool.value["type"]
-            count = pool.value["count"]
-        }
+    pool {
+      count = 1
+      type  = var.node_type
     }
 }
 
 data "linode_instances" "pychat_linode" {
-  filter {
-    name = "label"
-    values = ["pychat_1"]
-  }
 }
-
diff --git a/kubernetes/terraform/linode/output.tf b/kubernetes/terraform/linode/output.tf
index ab2f9fcff..40826d73d 100644
--- a/kubernetes/terraform/linode/output.tf
+++ b/kubernetes/terraform/linode/output.tf
@@ -1,7 +1,3 @@
-output "ip_address" {
-  value = data.linode_instances.pychat_linode.instances.0.ip_address
-}
-
 output "kubeconfig" {
   value = linode_lke_cluster.pychat.kubeconfig
   sensitive = true
@@ -22,3 +18,7 @@ output "id" {
 output "pool" {
   value = linode_lke_cluster.pychat.pool
 }
+
+output "ip_address" {
+  value = data.linode_instances.pychat_linode.instances.0.ip_address
+}
diff --git a/kubernetes/terraform/linode/providers.tf b/kubernetes/terraform/linode/providers.tf
new file mode 100644
index 000000000..b765cb806
--- /dev/null
+++ b/kubernetes/terraform/linode/providers.tf
@@ -0,0 +1,12 @@
+terraform {
+  required_providers {
+    linode = {
+      source = "linode/linode"
+      version = "2.2.0"
+    }
+  }
+}
+
+provider "linode" {
+  token = var.linode_token
+}
diff --git a/kubernetes/terraform/linode/variables.tf b/kubernetes/terraform/linode/variables.tf
index e96b108d3..87bc6f5c3 100644
--- a/kubernetes/terraform/linode/variables.tf
+++ b/kubernetes/terraform/linode/variables.tf
@@ -1,21 +1,15 @@
 variable "linode_token" {}
-variable "pools" {
-  description = "The Node Pool specifications for the Kubernetes cluster. (required)"
-  type = list(object({
-    type = string
-    count = number
-  }))
-  default = [
-    {
-      type = "g6-standard-1"
-      count = 1
-    }
-  ]
+variable "node_type" {
+  default = "g6-standard-1"
 }
 
 variable "k8s_version" {
-  default = "1.27"
+  default = "1.26"
 }
 variable "region" {
   default = "eu-west"
 }
+
+variable "linode_app_label" {
+  default = "pychat_1"
+}

From da0ee9338192f1f92ce5fc61a0c48c62e0837a76 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 27 May 2023 03:41:02 +0300
Subject: [PATCH 178/221] Finished terraform

---
 kubernetes/terraform/.gitignore               |   1 +
 kubernetes/terraform/.terraform.lock.hcl      |  19 ++
 kubernetes/terraform/helm/.helmignore         |   1 +
 .../helm/charts/backend/templates/cm.yaml     |   6 +-
 .../charts/backend/templates/migrate.yaml     |  20 ---
 .../helm/charts/backend/templates/secret.yaml |  21 +++
 .../terraform/helm/charts/backend/values.yaml |  15 +-
 .../terraform/helm/charts/backup/Chart.yaml   |   6 +
 .../helm/charts/backup/templates/cronjob.yaml |  54 ++++++
 .../helm/charts/backup/templates/pv.yaml      |  11 ++
 .../helm/charts/backup/templates/pvc.yaml     |  13 ++
 .../helm/charts/backup/templates/secret.yaml  |  12 ++
 .../terraform/helm/charts/backup/values.yaml  |  11 ++
 .../certmanager/templates/certificate.yaml    |   4 +-
 .../charts/certmanager/templates/secret.yaml  |   8 +
 .../templates/self-signed-certificate.yaml    |   9 -
 .../helm/charts/certmanager/values.yaml       |   4 +-
 .../helm/charts/global/templates/ns.yaml      |   5 +
 .../templates/cluster-role-binding.yaml       |   1 +
 .../ingress/templates/cluster-role.yaml       |   1 +
 .../ingress/templates/ingress-class.yaml      |   1 +
 .../charts/ingress/templates/ingress.yaml     |   8 +-
 .../charts/ingress/templates/service.yaml     |   2 +-
 .../terraform/helm/charts/ingress/values.yaml |   2 +
 .../helm/charts/mariadb/templates/cm.yaml     |   3 +-
 .../charts/mariadb/templates/deployment.yaml  |   9 +-
 .../helm/charts/mariadb/templates/secret.yaml |  15 ++
 .../terraform/helm/charts/mariadb/values.yaml |   4 +-
 kubernetes/terraform/helm/main.tf             | 167 +++++++++++++++---
 kubernetes/terraform/helm/providers.tf        |   7 +-
 kubernetes/terraform/helm/variables.tf        |  22 +++
 kubernetes/terraform/main.tf                  |  21 ++-
 kubernetes/terraform/variables.tf             |  24 +++
 33 files changed, 433 insertions(+), 74 deletions(-)
 delete mode 100644 kubernetes/terraform/helm/charts/backend/templates/migrate.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backend/templates/secret.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backup/Chart.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backup/templates/cronjob.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backup/templates/pv.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backup/templates/secret.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backup/values.yaml
 create mode 100644 kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
 delete mode 100644 kubernetes/terraform/helm/charts/certmanager/templates/self-signed-certificate.yaml
 create mode 100644 kubernetes/terraform/helm/charts/mariadb/templates/secret.yaml
 create mode 100644 kubernetes/terraform/variables.tf

diff --git a/kubernetes/terraform/.gitignore b/kubernetes/terraform/.gitignore
index 169fd854f..40ab1b851 100644
--- a/kubernetes/terraform/.gitignore
+++ b/kubernetes/terraform/.gitignore
@@ -4,3 +4,4 @@ terraform.tfstate
 .terraform.lock.hcl
 terraform.tfstate.backup
 .terraform.tfstate.lock.info
+helm/.kubeconfig
diff --git a/kubernetes/terraform/.terraform.lock.hcl b/kubernetes/terraform/.terraform.lock.hcl
index a94137a97..8477fbe4f 100644
--- a/kubernetes/terraform/.terraform.lock.hcl
+++ b/kubernetes/terraform/.terraform.lock.hcl
@@ -44,6 +44,25 @@ provider "registry.terraform.io/hashicorp/helm" {
   ]
 }
 
+provider "registry.terraform.io/hashicorp/local" {
+  version = "2.4.0"
+  hashes = [
+    "h1:R97FTYETo88sT2VHfMgkPU3lzCsZLunPftjSI5vfKe8=",
+    "zh:53604cd29cb92538668fe09565c739358dc53ca56f9f11312b9d7de81e48fab9",
+    "zh:66a46e9c508716a1c98efbf793092f03d50049fa4a83cd6b2251e9a06aca2acf",
+    "zh:70a6f6a852dd83768d0778ce9817d81d4b3f073fab8fa570bff92dcb0824f732",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:82a803f2f484c8b766e2e9c32343e9c89b91997b9f8d2697f9f3837f62926b35",
+    "zh:9708a4e40d6cc4b8afd1352e5186e6e1502f6ae599867c120967aebe9d90ed04",
+    "zh:973f65ce0d67c585f4ec250c1e634c9b22d9c4288b484ee2a871d7fa1e317406",
+    "zh:c8fa0f98f9316e4cfef082aa9b785ba16e36ff754d6aba8b456dab9500e671c6",
+    "zh:cfa5342a5f5188b20db246c73ac823918c189468e1382cb3c48a9c0c08fc5bf7",
+    "zh:e0e2b477c7e899c63b06b38cd8684a893d834d6d0b5e9b033cedc06dd7ffe9e2",
+    "zh:f62d7d05ea1ee566f732505200ab38d94315a4add27947a60afa29860822d3fc",
+    "zh:fa7ce69dde358e172bd719014ad637634bbdabc49363104f4fca759b4b73f2ce",
+  ]
+}
+
 provider "registry.terraform.io/linode/linode" {
   version = "2.2.0"
   hashes = [
diff --git a/kubernetes/terraform/helm/.helmignore b/kubernetes/terraform/helm/.helmignore
index 48344aec6..d360e428f 100644
--- a/kubernetes/terraform/helm/.helmignore
+++ b/kubernetes/terraform/helm/.helmignore
@@ -1,2 +1,3 @@
 charts/certmanager/templates/self-signed-certificate.yaml
 charts/backend/templates/migrate.yaml
+migrate.yaml
diff --git a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
index 0f855fd0f..8f8b4cc33 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
@@ -5,10 +5,12 @@ metadata:
   namespace: pychat
 data:
   MYSQL_PORT: '3306'
-  MYSQL_DATABASE: {{ .Values.app.mysql_database_name }}
+  MYSQL_DATABASE: {{ .Values.mysql_database_name }}
   MYSQL_HOST: mariadb-service
   REDIS_HOST: redis-service
   REDIS_PORT: '6379'
   APPLICATION_PORT: '8888'
   REDIS_PUBSUB: 'true'
-
+  EMAIL_PORT: '25'
+  EMAIL_HOST: 'postfix-service'
+  DEFAULT_PROFILE_ID: {{ .Values.DEFAULT_PROFILE_ID }}
diff --git a/kubernetes/terraform/helm/charts/backend/templates/migrate.yaml b/kubernetes/terraform/helm/charts/backend/templates/migrate.yaml
deleted file mode 100644
index df07170ca..000000000
--- a/kubernetes/terraform/helm/charts/backend/templates/migrate.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: migrate-backend-job
-  namespace: pychat
-spec:
-  template:
-    spec:
-      containers:
-      - name: migrate-backend
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
-        envFrom:
-        - secretRef:
-            name: backend-secret
-        - configMapRef:
-            name: cm-backend
-        command: ["yarn",  "migrate"]
-      restartPolicy: Never
-  backoffLimit: 4
diff --git a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
new file mode 100644
index 000000000..941deb8e8
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: backend-secret
+  namespace: pychat
+stringData:
+  MYSQL_PASSWORD: {{ .Values.mysql_password }}
+  MYSQL_USER: {{ .Values.mysql_database_name }}
+  EMAIL_HOST_USER: ''
+  EMAIL_HOST_PASSWORD: ''
+  SERVER_EMAIL: "root@{{ .Values.domain }}"
+  SECRET_KEY: {{ .Values.SECRET_KEY }}
+  RECAPTCHA_PRIVATE_KEY: {{ .Values.RECAPTCHA_PRIVATE_KEY }}
+  RECAPTCHA_PUBLIC_KEY: {{ .Values.RECAPTCHA_PUBLIC_KEY }}
+  GOOGLE_OAUTH_2_CLIENT_ID: {{ .Values.GOOGLE_OAUTH_2_CLIENT_ID }}
+  FACEBOOK_ACCESS_TOKEN: {{ .Values.FACEBOOK_ACCESS_TOKEN }}
+  GIPHY_API_KEY: {{ .Values.GIPHY_API_KEY }}
+  FIREBASE_API_KEY: {{ .Values.FIREBASE_API_KEY }}
+  DEFAULT_PROFILE_ID: {{ .Values.DEFAULT_PROFILE_ID }}
+
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
index 3a7b9abf1..0e3cf7205 100644
--- a/kubernetes/terraform/helm/charts/backend/values.yaml
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -4,5 +4,16 @@ image:
   tag: "latest"
 disk:
   photo_size: "15Gi"
-app:
-  mysql_database_name: pychat
+mysql:
+  mysql_database_name: $mysql_database_name
+  mysql_user: $mysql_user
+  mysql_password: $mysql_password
+domain: $domain
+DEFAULT_PROFILE_ID: $DEFAULT_PROFILE_ID
+FIREBASE_API_KEY: $FIREBASE_API_KEY
+GIPHY_API_KEY: $GIPHY_API_KEY
+FACEBOOK_ACCESS_TOKEN: $FACEBOOK_ACCESS_TOKEN
+GOOGLE_OAUTH_2_CLIENT_ID: $GOOGLE_OAUTH_2_CLIENT_ID
+RECAPTCHA_PUBLIC_KEY: $RECAPTCHA_PUBLIC_KEY
+RECAPTCHA_PRIVATE_KEY: $RECAPTCHA_PRIVATE_KEY
+SECRET_KEY: $SECRET_KEY
diff --git a/kubernetes/terraform/helm/charts/backup/Chart.yaml b/kubernetes/terraform/helm/charts/backup/Chart.yaml
new file mode 100644
index 000000000..362640da0
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backup/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: certmanager
+description: this chart automatically generates and updates ssl certificates from letsencrypt
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/terraform/helm/charts/backup/templates/cronjob.yaml b/kubernetes/terraform/helm/charts/backup/templates/cronjob.yaml
new file mode 100644
index 000000000..228798074
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backup/templates/cronjob.yaml
@@ -0,0 +1,54 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: backend-backup
+  namespace: pychat
+  labels:
+    app: backend-backup
+spec:
+  schedule: "0 * * * *"
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: backend-backup
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
+            image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
+            env:
+              - name: GITHUB_REPO
+                valueFrom:
+                  secretKeyRef:
+                    key: GITHUB_REPO
+                    name: git-secret
+            envFrom:
+            - secretRef:
+                name: backend-secret
+            - configMapRef:
+                name: config-map
+            volumeMounts:
+              - mountPath: "/src/git/backend/photos"
+                name: photo
+              - mountPath: "/src/git/"
+                name: backup
+              - name: git-ssh-key
+                mountPath: /src/ssh/id_rsa
+                subPath: id_rsa
+              - name: git-ssh-key
+                mountPath: /src/ssh/id_rsa.pub
+                subPath: id_rsa.pub
+            command:
+            - /bin/bash
+            - /src/backup.sh
+          restartPolicy: OnFailure
+          volumes:
+            - name: photo
+              persistentVolumeClaim:
+                claimName: pvc-photo
+            - name: backup
+              persistentVolumeClaim:
+                claimName: pvc-backup
+            - name: git-ssh-key
+              secret:
+                secretName: git-secret
diff --git a/kubernetes/terraform/helm/charts/backup/templates/pv.yaml b/kubernetes/terraform/helm/charts/backup/templates/pv.yaml
new file mode 100644
index 000000000..e8cab2e29
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backup/templates/pv.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-backup
+spec:
+  accessModes:
+    - ReadWriteMany
+  capacity:
+    storage: {{ .Values.disk-size }}
+  hostPath:
+    path: /data/backup
diff --git a/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml b/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
new file mode 100644
index 000000000..af538556b
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-backup
+  namespace: pychat
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.disk-size }}
+  storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
+  volumeName: pv-backup
diff --git a/kubernetes/terraform/helm/charts/backup/templates/secret.yaml b/kubernetes/terraform/helm/charts/backup/templates/secret.yaml
new file mode 100644
index 000000000..848fa33d0
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backup/templates/secret.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata: # ssh-keygen -t rsa -b 4096 -C "kube backup" -f  /tmp/sshkey/id_rsa -N ""
+  name: git-secret
+  namespace: pychat
+stringData:
+  GITHUB_REPO: $github
+  id_rsa: $id_rsa
+  id_rsa.pub: $id_rsa_pub
+
+
diff --git a/kubernetes/terraform/helm/charts/backup/values.yaml b/kubernetes/terraform/helm/charts/backup/values.yaml
new file mode 100644
index 000000000..53e52df07
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backup/values.yaml
@@ -0,0 +1,11 @@
+email: $email
+pullPolicy: Always
+image:
+  repository_path: deathangel908/pychat-backup
+  pullPolicy: Always # change to IfNotPresent for minikube
+  tag: "latest"
+
+disk-size: 15Gi
+idr_rsa: $idr_rsa
+id_rsa_pub: $id_rsa_pub
+github: $github
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
index 761adc20f..1b9dee8fa 100644
--- a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
@@ -11,5 +11,5 @@ spec:
   duration: 2160h # 90d
   renewBefore: 720h # 30d before SSL will expire, renew it
   dnsNames:
-    - "${domain}"
-    - "static.{{ $domain }}"
+    - "{{ .Values.domain }}"
+    - "static.{{ .Values.domain }}"
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
new file mode 100644
index 000000000..b29e90016
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: cloudflare-api-token-secret
+  namespace: pychat
+type: Opaque
+stringData:
+  api-token: {{ .Values.cf_api_token }}
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/self-signed-certificate.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/self-signed-certificate.yaml
deleted file mode 100644
index 1b890074d..000000000
--- a/kubernetes/terraform/helm/charts/certmanager/templates/self-signed-certificate.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Secret
-type: kubernetes.io/tls
-metadata:
-  name: self-signed-certificate
-  namespace: pychat
-data:
-  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-  tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K
diff --git a/kubernetes/terraform/helm/charts/certmanager/values.yaml b/kubernetes/terraform/helm/charts/certmanager/values.yaml
index 962fc3e62..6aadddc2f 100644
--- a/kubernetes/terraform/helm/charts/certmanager/values.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/values.yaml
@@ -1 +1,3 @@
-email: "deathangel908@gmail.com"
+email: $email
+cf_api_token: $cf_api_token
+domain: $domain
diff --git a/kubernetes/terraform/helm/charts/global/templates/ns.yaml b/kubernetes/terraform/helm/charts/global/templates/ns.yaml
index a4740dbfe..34f8cd190 100644
--- a/kubernetes/terraform/helm/charts/global/templates/ns.yaml
+++ b/kubernetes/terraform/helm/charts/global/templates/ns.yaml
@@ -2,3 +2,8 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: pychat
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/cluster-role-binding.yaml b/kubernetes/terraform/helm/charts/ingress/templates/cluster-role-binding.yaml
index 85d7a799d..07f40a216 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/cluster-role-binding.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/cluster-role-binding.yaml
@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: ingress-nginx
     app.kubernetes.io/version: 1.7.1
   name: ingress-nginx
+  namespace: ingress-nginx
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/cluster-role.yaml b/kubernetes/terraform/helm/charts/ingress/templates/cluster-role.yaml
index 5340c4339..59d3c5915 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/cluster-role.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/cluster-role.yaml
@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/part-of: ingress-nginx
     app.kubernetes.io/version: 1.7.1
   name: ingress-nginx
+  namespace: ingress-nginx
 rules:
 - apiGroups:
   - ""
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress-class.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress-class.yaml
index 6cfb5fb97..f244d31b4 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/ingress-class.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress-class.yaml
@@ -8,5 +8,6 @@ metadata:
     app.kubernetes.io/part-of: ingress-nginx
     app.kubernetes.io/version: 1.7.1
   name: nginx
+  namespace: ingress-nginx
 spec:
   controller: k8s.io/ingress-nginx
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
index c17c63b40..ea864c8ad 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
@@ -10,8 +10,8 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-    - "${domain}"
-    - "static.${domain}"
+    - "{{ .Values.domain }}"
+    - "static.{{ .Values.domain }}"
     secretName: pychat-tls
   defaultBackend:
     service:
@@ -19,7 +19,7 @@ spec:
       port:
         number: 80
   rules:
-  - host: "static.${domain}"
+  - host: "static.{{ .Values.domain }}"
     http:
       paths:
       - path: /
@@ -29,7 +29,7 @@ spec:
             name: frontend-service
             port:
               number: 80
-  - host: "${domain}"
+  - host: "{{ .Values.domain }}"
     http:
       paths:
       - path: /api
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/service.yaml b/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
index fe45ca64a..f8ca27365 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
@@ -53,4 +53,4 @@ spec:
     app.kubernetes.io/name: ingress-nginx
   type: NodePort
   externalIPs:
-    - "${external_ip}"
+    - "{{ .Values.external_ip }}"
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
index c6996a599..9dc1e0593 100644
--- a/kubernetes/terraform/helm/charts/ingress/values.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -1,2 +1,4 @@
 udp_port_range_start: 49152
 udp_port_range_end: 49252
+external_ip: $external_ip
+domain: $domain
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
index 6be159733..5d4ea0109 100644
--- a/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
@@ -6,4 +6,5 @@ metadata:
 data:
   MYSQL_PORT: '3306'
   MYSQL_DATABASE: {{ .Values.mysql_database_name }}
-
+  MYSQL_CHARSET: utf8mb4
+  MYSQL_COLLATION: utf8mb4_general_ci
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/deployment.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/deployment.yaml
index 800d0403d..f0303aa35 100644
--- a/kubernetes/terraform/helm/charts/mariadb/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/deployment.yaml
@@ -26,16 +26,11 @@ spec:
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3306
-        env:
-        - name: MYSQL_CHARSET
-          value: utf8mb4
-        - name: MYSQL_COLLATION
-          value: utf8mb4_general_ci
         envFrom:
         - secretRef:
-            name: backend-secret
+            name: mariadb-secret
         - configMapRef:
-            name: config-map
+            name: cm-mariadb
         volumeMounts:
         - mountPath: /var/lib/mysql
           name: mariadb-data
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/secret.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/secret.yaml
new file mode 100644
index 000000000..cf0f44af0
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/secret.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: mariadb-secret
+  namespace: pychat
+stringData:
+  MYSQL_PASSWORD: {{ .Values.mysql_password }}
+  MYSQL_USER: {{ .Values.mysql_user }}
+  MYSQL_ROOT_PASSWORD: {{ .Values.mysql_password }}
+
+
+
+
+
diff --git a/kubernetes/terraform/helm/charts/mariadb/values.yaml b/kubernetes/terraform/helm/charts/mariadb/values.yaml
index 663b1d986..be1f2d416 100644
--- a/kubernetes/terraform/helm/charts/mariadb/values.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/values.yaml
@@ -1,3 +1,5 @@
 disk_size: "5Gi"
 mysql_version: "10.6.7"
-mysql_database_name: pychat
+mysql_database_name: $mysql_database_name
+mysql_user: $mysql_user
+mysql_password: $mysql_password
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 2dd16c89a..92713fdb8 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -1,57 +1,180 @@
 resource "helm_release" "global" {
-  name = "backend"
-  chart = "./charts/global"
+  name  = "global"
+  chart = "${path.module}/charts/global"
 }
 
 resource "helm_release" "backend" {
-  name = "backend"
-  chart = "./charts/backend"
+  name       = "backend"
+  chart      = "${path.module}/charts/backend"
+  depends_on = [helm_release.global, helm_release.mariadb, helm_release.redis]
+
+  set {
+    name  = "domain"
+    value = var.domain
+  }
+  set {
+    name  = "mysql_database_name"
+    value = var.mysql_database_name
+  }
+  set {
+    name  = "mysql_user"
+    value = var.mysql_user
+  }
+  set {
+    name  = "mysql_password"
+    value = var.mysql_password
+  }
+  set {
+    name  = "SECRET_KEY"
+    value = var.SECRET_KEY
+  }
+  set {
+    name  = "RECAPTCHA_PRIVATE_KEY"
+    value = var.RECAPTCHA_PRIVATE_KEY
+  }
+  set {
+    name  = "RECAPTCHA_PUBLIC_KEY"
+    value = var.RECAPTCHA_PUBLIC_KEY
+  }
+  set {
+    name  = "GOOGLE_OAUTH_2_CLIENT_ID"
+    value = var.GOOGLE_OAUTH_2_CLIENT_ID
+  }
+  set {
+    name  = "FACEBOOK_ACCESS_TOKEN"
+    value = var.FACEBOOK_ACCESS_TOKEN
+  }
+  set {
+    name  = "GIPHY_API_KEY"
+    value = var.GIPHY_API_KEY
+  }
+  set {
+    name  = "FIREBASE_API_KEY"
+    value = var.FIREBASE_API_KEY
+  }
+  set {
+    name  = "DEFAULT_PROFILE_ID"
+    value = var.DEFAULT_PROFILE_ID
+  }
+}
+
+resource "helm_release" "certmanager-definition" {
+  name = "cert-manager-definition"
+  chart = "jetstack/cert-manager"
+  namespace = "cert-manager"
+  version = "1.8.0"
 }
 
 resource "helm_release" "certmanager" {
-  name = "certmanager"
-  chart = "./charts/certmanager"
+  name  = "certmanager"
+  chart = "${path.module}/charts/certmanager"
   set {
-    name = "domain"
+    name  = "domain"
     value = var.domain
   }
+  set {
+    name  = "email"
+    value = var.email
+  }
+  set {
+    name  = "cf_api_token"
+    value = var.cf_api_token
+  }
+  depends_on = [helm_release.global, helm_release.certmanager-definition]
+}
+
+resource "helm_release" "backup" {
+  name       = "backup"
+  chart      = "${path.module}/charts/backup"
+  depends_on = [helm_release.mariadb, helm_release.backend] // because of pvc-photo
+
+  set {
+    name  = "email"
+    value = var.email
+  }
+  set {
+    name  = "idr_rsa"
+    value = var.idr_rsa
+  }
+  set {
+    name  = "id_rsa_pub"
+    value = var.id_rsa_pub
+  }
+  set {
+    name  = "github"
+    value = var.github
+  }
+  set {
+    name  = "domain"
+    value = var.domain
+  }
+  set {
+    name  = "mysql_database_name"
+    value = var.mysql_database_name
+  }
+  set {
+    name  = "mysql_user"
+    value = var.mysql_user
+  }
+  set {
+    name  = "mysql_password"
+    value = var.mysql_password
+  }
 }
 
 resource "helm_release" "coturn" {
-  name = "coturn"
-  chart = "./charts/coturn"
+  name       = "coturn"
+  chart      = "${path.module}/charts/coturn"
+  depends_on = [helm_release.global, helm_release.certmanager]
 }
 
 resource "helm_release" "frontend" {
-  name = "frontend"
-  chart = "./charts/frontend"
+  name       = "frontend"
+  chart      = "${path.module}/charts/frontend"
+  depends_on = [helm_release.global, helm_release.backend] // because of pvc-photo
 }
 
 resource "helm_release" "ingress" {
-  name = "ingress"
-  chart = "./charts/ingress"
-  set  {
-    name = "domain"
+  name  = "ingress"
+  chart = "${path.module}/charts/ingress"
+  set {
+    name  = "domain"
     value = var.domain
 
   }
   set {
-    name = "external_ip"
+    name  = "external_ip"
     value = var.ip_address
   }
+  depends_on = [helm_release.global]
 }
 
 resource "helm_release" "mariadb" {
-  name = "mariadb"
-  chart = "./charts/mariadb"
+  name       = "mariadb"
+  chart      = "${path.module}/charts/mariadb"
+  depends_on = [helm_release.global]
+  set {
+    name  = "mysql_database_name"
+    value = var.mysql_database_name
+  }
+  set {
+    name  = "mysql_user"
+    value = var.mysql_user
+  }
+  set {
+    name  = "mysql_password"
+    value = var.mysql_password
+  }
 }
 
 resource "helm_release" "postfix" {
-  name = "postfix"
-  chart = "./charts/postfix"
+  name       = "postfix"
+  chart      = "${path.module}/charts/postfix"
+  depends_on = [helm_release.global, helm_release.certmanager]
 }
 
 resource "helm_release" "redis" {
-  name = "redis"
-  chart = "./charts/redis"
+  name       = "redis"
+  chart      = "${path.module}/charts/redis"
+  depends_on = [helm_release.global]
 }
diff --git a/kubernetes/terraform/helm/providers.tf b/kubernetes/terraform/helm/providers.tf
index 7df99ce60..94c6ac990 100644
--- a/kubernetes/terraform/helm/providers.tf
+++ b/kubernetes/terraform/helm/providers.tf
@@ -7,8 +7,13 @@ terraform {
   }
 }
 
+resource "local_file" "kubeconfig" {
+  content  = base64decode(var.kubeconfig)
+  filename = "${path.module}/.kubeconfig"
+}
+
 provider "helm" {
   kubernetes {
-    config_context = var.kubeconfig
+    config_path = local_file.kubeconfig.filename
   }
 }
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 70e207ae7..d7d5b4772 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,3 +1,25 @@
 variable "domain" {}
+variable "email" {}
+variable "github" {}
+variable "idr_rsa" {}
+variable "id_rsa_pub" {}
 variable "ip_address" {}
+variable "SECRET_KEY" {}
+variable "RECAPTCHA_PRIVATE_KEY" {}
+variable "RECAPTCHA_PUBLIC_KEY" {}
+variable "GOOGLE_OAUTH_2_CLIENT_ID" {}
+variable "FACEBOOK_ACCESS_TOKEN" {}
+variable "GIPHY_API_KEY" {}
+variable "FIREBASE_API_KEY" {}
+variable "DEFAULT_PROFILE_ID" {}
 variable "kubeconfig" {}
+variable "cf_api_token" {}
+variable "mysql_password" {
+  default = "pypass"
+}
+variable "mysql_database_name" {
+  default = "pychat"
+}
+variable "mysql_user" {
+  default = "pychat"
+}
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index 532c7329a..4804739f5 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -2,7 +2,13 @@ variable "linode_token" {}
 variable "cloud_flare_zone_id" {}
 variable "cloud_flare_api_token" {}
 variable "domain_name" {}
-
+variable "email" {}
+variable "github" {}
+variable "idr_rsa" {}
+variable "id_rsa_pub" {}
+variable "ip_address" {}
+variable "kubeconfig" {}
+variable "cf_api_token" {}
 module "linode" {
   source                  = "./linode"
   linode_token = var.linode_token
@@ -21,4 +27,17 @@ module "helm" {
   kubeconfig = module.linode.kubeconfig
   domain = var.domain_name
   ip_address = module.linode.ip_address
+  cf_api_token = var.cloud_flare_api_token
+  email = var.email
+  github = var.github
+  idr_rsa = var.idr_rsa
+  id_rsa_pub = var.id_rsa_pub
+  SECRET_KEY = var.SECRET_KEY
+  RECAPTCHA_PRIVATE_KEY = var.RECAPTCHA_PRIVATE_KEY
+  RECAPTCHA_PUBLIC_KEY = var.RECAPTCHA_PUBLIC_KEY
+  GOOGLE_OAUTH_2_CLIENT_ID = var.GOOGLE_OAUTH_2_CLIENT_ID
+  FACEBOOK_ACCESS_TOKEN = var.FACEBOOK_ACCESS_TOKEN
+  GIPHY_API_KEY = var.GIPHY_API_KEY
+  FIREBASE_API_KEY = var.FIREBASE_API_KEY
+  DEFAULT_PROFILE_ID = var.DEFAULT_PROFILE_ID
 }
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
new file mode 100644
index 000000000..fd4786b4f
--- /dev/null
+++ b/kubernetes/terraform/variables.tf
@@ -0,0 +1,24 @@
+variable "SECRET_KEY" {
+  default = "GEvcy2yoMOu6OaJj0ZIt"
+}
+variable "RECAPTCHA_PRIVATE_KEY" {
+  default = ""
+}
+variable "RECAPTCHA_PUBLIC_KEY" {
+  default = ""
+}
+variable "GOOGLE_OAUTH_2_CLIENT_ID" {
+  default = ""
+}
+variable "FACEBOOK_ACCESS_TOKEN" {
+  default = ""
+}
+variable "GIPHY_API_KEY" {
+  default = ""
+}
+variable "FIREBASE_API_KEY" {
+  default = ""
+}
+variable "DEFAULT_PROFILE_ID" {
+  default = 1
+}

From a3678e84edccc2a1f91dd6a2111c0ca60ea37cba Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 27 May 2023 13:32:01 +0300
Subject: [PATCH 179/221] Fixe terraform

---
 kubernetes/terraform/cloudflare/main.tf       |    1 -
 .../helm/charts/backend/templates/cm.yaml     |    2 +-
 .../terraform/helm/charts/backend/values.yaml |    2 +-
 .../terraform/helm/charts/backup/values.yaml  |    2 +-
 .../helm/charts/certmanager/Chart.yaml        |    2 +-
 .../certmanager/templates/jetstack.yaml       | 5394 +++++++++++++++++
 .../helm/charts/global/templates/ns.yaml      |    5 -
 kubernetes/terraform/helm/main.tf             |   15 +-
 kubernetes/terraform/helm/variables.tf        |    2 +-
 kubernetes/terraform/main.tf                  |    6 +-
 10 files changed, 5406 insertions(+), 25 deletions(-)
 create mode 100644 kubernetes/terraform/helm/charts/certmanager/templates/jetstack.yaml

diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 2c2003e05..84ab94d3d 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -1,4 +1,3 @@
-
 resource "cloudflare_record" "master_pychat" {
   name    = var.domain_name
   type    = "A"
diff --git a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
index 8f8b4cc33..f412f8515 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
@@ -13,4 +13,4 @@ data:
   REDIS_PUBSUB: 'true'
   EMAIL_PORT: '25'
   EMAIL_HOST: 'postfix-service'
-  DEFAULT_PROFILE_ID: {{ .Values.DEFAULT_PROFILE_ID }}
+  DEFAULT_PROFILE_ID: "{{ .Values.DEFAULT_PROFILE_ID }}"
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
index 0e3cf7205..3650583ed 100644
--- a/kubernetes/terraform/helm/charts/backend/values.yaml
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -9,7 +9,7 @@ mysql:
   mysql_user: $mysql_user
   mysql_password: $mysql_password
 domain: $domain
-DEFAULT_PROFILE_ID: $DEFAULT_PROFILE_ID
+DEFAULT_PROFILE_ID: "${DEFAULT_PROFILE_ID}"
 FIREBASE_API_KEY: $FIREBASE_API_KEY
 GIPHY_API_KEY: $GIPHY_API_KEY
 FACEBOOK_ACCESS_TOKEN: $FACEBOOK_ACCESS_TOKEN
diff --git a/kubernetes/terraform/helm/charts/backup/values.yaml b/kubernetes/terraform/helm/charts/backup/values.yaml
index 53e52df07..9273dd1e9 100644
--- a/kubernetes/terraform/helm/charts/backup/values.yaml
+++ b/kubernetes/terraform/helm/charts/backup/values.yaml
@@ -6,6 +6,6 @@ image:
   tag: "latest"
 
 disk-size: 15Gi
-idr_rsa: $idr_rsa
+id_rsa: $id_rsa
 id_rsa_pub: $id_rsa_pub
 github: $github
diff --git a/kubernetes/terraform/helm/charts/certmanager/Chart.yaml b/kubernetes/terraform/helm/charts/certmanager/Chart.yaml
index 362640da0..f6dc09f09 100644
--- a/kubernetes/terraform/helm/charts/certmanager/Chart.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: certmanager
-description: this chart automatically generates and updates ssl certificates from letsencrypt
+description: this chart automatically generates and updates ssl certificates from
 type: application
 version: 0.1.0
 appVersion: "1.16.0"
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/jetstack.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/jetstack.yaml
new file mode 100644
index 000000000..02a8c6def
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/jetstack.yaml
@@ -0,0 +1,5394 @@
+# https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml
+
+# This chart was put here manually since you cannot install it without Certificate and Issuer, readiness prob will fail
+# If you try to install issuer first it will fail since CRD is not installed yet
+# So the only option is to install them together
+
+# Copyright 2021 The cert-manager Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
+---
+# Source: cert-manager/templates/crd-templates.yaml
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: certificaterequests.cert-manager.io
+  labels:
+    app: 'cert-manager'
+    app.kubernetes.io/name: 'cert-manager'
+    app.kubernetes.io/instance: 'cert-manager'
+    # Generated labels
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  group: cert-manager.io
+  names:
+    kind: CertificateRequest
+    listKind: CertificateRequestList
+    plural: certificaterequests
+    shortNames:
+      - cr
+      - crs
+    singular: certificaterequest
+    categories:
+      - cert-manager
+  scope: Namespaced
+  versions:
+    - name: v1
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+        - jsonPath: .status.conditions[?(@.type=="Approved")].status
+          name: Approved
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Denied")].status
+          name: Denied
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].status
+          name: Ready
+          type: string
+        - jsonPath: .spec.issuerRef.name
+          name: Issuer
+          type: string
+        - jsonPath: .spec.username
+          name: Requestor
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].message
+          name: Status
+          priority: 1
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
+          name: Age
+          type: date
+      schema:
+        openAPIV3Schema:
+          description: "A CertificateRequest is used to request a signed certificate from one of the configured issuers. \n All fields within the CertificateRequest's `spec` are immutable after creation. A CertificateRequest will either succeed or fail, as denoted by its `status.state` field. \n A CertificateRequest is a one-shot resource, meaning it represents a single point in time request for a certificate and cannot be re-used."
+          type: object
+          required:
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: Desired state of the CertificateRequest resource.
+              type: object
+              required:
+                - issuerRef
+                - request
+              properties:
+                duration:
+                  description: The requested 'duration' (i.e. lifetime) of the Certificate. This option may be ignored/overridden by some issuer types.
+                  type: string
+                extra:
+                  description: Extra contains extra attributes of the user that created the CertificateRequest. Populated by the cert-manager webhook on creation and immutable.
+                  type: object
+                  additionalProperties:
+                    type: array
+                    items:
+                      type: string
+                groups:
+                  description: Groups contains group membership of the user that created the CertificateRequest. Populated by the cert-manager webhook on creation and immutable.
+                  type: array
+                  items:
+                    type: string
+                  x-kubernetes-list-type: atomic
+                isCA:
+                  description: IsCA will request to mark the certificate as valid for certificate signing when submitting to the issuer. This will automatically add the `cert sign` usage to the list of `usages`.
+                  type: boolean
+                issuerRef:
+                  description: IssuerRef is a reference to the issuer for this CertificateRequest.  If the `kind` field is not set, or set to `Issuer`, an Issuer resource with the given name in the same namespace as the CertificateRequest will be used.  If the `kind` field is set to `ClusterIssuer`, a ClusterIssuer with the provided name will be used. The `name` field in this stanza is required at all times. The group field refers to the API group of the issuer which defaults to `cert-manager.io` if empty.
+                  type: object
+                  required:
+                    - name
+                  properties:
+                    group:
+                      description: Group of the resource being referred to.
+                      type: string
+                    kind:
+                      description: Kind of the resource being referred to.
+                      type: string
+                    name:
+                      description: Name of the resource being referred to.
+                      type: string
+                request:
+                  description: The PEM-encoded x509 certificate signing request to be submitted to the CA for signing.
+                  type: string
+                  format: byte
+                uid:
+                  description: UID contains the uid of the user that created the CertificateRequest. Populated by the cert-manager webhook on creation and immutable.
+                  type: string
+                usages:
+                  description: Usages is the set of x509 usages that are requested for the certificate. If usages are set they SHOULD be encoded inside the CSR spec Defaults to `digital signature` and `key encipherment` if not specified.
+                  type: array
+                  items:
+                    description: 'KeyUsage specifies valid usage contexts for keys. See: https://tools.ietf.org/html/rfc5280#section-4.2.1.3      https://tools.ietf.org/html/rfc5280#section-4.2.1.12 Valid KeyUsage values are as follows: "signing", "digital signature", "content commitment", "key encipherment", "key agreement", "data encipherment", "cert sign", "crl sign", "encipher only", "decipher only", "any", "server auth", "client auth", "code signing", "email protection", "s/mime", "ipsec end system", "ipsec tunnel", "ipsec user", "timestamping", "ocsp signing", "microsoft sgc", "netscape sgc"'
+                    type: string
+                    enum:
+                      - signing
+                      - digital signature
+                      - content commitment
+                      - key encipherment
+                      - key agreement
+                      - data encipherment
+                      - cert sign
+                      - crl sign
+                      - encipher only
+                      - decipher only
+                      - any
+                      - server auth
+                      - client auth
+                      - code signing
+                      - email protection
+                      - s/mime
+                      - ipsec end system
+                      - ipsec tunnel
+                      - ipsec user
+                      - timestamping
+                      - ocsp signing
+                      - microsoft sgc
+                      - netscape sgc
+                username:
+                  description: Username contains the name of the user that created the CertificateRequest. Populated by the cert-manager webhook on creation and immutable.
+                  type: string
+            status:
+              description: Status of the CertificateRequest. This is set and managed automatically.
+              type: object
+              properties:
+                ca:
+                  description: The PEM encoded x509 certificate of the signer, also known as the CA (Certificate Authority). This is set on a best-effort basis by different issuers. If not set, the CA is assumed to be unknown/not available.
+                  type: string
+                  format: byte
+                certificate:
+                  description: The PEM encoded x509 certificate resulting from the certificate signing request. If not set, the CertificateRequest has either not been completed or has failed. More information on failure can be found by checking the `conditions` field.
+                  type: string
+                  format: byte
+                conditions:
+                  description: List of status conditions to indicate the status of a CertificateRequest. Known condition types are `Ready` and `InvalidRequest`.
+                  type: array
+                  items:
+                    description: CertificateRequestCondition contains condition information for a CertificateRequest.
+                    type: object
+                    required:
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
+                        type: string
+                        format: date-time
+                      message:
+                        description: Message is a human readable description of the details of the last transition, complementing reason.
+                        type: string
+                      reason:
+                        description: Reason is a brief machine readable explanation for the condition's last transition.
+                        type: string
+                      status:
+                        description: Status of the condition, one of (`True`, `False`, `Unknown`).
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: Type of the condition, known values are (`Ready`, `InvalidRequest`, `Approved`, `Denied`).
+                        type: string
+                  x-kubernetes-list-map-keys:
+                    - type
+                  x-kubernetes-list-type: map
+                failureTime:
+                  description: FailureTime stores the time that this CertificateRequest failed. This is used to influence garbage collection and back-off.
+                  type: string
+                  format: date-time
+      served: true
+      storage: true
+---
+# Source: cert-manager/templates/crd-templates.yaml
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: certificates.cert-manager.io
+  labels:
+    app: 'cert-manager'
+    app.kubernetes.io/name: 'cert-manager'
+    app.kubernetes.io/instance: 'cert-manager'
+    # Generated labels
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  group: cert-manager.io
+  names:
+    kind: Certificate
+    listKind: CertificateList
+    plural: certificates
+    shortNames:
+      - cert
+      - certs
+    singular: certificate
+    categories:
+      - cert-manager
+  scope: Namespaced
+  versions:
+    - name: v1
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+        - jsonPath: .status.conditions[?(@.type=="Ready")].status
+          name: Ready
+          type: string
+        - jsonPath: .spec.secretName
+          name: Secret
+          type: string
+        - jsonPath: .spec.issuerRef.name
+          name: Issuer
+          priority: 1
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].message
+          name: Status
+          priority: 1
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
+          name: Age
+          type: date
+      schema:
+        openAPIV3Schema:
+          description: "A Certificate resource should be created to ensure an up to date and signed x509 certificate is stored in the Kubernetes Secret resource named in `spec.secretName`. \n The stored certificate will be renewed before it expires (as configured by `spec.renewBefore`)."
+          type: object
+          required:
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: Desired state of the Certificate resource.
+              type: object
+              required:
+                - issuerRef
+                - secretName
+              properties:
+                additionalOutputFormats:
+                  description: AdditionalOutputFormats defines extra output formats of the private key and signed certificate chain to be written to this Certificate's target Secret. This is an Alpha Feature and is only enabled with the `--feature-gates=AdditionalCertificateOutputFormats=true` option on both the controller and webhook components.
+                  type: array
+                  items:
+                    description: CertificateAdditionalOutputFormat defines an additional output format of a Certificate resource. These contain supplementary data formats of the signed certificate chain and paired private key.
+                    type: object
+                    required:
+                      - type
+                    properties:
+                      type:
+                        description: Type is the name of the format type that should be written to the Certificate's target Secret.
+                        type: string
+                        enum:
+                          - DER
+                          - CombinedPEM
+                commonName:
+                  description: 'CommonName is a common name to be used on the Certificate. The CommonName should have a length of 64 characters or fewer to avoid generating invalid CSRs. This value is ignored by TLS clients when any subject alt name is set. This is x509 behaviour: https://tools.ietf.org/html/rfc6125#section-6.4.4'
+                  type: string
+                dnsNames:
+                  description: DNSNames is a list of DNS subjectAltNames to be set on the Certificate.
+                  type: array
+                  items:
+                    type: string
+                duration:
+                  description: The requested 'duration' (i.e. lifetime) of the Certificate. This option may be ignored/overridden by some issuer types. If unset this defaults to 90 days. Certificate will be renewed either 2/3 through its duration or `renewBefore` period before its expiry, whichever is later. Minimum accepted duration is 1 hour. Value must be in units accepted by Go time.ParseDuration https://golang.org/pkg/time/#ParseDuration
+                  type: string
+                emailAddresses:
+                  description: EmailAddresses is a list of email subjectAltNames to be set on the Certificate.
+                  type: array
+                  items:
+                    type: string
+                encodeUsagesInRequest:
+                  description: EncodeUsagesInRequest controls whether key usages should be present in the CertificateRequest
+                  type: boolean
+                ipAddresses:
+                  description: IPAddresses is a list of IP address subjectAltNames to be set on the Certificate.
+                  type: array
+                  items:
+                    type: string
+                isCA:
+                  description: IsCA will mark this Certificate as valid for certificate signing. This will automatically add the `cert sign` usage to the list of `usages`.
+                  type: boolean
+                issuerRef:
+                  description: IssuerRef is a reference to the issuer for this certificate. If the `kind` field is not set, or set to `Issuer`, an Issuer resource with the given name in the same namespace as the Certificate will be used. If the `kind` field is set to `ClusterIssuer`, a ClusterIssuer with the provided name will be used. The `name` field in this stanza is required at all times.
+                  type: object
+                  required:
+                    - name
+                  properties:
+                    group:
+                      description: Group of the resource being referred to.
+                      type: string
+                    kind:
+                      description: Kind of the resource being referred to.
+                      type: string
+                    name:
+                      description: Name of the resource being referred to.
+                      type: string
+                keystores:
+                  description: Keystores configures additional keystore output formats stored in the `secretName` Secret resource.
+                  type: object
+                  properties:
+                    jks:
+                      description: JKS configures options for storing a JKS keystore in the `spec.secretName` Secret resource.
+                      type: object
+                      required:
+                        - create
+                        - passwordSecretRef
+                      properties:
+                        create:
+                          description: Create enables JKS keystore creation for the Certificate. If true, a file named `keystore.jks` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef`. The keystore file will only be updated upon re-issuance. A file named `truststore.jks` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
+                          type: boolean
+                        passwordSecretRef:
+                          description: PasswordSecretRef is a reference to a key in a Secret resource containing the password used to encrypt the JKS keystore.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            key:
+                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                              type: string
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                    pkcs12:
+                      description: PKCS12 configures options for storing a PKCS12 keystore in the `spec.secretName` Secret resource.
+                      type: object
+                      required:
+                        - create
+                        - passwordSecretRef
+                      properties:
+                        create:
+                          description: Create enables PKCS12 keystore creation for the Certificate. If true, a file named `keystore.p12` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef`. The keystore file will only be updated upon re-issuance. A file named `truststore.p12` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
+                          type: boolean
+                        passwordSecretRef:
+                          description: PasswordSecretRef is a reference to a key in a Secret resource containing the password used to encrypt the PKCS12 keystore.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            key:
+                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                              type: string
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                privateKey:
+                  description: Options to control private keys used for the Certificate.
+                  type: object
+                  properties:
+                    algorithm:
+                      description: Algorithm is the private key algorithm of the corresponding private key for this certificate. If provided, allowed values are either `RSA`,`Ed25519` or `ECDSA` If `algorithm` is specified and `size` is not provided, key size of 256 will be used for `ECDSA` key algorithm and key size of 2048 will be used for `RSA` key algorithm. key size is ignored when using the `Ed25519` key algorithm.
+                      type: string
+                      enum:
+                        - RSA
+                        - ECDSA
+                        - Ed25519
+                    encoding:
+                      description: The private key cryptography standards (PKCS) encoding for this certificate's private key to be encoded in. If provided, allowed values are `PKCS1` and `PKCS8` standing for PKCS#1 and PKCS#8, respectively. Defaults to `PKCS1` if not specified.
+                      type: string
+                      enum:
+                        - PKCS1
+                        - PKCS8
+                    rotationPolicy:
+                      description: RotationPolicy controls how private keys should be regenerated when a re-issuance is being processed. If set to Never, a private key will only be generated if one does not already exist in the target `spec.secretName`. If one does exists but it does not have the correct algorithm or size, a warning will be raised to await user intervention. If set to Always, a private key matching the specified requirements will be generated whenever a re-issuance occurs. Default is 'Never' for backward compatibility.
+                      type: string
+                      enum:
+                        - Never
+                        - Always
+                    size:
+                      description: Size is the key bit size of the corresponding private key for this certificate. If `algorithm` is set to `RSA`, valid values are `2048`, `4096` or `8192`, and will default to `2048` if not specified. If `algorithm` is set to `ECDSA`, valid values are `256`, `384` or `521`, and will default to `256` if not specified. If `algorithm` is set to `Ed25519`, Size is ignored. No other values are allowed.
+                      type: integer
+                renewBefore:
+                  description: How long before the currently issued certificate's expiry cert-manager should renew the certificate. The default is 2/3 of the issued certificate's duration. Minimum accepted value is 5 minutes. Value must be in units accepted by Go time.ParseDuration https://golang.org/pkg/time/#ParseDuration
+                  type: string
+                revisionHistoryLimit:
+                  description: revisionHistoryLimit is the maximum number of CertificateRequest revisions that are maintained in the Certificate's history. Each revision represents a single `CertificateRequest` created by this Certificate, either when it was created, renewed, or Spec was changed. Revisions will be removed by oldest first if the number of revisions exceeds this number. If set, revisionHistoryLimit must be a value of `1` or greater. If unset (`nil`), revisions will not be garbage collected. Default value is `nil`.
+                  type: integer
+                  format: int32
+                secretName:
+                  description: SecretName is the name of the secret resource that will be automatically created and managed by this Certificate resource. It will be populated with a private key and certificate, signed by the denoted issuer.
+                  type: string
+                secretTemplate:
+                  description: SecretTemplate defines annotations and labels to be copied to the Certificate's Secret. Labels and annotations on the Secret will be changed as they appear on the SecretTemplate when added or removed. SecretTemplate annotations are added in conjunction with, and cannot overwrite, the base set of annotations cert-manager sets on the Certificate's Secret.
+                  type: object
+                  properties:
+                    annotations:
+                      description: Annotations is a key value map to be copied to the target Kubernetes Secret.
+                      type: object
+                      additionalProperties:
+                        type: string
+                    labels:
+                      description: Labels is a key value map to be copied to the target Kubernetes Secret.
+                      type: object
+                      additionalProperties:
+                        type: string
+                subject:
+                  description: Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).
+                  type: object
+                  properties:
+                    countries:
+                      description: Countries to be used on the Certificate.
+                      type: array
+                      items:
+                        type: string
+                    localities:
+                      description: Cities to be used on the Certificate.
+                      type: array
+                      items:
+                        type: string
+                    organizationalUnits:
+                      description: Organizational Units to be used on the Certificate.
+                      type: array
+                      items:
+                        type: string
+                    organizations:
+                      description: Organizations to be used on the Certificate.
+                      type: array
+                      items:
+                        type: string
+                    postalCodes:
+                      description: Postal codes to be used on the Certificate.
+                      type: array
+                      items:
+                        type: string
+                    provinces:
+                      description: State/Provinces to be used on the Certificate.
+                      type: array
+                      items:
+                        type: string
+                    serialNumber:
+                      description: Serial number to be used on the Certificate.
+                      type: string
+                    streetAddresses:
+                      description: Street addresses to be used on the Certificate.
+                      type: array
+                      items:
+                        type: string
+                uris:
+                  description: URIs is a list of URI subjectAltNames to be set on the Certificate.
+                  type: array
+                  items:
+                    type: string
+                usages:
+                  description: Usages is the set of x509 usages that are requested for the certificate. Defaults to `digital signature` and `key encipherment` if not specified.
+                  type: array
+                  items:
+                    description: 'KeyUsage specifies valid usage contexts for keys. See: https://tools.ietf.org/html/rfc5280#section-4.2.1.3      https://tools.ietf.org/html/rfc5280#section-4.2.1.12 Valid KeyUsage values are as follows: "signing", "digital signature", "content commitment", "key encipherment", "key agreement", "data encipherment", "cert sign", "crl sign", "encipher only", "decipher only", "any", "server auth", "client auth", "code signing", "email protection", "s/mime", "ipsec end system", "ipsec tunnel", "ipsec user", "timestamping", "ocsp signing", "microsoft sgc", "netscape sgc"'
+                    type: string
+                    enum:
+                      - signing
+                      - digital signature
+                      - content commitment
+                      - key encipherment
+                      - key agreement
+                      - data encipherment
+                      - cert sign
+                      - crl sign
+                      - encipher only
+                      - decipher only
+                      - any
+                      - server auth
+                      - client auth
+                      - code signing
+                      - email protection
+                      - s/mime
+                      - ipsec end system
+                      - ipsec tunnel
+                      - ipsec user
+                      - timestamping
+                      - ocsp signing
+                      - microsoft sgc
+                      - netscape sgc
+            status:
+              description: Status of the Certificate. This is set and managed automatically.
+              type: object
+              properties:
+                conditions:
+                  description: List of status conditions to indicate the status of certificates. Known condition types are `Ready` and `Issuing`.
+                  type: array
+                  items:
+                    description: CertificateCondition contains condition information for an Certificate.
+                    type: object
+                    required:
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
+                        type: string
+                        format: date-time
+                      message:
+                        description: Message is a human readable description of the details of the last transition, complementing reason.
+                        type: string
+                      observedGeneration:
+                        description: If set, this represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date with respect to the current state of the Certificate.
+                        type: integer
+                        format: int64
+                      reason:
+                        description: Reason is a brief machine readable explanation for the condition's last transition.
+                        type: string
+                      status:
+                        description: Status of the condition, one of (`True`, `False`, `Unknown`).
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: Type of the condition, known values are (`Ready`, `Issuing`).
+                        type: string
+                  x-kubernetes-list-map-keys:
+                    - type
+                  x-kubernetes-list-type: map
+                failedIssuanceAttempts:
+                  description: The number of continuous failed issuance attempts up till now. This field gets removed (if set) on a successful issuance and gets set to 1 if unset and an issuance has failed. If an issuance has failed, the delay till the next issuance will be calculated using formula time.Hour * 2 ^ (failedIssuanceAttempts - 1).
+                  type: integer
+                lastFailureTime:
+                  description: LastFailureTime is the time as recorded by the Certificate controller of the most recent failure to complete a CertificateRequest for this Certificate resource. If set, cert-manager will not re-request another Certificate until 1 hour has elapsed from this time.
+                  type: string
+                  format: date-time
+                nextPrivateKeySecretName:
+                  description: The name of the Secret resource containing the private key to be used for the next certificate iteration. The keymanager controller will automatically set this field if the `Issuing` condition is set to `True`. It will automatically unset this field when the Issuing condition is not set or False.
+                  type: string
+                notAfter:
+                  description: The expiration time of the certificate stored in the secret named by this resource in `spec.secretName`.
+                  type: string
+                  format: date-time
+                notBefore:
+                  description: The time after which the certificate stored in the secret named by this resource in spec.secretName is valid.
+                  type: string
+                  format: date-time
+                renewalTime:
+                  description: RenewalTime is the time at which the certificate will be next renewed. If not set, no upcoming renewal is scheduled.
+                  type: string
+                  format: date-time
+                revision:
+                  description: "The current 'revision' of the certificate as issued. \n When a CertificateRequest resource is created, it will have the `cert-manager.io/certificate-revision` set to one greater than the current value of this field. \n Upon issuance, this field will be set to the value of the annotation on the CertificateRequest resource used to issue the certificate. \n Persisting the value on the CertificateRequest resource allows the certificates controller to know whether a request is part of an old issuance or if it is part of the ongoing revision's issuance by checking if the revision value in the annotation is greater than this field."
+                  type: integer
+      served: true
+      storage: true
+---
+# Source: cert-manager/templates/crd-templates.yaml
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: challenges.acme.cert-manager.io
+  labels:
+    app: 'cert-manager'
+    app.kubernetes.io/name: 'cert-manager'
+    app.kubernetes.io/instance: 'cert-manager'
+    # Generated labels
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  group: acme.cert-manager.io
+  names:
+    kind: Challenge
+    listKind: ChallengeList
+    plural: challenges
+    singular: challenge
+    categories:
+      - cert-manager
+      - cert-manager-acme
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .status.state
+          name: State
+          type: string
+        - jsonPath: .spec.dnsName
+          name: Domain
+          type: string
+        - jsonPath: .status.reason
+          name: Reason
+          priority: 1
+          type: string
+        - description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
+          jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      name: v1
+      schema:
+        openAPIV3Schema:
+          description: Challenge is a type to represent a Challenge request with an ACME server
+          type: object
+          required:
+            - metadata
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              required:
+                - authorizationURL
+                - dnsName
+                - issuerRef
+                - key
+                - solver
+                - token
+                - type
+                - url
+              properties:
+                authorizationURL:
+                  description: The URL to the ACME Authorization resource that this challenge is a part of.
+                  type: string
+                dnsName:
+                  description: dnsName is the identifier that this challenge is for, e.g. example.com. If the requested DNSName is a 'wildcard', this field MUST be set to the non-wildcard domain, e.g. for `*.example.com`, it must be `example.com`.
+                  type: string
+                issuerRef:
+                  description: References a properly configured ACME-type Issuer which should be used to create this Challenge. If the Issuer does not exist, processing will be retried. If the Issuer is not an 'ACME' Issuer, an error will be returned and the Challenge will be marked as failed.
+                  type: object
+                  required:
+                    - name
+                  properties:
+                    group:
+                      description: Group of the resource being referred to.
+                      type: string
+                    kind:
+                      description: Kind of the resource being referred to.
+                      type: string
+                    name:
+                      description: Name of the resource being referred to.
+                      type: string
+                key:
+                  description: 'The ACME challenge key for this challenge For HTTP01 challenges, this is the value that must be responded with to complete the HTTP01 challenge in the format: `<private key JWK thumbprint>.<key from acme server for challenge>`. For DNS01 challenges, this is the base64 encoded SHA256 sum of the `<private key JWK thumbprint>.<key from acme server for challenge>` text that must be set as the TXT record content.'
+                  type: string
+                solver:
+                  description: Contains the domain solving configuration that should be used to solve this challenge resource.
+                  type: object
+                  properties:
+                    dns01:
+                      description: Configures cert-manager to attempt to complete authorizations by performing the DNS01 challenge flow.
+                      type: object
+                      properties:
+                        acmeDNS:
+                          description: Use the 'ACME DNS' (https://github.com/joohoi/acme-dns) API to manage DNS01 challenge records.
+                          type: object
+                          required:
+                            - accountSecretRef
+                            - host
+                          properties:
+                            accountSecretRef:
+                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                            host:
+                              type: string
+                        akamai:
+                          description: Use the Akamai DNS zone management API to manage DNS01 challenge records.
+                          type: object
+                          required:
+                            - accessTokenSecretRef
+                            - clientSecretSecretRef
+                            - clientTokenSecretRef
+                            - serviceConsumerDomain
+                          properties:
+                            accessTokenSecretRef:
+                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                            clientSecretSecretRef:
+                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                            clientTokenSecretRef:
+                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                            serviceConsumerDomain:
+                              type: string
+                        azureDNS:
+                          description: Use the Microsoft Azure DNS API to manage DNS01 challenge records.
+                          type: object
+                          required:
+                            - resourceGroupName
+                            - subscriptionID
+                          properties:
+                            clientID:
+                              description: if both this and ClientSecret are left unset MSI will be used
+                              type: string
+                            clientSecretSecretRef:
+                              description: if both this and ClientID are left unset MSI will be used
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                            environment:
+                              description: name of the Azure environment (default AzurePublicCloud)
+                              type: string
+                              enum:
+                                - AzurePublicCloud
+                                - AzureChinaCloud
+                                - AzureGermanCloud
+                                - AzureUSGovernmentCloud
+                            hostedZoneName:
+                              description: name of the DNS zone that should be used
+                              type: string
+                            managedIdentity:
+                              description: managed identity configuration, can not be used at the same time as clientID, clientSecretSecretRef or tenantID
+                              type: object
+                              properties:
+                                clientID:
+                                  description: client ID of the managed identity, can not be used at the same time as resourceID
+                                  type: string
+                                resourceID:
+                                  description: resource ID of the managed identity, can not be used at the same time as clientID
+                                  type: string
+                            resourceGroupName:
+                              description: resource group the DNS zone is located in
+                              type: string
+                            subscriptionID:
+                              description: ID of the Azure subscription
+                              type: string
+                            tenantID:
+                              description: when specifying ClientID and ClientSecret then this field is also needed
+                              type: string
+                        cloudDNS:
+                          description: Use the Google Cloud DNS API to manage DNS01 challenge records.
+                          type: object
+                          required:
+                            - project
+                          properties:
+                            hostedZoneName:
+                              description: HostedZoneName is an optional field that tells cert-manager in which Cloud DNS zone the challenge record has to be created. If left empty cert-manager will automatically choose a zone.
+                              type: string
+                            project:
+                              type: string
+                            serviceAccountSecretRef:
+                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                        cloudflare:
+                          description: Use the Cloudflare API to manage DNS01 challenge records.
+                          type: object
+                          properties:
+                            apiKeySecretRef:
+                              description: 'API key to use to authenticate with Cloudflare. Note: using an API token to authenticate is now the recommended method as it allows greater control of permissions.'
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                            apiTokenSecretRef:
+                              description: API token used to authenticate with Cloudflare.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                            email:
+                              description: Email of the account, only required when using API key based authentication.
+                              type: string
+                        cnameStrategy:
+                          description: CNAMEStrategy configures how the DNS01 provider should handle CNAME records when found in DNS zones.
+                          type: string
+                          enum:
+                            - None
+                            - Follow
+                        digitalocean:
+                          description: Use the DigitalOcean DNS API to manage DNS01 challenge records.
+                          type: object
+                          required:
+                            - tokenSecretRef
+                          properties:
+                            tokenSecretRef:
+                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                        rfc2136:
+                          description: Use RFC2136 ("Dynamic Updates in the Domain Name System") (https://datatracker.ietf.org/doc/rfc2136/) to manage DNS01 challenge records.
+                          type: object
+                          required:
+                            - nameserver
+                          properties:
+                            nameserver:
+                              description: The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. This field is required.
+                              type: string
+                            tsigAlgorithm:
+                              description: 'The TSIG Algorithm configured in the DNS supporting RFC2136. Used only when ``tsigSecretSecretRef`` and ``tsigKeyName`` are defined. Supported values are (case-insensitive): ``HMACMD5`` (default), ``HMACSHA1``, ``HMACSHA256`` or ``HMACSHA512``.'
+                              type: string
+                            tsigKeyName:
+                              description: The TSIG Key name configured in the DNS. If ``tsigSecretSecretRef`` is defined, this field is required.
+                              type: string
+                            tsigSecretSecretRef:
+                              description: The name of the secret containing the TSIG value. If ``tsigKeyName`` is defined, this field is required.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                        route53:
+                          description: Use the AWS Route53 API to manage DNS01 challenge records.
+                          type: object
+                          required:
+                            - region
+                          properties:
+                            accessKeyID:
+                              description: 'The AccessKeyID is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials'
+                              type: string
+                            hostedZoneID:
+                              description: If set, the provider will manage only this zone in Route53 and will not do an lookup using the route53:ListHostedZonesByName api call.
+                              type: string
+                            region:
+                              description: Always set the region when using AccessKeyID and SecretAccessKey
+                              type: string
+                            role:
+                              description: Role is a Role ARN which the Route53 provider will assume using either the explicit credentials AccessKeyID/SecretAccessKey or the inferred credentials from environment variables, shared credentials file or AWS Instance metadata
+                              type: string
+                            secretAccessKeySecretRef:
+                              description: The SecretAccessKey is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                        webhook:
+                          description: Configure an external webhook based DNS01 challenge solver to manage DNS01 challenge records.
+                          type: object
+                          required:
+                            - groupName
+                            - solverName
+                          properties:
+                            config:
+                              description: Additional configuration that should be passed to the webhook apiserver when challenges are processed. This can contain arbitrary JSON data. Secret values should not be specified in this stanza. If secret values are needed (e.g. credentials for a DNS service), you should use a SecretKeySelector to reference a Secret resource. For details on the schema of this field, consult the webhook provider implementation's documentation.
+                              x-kubernetes-preserve-unknown-fields: true
+                            groupName:
+                              description: The API group name that should be used when POSTing ChallengePayload resources to the webhook apiserver. This should be the same as the GroupName specified in the webhook provider implementation.
+                              type: string
+                            solverName:
+                              description: The name of the solver to use, as defined in the webhook provider implementation. This will typically be the name of the provider, e.g. 'cloudflare'.
+                              type: string
+                    http01:
+                      description: Configures cert-manager to attempt to complete authorizations by performing the HTTP01 challenge flow. It is not possible to obtain certificates for wildcard domain names (e.g. `*.example.com`) using the HTTP01 challenge mechanism.
+                      type: object
+                      properties:
+                        gatewayHTTPRoute:
+                          description: The Gateway API is a sig-network community API that models service networking in Kubernetes (https://gateway-api.sigs.k8s.io/). The Gateway solver will create HTTPRoutes with the specified labels in the same namespace as the challenge. This solver is experimental, and fields / behaviour may change in the future.
+                          type: object
+                          properties:
+                            labels:
+                              description: Custom labels that will be applied to HTTPRoutes created by cert-manager while solving HTTP-01 challenges.
+                              type: object
+                              additionalProperties:
+                                type: string
+                            parentRefs:
+                              description: 'When solving an HTTP-01 challenge, cert-manager creates an HTTPRoute. cert-manager needs to know which parentRefs should be used when creating the HTTPRoute. Usually, the parentRef references a Gateway. See: https://gateway-api.sigs.k8s.io/v1alpha2/api-types/httproute/#attaching-to-gateways'
+                              type: array
+                              items:
+                                description: "ParentRef identifies an API object (usually a Gateway) that can be considered a parent of this resource (usually a route). The only kind of parent resource with \"Core\" support is Gateway. This API may be extended in the future to support additional kinds of parent resources, such as HTTPRoute. \n The API object must be valid in the cluster; the Group and Kind must be registered in the cluster for this reference to be valid. \n References to objects with invalid Group and Kind are not valid, and must be rejected by the implementation, with appropriate Conditions set on the containing object."
+                                type: object
+                                required:
+                                  - name
+                                properties:
+                                  group:
+                                    description: "Group is the group of the referent. \n Support: Core"
+                                    type: string
+                                    default: gateway.networking.k8s.io
+                                    maxLength: 253
+                                    pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  kind:
+                                    description: "Kind is kind of the referent. \n Support: Core (Gateway) Support: Custom (Other Resources)"
+                                    type: string
+                                    default: Gateway
+                                    maxLength: 63
+                                    minLength: 1
+                                    pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                                  name:
+                                    description: "Name is the name of the referent. \n Support: Core"
+                                    type: string
+                                    maxLength: 253
+                                    minLength: 1
+                                  namespace:
+                                    description: "Namespace is the namespace of the referent. When unspecified (or empty string), this refers to the local namespace of the Route. \n Support: Core"
+                                    type: string
+                                    maxLength: 63
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                  sectionName:
+                                    description: "SectionName is the name of a section within the target resource. In the following resources, SectionName is interpreted as the following: \n * Gateway: Listener Name \n Implementations MAY choose to support attaching Routes to other resources. If that is the case, they MUST clearly document how SectionName is interpreted. \n When unspecified (empty string), this will reference the entire resource. For the purpose of status, an attachment is considered successful if at least one section in the parent resource accepts it. For example, Gateway listeners can restrict which Routes can attach to them by Route kind, namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from the referencing Route, the Route MUST be considered successfully attached. If no Gateway listeners accept attachment from this Route, the Route MUST be considered detached from the Gateway. \n Support: Core"
+                                    type: string
+                                    maxLength: 253
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                            serviceType:
+                              description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
+                              type: string
+                        ingress:
+                          description: The ingress based HTTP01 challenge solver will solve challenges by creating or modifying Ingress resources in order to route requests for '/.well-known/acme-challenge/XYZ' to 'challenge solver' pods that are provisioned by cert-manager for each Challenge to be completed.
+                          type: object
+                          properties:
+                            class:
+                              description: The ingress class to use when creating Ingress resources to solve ACME challenges that use this challenge solver. Only one of 'class' or 'name' may be specified.
+                              type: string
+                            ingressTemplate:
+                              description: Optional ingress template used to configure the ACME challenge solver ingress used for HTTP01 challenges.
+                              type: object
+                              properties:
+                                metadata:
+                                  description: ObjectMeta overrides for the ingress used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
+                                  type: object
+                                  properties:
+                                    annotations:
+                                      description: Annotations that should be added to the created ACME HTTP01 solver ingress.
+                                      type: object
+                                      additionalProperties:
+                                        type: string
+                                    labels:
+                                      description: Labels that should be added to the created ACME HTTP01 solver ingress.
+                                      type: object
+                                      additionalProperties:
+                                        type: string
+                            name:
+                              description: The name of the ingress resource that should have ACME challenge solving routes inserted into it in order to solve HTTP01 challenges. This is typically used in conjunction with ingress controllers like ingress-gce, which maintains a 1:1 mapping between external IPs and ingress resources.
+                              type: string
+                            podTemplate:
+                              description: Optional pod template used to configure the ACME challenge solver pods used for HTTP01 challenges.
+                              type: object
+                              properties:
+                                metadata:
+                                  description: ObjectMeta overrides for the pod used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
+                                  type: object
+                                  properties:
+                                    annotations:
+                                      description: Annotations that should be added to the create ACME HTTP01 solver pods.
+                                      type: object
+                                      additionalProperties:
+                                        type: string
+                                    labels:
+                                      description: Labels that should be added to the created ACME HTTP01 solver pods.
+                                      type: object
+                                      additionalProperties:
+                                        type: string
+                                spec:
+                                  description: PodSpec defines overrides for the HTTP01 challenge solver pod. Only the 'priorityClassName', 'nodeSelector', 'affinity', 'serviceAccountName' and 'tolerations' fields are supported currently. All other fields will be ignored.
+                                  type: object
+                                  properties:
+                                    affinity:
+                                      description: If specified, the pod's scheduling constraints
+                                      type: object
+                                      properties:
+                                        nodeAffinity:
+                                          description: Describes node affinity scheduling rules for the pod.
+                                          type: object
+                                          properties:
+                                            preferredDuringSchedulingIgnoredDuringExecution:
+                                              description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
+                                              type: array
+                                              items:
+                                                description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                                                type: object
+                                                required:
+                                                  - preference
+                                                  - weight
+                                                properties:
+                                                  preference:
+                                                    description: A node selector term, associated with the corresponding weight.
+                                                    type: object
+                                                    properties:
+                                                      matchExpressions:
+                                                        description: A list of node selector requirements by node's labels.
+                                                        type: array
+                                                        items:
+                                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                          type: object
+                                                          required:
+                                                            - key
+                                                            - operator
+                                                          properties:
+                                                            key:
+                                                              description: The label key that the selector applies to.
+                                                              type: string
+                                                            operator:
+                                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                              type: string
+                                                            values:
+                                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                      matchFields:
+                                                        description: A list of node selector requirements by node's fields.
+                                                        type: array
+                                                        items:
+                                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                          type: object
+                                                          required:
+                                                            - key
+                                                            - operator
+                                                          properties:
+                                                            key:
+                                                              description: The label key that the selector applies to.
+                                                              type: string
+                                                            operator:
+                                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                              type: string
+                                                            values:
+                                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                  weight:
+                                                    description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
+                                                    type: integer
+                                                    format: int32
+                                            requiredDuringSchedulingIgnoredDuringExecution:
+                                              description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
+                                              type: object
+                                              required:
+                                                - nodeSelectorTerms
+                                              properties:
+                                                nodeSelectorTerms:
+                                                  description: Required. A list of node selector terms. The terms are ORed.
+                                                  type: array
+                                                  items:
+                                                    description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                                                    type: object
+                                                    properties:
+                                                      matchExpressions:
+                                                        description: A list of node selector requirements by node's labels.
+                                                        type: array
+                                                        items:
+                                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                          type: object
+                                                          required:
+                                                            - key
+                                                            - operator
+                                                          properties:
+                                                            key:
+                                                              description: The label key that the selector applies to.
+                                                              type: string
+                                                            operator:
+                                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                              type: string
+                                                            values:
+                                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                      matchFields:
+                                                        description: A list of node selector requirements by node's fields.
+                                                        type: array
+                                                        items:
+                                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                          type: object
+                                                          required:
+                                                            - key
+                                                            - operator
+                                                          properties:
+                                                            key:
+                                                              description: The label key that the selector applies to.
+                                                              type: string
+                                                            operator:
+                                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                              type: string
+                                                            values:
+                                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                        podAffinity:
+                                          description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+                                          type: object
+                                          properties:
+                                            preferredDuringSchedulingIgnoredDuringExecution:
+                                              description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                                              type: array
+                                              items:
+                                                description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                                type: object
+                                                required:
+                                                  - podAffinityTerm
+                                                  - weight
+                                                properties:
+                                                  podAffinityTerm:
+                                                    description: Required. A pod affinity term, associated with the corresponding weight.
+                                                    type: object
+                                                    required:
+                                                      - topologyKey
+                                                    properties:
+                                                      labelSelector:
+                                                        description: A label query over a set of resources, in this case pods.
+                                                        type: object
+                                                        properties:
+                                                          matchExpressions:
+                                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                            type: array
+                                                            items:
+                                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                              type: object
+                                                              required:
+                                                                - key
+                                                                - operator
+                                                              properties:
+                                                                key:
+                                                                  description: key is the label key that the selector applies to.
+                                                                  type: string
+                                                                operator:
+                                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                  type: string
+                                                                values:
+                                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                  type: array
+                                                                  items:
+                                                                    type: string
+                                                          matchLabels:
+                                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                            type: object
+                                                            additionalProperties:
+                                                              type: string
+                                                      namespaceSelector:
+                                                        description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                        type: object
+                                                        properties:
+                                                          matchExpressions:
+                                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                            type: array
+                                                            items:
+                                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                              type: object
+                                                              required:
+                                                                - key
+                                                                - operator
+                                                              properties:
+                                                                key:
+                                                                  description: key is the label key that the selector applies to.
+                                                                  type: string
+                                                                operator:
+                                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                  type: string
+                                                                values:
+                                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                  type: array
+                                                                  items:
+                                                                    type: string
+                                                          matchLabels:
+                                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                            type: object
+                                                            additionalProperties:
+                                                              type: string
+                                                      namespaces:
+                                                        description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                        type: array
+                                                        items:
+                                                          type: string
+                                                      topologyKey:
+                                                        description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                        type: string
+                                                  weight:
+                                                    description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                                    type: integer
+                                                    format: int32
+                                            requiredDuringSchedulingIgnoredDuringExecution:
+                                              description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                              type: array
+                                              items:
+                                                description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                                type: object
+                                                required:
+                                                  - topologyKey
+                                                properties:
+                                                  labelSelector:
+                                                    description: A label query over a set of resources, in this case pods.
+                                                    type: object
+                                                    properties:
+                                                      matchExpressions:
+                                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                        type: array
+                                                        items:
+                                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                          type: object
+                                                          required:
+                                                            - key
+                                                            - operator
+                                                          properties:
+                                                            key:
+                                                              description: key is the label key that the selector applies to.
+                                                              type: string
+                                                            operator:
+                                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                              type: string
+                                                            values:
+                                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                      matchLabels:
+                                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                        type: object
+                                                        additionalProperties:
+                                                          type: string
+                                                  namespaceSelector:
+                                                    description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                    type: object
+                                                    properties:
+                                                      matchExpressions:
+                                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                        type: array
+                                                        items:
+                                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                          type: object
+                                                          required:
+                                                            - key
+                                                            - operator
+                                                          properties:
+                                                            key:
+                                                              description: key is the label key that the selector applies to.
+                                                              type: string
+                                                            operator:
+                                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                              type: string
+                                                            values:
+                                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                      matchLabels:
+                                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                        type: object
+                                                        additionalProperties:
+                                                          type: string
+                                                  namespaces:
+                                                    description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                    type: array
+                                                    items:
+                                                      type: string
+                                                  topologyKey:
+                                                    description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                    type: string
+                                        podAntiAffinity:
+                                          description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+                                          type: object
+                                          properties:
+                                            preferredDuringSchedulingIgnoredDuringExecution:
+                                              description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                                              type: array
+                                              items:
+                                                description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                                type: object
+                                                required:
+                                                  - podAffinityTerm
+                                                  - weight
+                                                properties:
+                                                  podAffinityTerm:
+                                                    description: Required. A pod affinity term, associated with the corresponding weight.
+                                                    type: object
+                                                    required:
+                                                      - topologyKey
+                                                    properties:
+                                                      labelSelector:
+                                                        description: A label query over a set of resources, in this case pods.
+                                                        type: object
+                                                        properties:
+                                                          matchExpressions:
+                                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                            type: array
+                                                            items:
+                                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                              type: object
+                                                              required:
+                                                                - key
+                                                                - operator
+                                                              properties:
+                                                                key:
+                                                                  description: key is the label key that the selector applies to.
+                                                                  type: string
+                                                                operator:
+                                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                  type: string
+                                                                values:
+                                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                  type: array
+                                                                  items:
+                                                                    type: string
+                                                          matchLabels:
+                                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                            type: object
+                                                            additionalProperties:
+                                                              type: string
+                                                      namespaceSelector:
+                                                        description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                        type: object
+                                                        properties:
+                                                          matchExpressions:
+                                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                            type: array
+                                                            items:
+                                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                              type: object
+                                                              required:
+                                                                - key
+                                                                - operator
+                                                              properties:
+                                                                key:
+                                                                  description: key is the label key that the selector applies to.
+                                                                  type: string
+                                                                operator:
+                                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                  type: string
+                                                                values:
+                                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                  type: array
+                                                                  items:
+                                                                    type: string
+                                                          matchLabels:
+                                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                            type: object
+                                                            additionalProperties:
+                                                              type: string
+                                                      namespaces:
+                                                        description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                        type: array
+                                                        items:
+                                                          type: string
+                                                      topologyKey:
+                                                        description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                        type: string
+                                                  weight:
+                                                    description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                                    type: integer
+                                                    format: int32
+                                            requiredDuringSchedulingIgnoredDuringExecution:
+                                              description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                              type: array
+                                              items:
+                                                description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                                type: object
+                                                required:
+                                                  - topologyKey
+                                                properties:
+                                                  labelSelector:
+                                                    description: A label query over a set of resources, in this case pods.
+                                                    type: object
+                                                    properties:
+                                                      matchExpressions:
+                                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                        type: array
+                                                        items:
+                                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                          type: object
+                                                          required:
+                                                            - key
+                                                            - operator
+                                                          properties:
+                                                            key:
+                                                              description: key is the label key that the selector applies to.
+                                                              type: string
+                                                            operator:
+                                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                              type: string
+                                                            values:
+                                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                      matchLabels:
+                                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                        type: object
+                                                        additionalProperties:
+                                                          type: string
+                                                  namespaceSelector:
+                                                    description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                    type: object
+                                                    properties:
+                                                      matchExpressions:
+                                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                        type: array
+                                                        items:
+                                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                          type: object
+                                                          required:
+                                                            - key
+                                                            - operator
+                                                          properties:
+                                                            key:
+                                                              description: key is the label key that the selector applies to.
+                                                              type: string
+                                                            operator:
+                                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                              type: string
+                                                            values:
+                                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                      matchLabels:
+                                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                        type: object
+                                                        additionalProperties:
+                                                          type: string
+                                                  namespaces:
+                                                    description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                    type: array
+                                                    items:
+                                                      type: string
+                                                  topologyKey:
+                                                    description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                    type: string
+                                    nodeSelector:
+                                      description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
+                                      type: object
+                                      additionalProperties:
+                                        type: string
+                                    priorityClassName:
+                                      description: If specified, the pod's priorityClassName.
+                                      type: string
+                                    serviceAccountName:
+                                      description: If specified, the pod's service account
+                                      type: string
+                                    tolerations:
+                                      description: If specified, the pod's tolerations.
+                                      type: array
+                                      items:
+                                        description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
+                                        type: object
+                                        properties:
+                                          effect:
+                                            description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                                            type: string
+                                          key:
+                                            description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                                            type: string
+                                          operator:
+                                            description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
+                                            type: string
+                                          tolerationSeconds:
+                                            description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
+                                            type: integer
+                                            format: int64
+                                          value:
+                                            description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
+                                            type: string
+                            serviceType:
+                              description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
+                              type: string
+                    selector:
+                      description: Selector selects a set of DNSNames on the Certificate resource that should be solved using this challenge solver. If not specified, the solver will be treated as the 'default' solver with the lowest priority, i.e. if any other solver has a more specific match, it will be used instead.
+                      type: object
+                      properties:
+                        dnsNames:
+                          description: List of DNSNames that this solver will be used to solve. If specified and a match is found, a dnsNames selector will take precedence over a dnsZones selector. If multiple solvers match with the same dnsNames value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
+                          type: array
+                          items:
+                            type: string
+                        dnsZones:
+                          description: List of DNSZones that this solver will be used to solve. The most specific DNS zone match specified here will take precedence over other DNS zone matches, so a solver specifying sys.example.com will be selected over one specifying example.com for the domain www.sys.example.com. If multiple solvers match with the same dnsZones value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
+                          type: array
+                          items:
+                            type: string
+                        matchLabels:
+                          description: A label selector that is used to refine the set of certificate's that this challenge solver will apply to.
+                          type: object
+                          additionalProperties:
+                            type: string
+                token:
+                  description: The ACME challenge token for this challenge. This is the raw value returned from the ACME server.
+                  type: string
+                type:
+                  description: The type of ACME challenge this resource represents. One of "HTTP-01" or "DNS-01".
+                  type: string
+                  enum:
+                    - HTTP-01
+                    - DNS-01
+                url:
+                  description: The URL of the ACME Challenge resource for this challenge. This can be used to lookup details about the status of this challenge.
+                  type: string
+                wildcard:
+                  description: wildcard will be true if this challenge is for a wildcard identifier, for example '*.example.com'.
+                  type: boolean
+            status:
+              type: object
+              properties:
+                presented:
+                  description: presented will be set to true if the challenge values for this challenge are currently 'presented'. This *does not* imply the self check is passing. Only that the values have been 'submitted' for the appropriate challenge mechanism (i.e. the DNS01 TXT record has been presented, or the HTTP01 configuration has been configured).
+                  type: boolean
+                processing:
+                  description: Used to denote whether this challenge should be processed or not. This field will only be set to true by the 'scheduling' component. It will only be set to false by the 'challenges' controller, after the challenge has reached a final state or timed out. If this field is set to false, the challenge controller will not take any more action.
+                  type: boolean
+                reason:
+                  description: Contains human readable information on why the Challenge is in the current state.
+                  type: string
+                state:
+                  description: Contains the current 'state' of the challenge. If not set, the state of the challenge is unknown.
+                  type: string
+                  enum:
+                    - valid
+                    - ready
+                    - pending
+                    - processing
+                    - invalid
+                    - expired
+                    - errored
+      served: true
+      storage: true
+      subresources:
+        status: {}
+---
+# Source: cert-manager/templates/crd-templates.yaml
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterissuers.cert-manager.io
+  labels:
+    app: 'cert-manager'
+    app.kubernetes.io/name: 'cert-manager'
+    app.kubernetes.io/instance: 'cert-manager'
+    # Generated labels
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  group: cert-manager.io
+  names:
+    kind: ClusterIssuer
+    listKind: ClusterIssuerList
+    plural: clusterissuers
+    singular: clusterissuer
+    categories:
+      - cert-manager
+  scope: Cluster
+  versions:
+    - name: v1
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+        - jsonPath: .status.conditions[?(@.type=="Ready")].status
+          name: Ready
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].message
+          name: Status
+          priority: 1
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
+          name: Age
+          type: date
+      schema:
+        openAPIV3Schema:
+          description: A ClusterIssuer represents a certificate issuing authority which can be referenced as part of `issuerRef` fields. It is similar to an Issuer, however it is cluster-scoped and therefore can be referenced by resources that exist in *any* namespace, not just the same namespace as the referent.
+          type: object
+          required:
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: Desired state of the ClusterIssuer resource.
+              type: object
+              properties:
+                acme:
+                  description: ACME configures this issuer to communicate with a RFC8555 (ACME) server to obtain signed x509 certificates.
+                  type: object
+                  required:
+                    - privateKeySecretRef
+                    - server
+                  properties:
+                    disableAccountKeyGeneration:
+                      description: Enables or disables generating a new ACME account key. If true, the Issuer resource will *not* request a new account but will expect the account key to be supplied via an existing secret. If false, the cert-manager system will generate a new ACME account key for the Issuer. Defaults to false.
+                      type: boolean
+                    email:
+                      description: Email is the email address to be associated with the ACME account. This field is optional, but it is strongly recommended to be set. It will be used to contact you in case of issues with your account or certificates, including expiry notification emails. This field may be updated after the account is initially registered.
+                      type: string
+                    enableDurationFeature:
+                      description: Enables requesting a Not After date on certificates that matches the duration of the certificate. This is not supported by all ACME servers like Let's Encrypt. If set to true when the ACME server does not support it it will create an error on the Order. Defaults to false.
+                      type: boolean
+                    externalAccountBinding:
+                      description: ExternalAccountBinding is a reference to a CA external account of the ACME server. If set, upon registration cert-manager will attempt to associate the given external account credentials with the registered ACME account.
+                      type: object
+                      required:
+                        - keyID
+                        - keySecretRef
+                      properties:
+                        keyAlgorithm:
+                          description: 'Deprecated: keyAlgorithm field exists for historical compatibility reasons and should not be used. The algorithm is now hardcoded to HS256 in golang/x/crypto/acme.'
+                          type: string
+                          enum:
+                            - HS256
+                            - HS384
+                            - HS512
+                        keyID:
+                          description: keyID is the ID of the CA key that the External Account is bound to.
+                          type: string
+                        keySecretRef:
+                          description: keySecretRef is a Secret Key Selector referencing a data item in a Kubernetes Secret which holds the symmetric MAC key of the External Account Binding. The `key` is the index string that is paired with the key data in the Secret and should not be confused with the key data itself, or indeed with the External Account Binding keyID above. The secret key stored in the Secret **must** be un-padded, base64 URL encoded data.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            key:
+                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                              type: string
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                    preferredChain:
+                      description: 'PreferredChain is the chain to use if the ACME server outputs multiple. PreferredChain is no guarantee that this one gets delivered by the ACME endpoint. For example, for Let''s Encrypt''s DST crosssign you would use: "DST Root CA X3" or "ISRG Root X1" for the newer Let''s Encrypt root CA. This value picks the first certificate bundle in the ACME alternative chains that has a certificate with this value as its issuer''s CN'
+                      type: string
+                      maxLength: 64
+                    privateKeySecretRef:
+                      description: PrivateKey is the name of a Kubernetes Secret resource that will be used to store the automatically generated ACME account private key. Optionally, a `key` may be specified to select a specific entry within the named Secret resource. If `key` is not specified, a default of `tls.key` will be used.
+                      type: object
+                      required:
+                        - name
+                      properties:
+                        key:
+                          description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                          type: string
+                        name:
+                          description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                          type: string
+                    server:
+                      description: 'Server is the URL used to access the ACME server''s ''directory'' endpoint. For example, for Let''s Encrypt''s staging endpoint, you would use: "https://acme-staging-v02.api.letsencrypt.org/directory". Only ACME v2 endpoints (i.e. RFC 8555) are supported.'
+                      type: string
+                    skipTLSVerify:
+                      description: Enables or disables validation of the ACME server TLS certificate. If true, requests to the ACME server will not have their TLS certificate validated (i.e. insecure connections will be allowed). Only enable this option in development environments. The cert-manager system installed roots will be used to verify connections to the ACME server if this is false. Defaults to false.
+                      type: boolean
+                    solvers:
+                      description: 'Solvers is a list of challenge solvers that will be used to solve ACME challenges for the matching domains. Solver configurations must be provided in order to obtain certificates from an ACME server. For more information, see: https://cert-manager.io/docs/configuration/acme/'
+                      type: array
+                      items:
+                        description: An ACMEChallengeSolver describes how to solve ACME challenges for the issuer it is part of. A selector may be provided to use different solving strategies for different DNS names. Only one of HTTP01 or DNS01 must be provided.
+                        type: object
+                        properties:
+                          dns01:
+                            description: Configures cert-manager to attempt to complete authorizations by performing the DNS01 challenge flow.
+                            type: object
+                            properties:
+                              acmeDNS:
+                                description: Use the 'ACME DNS' (https://github.com/joohoi/acme-dns) API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - accountSecretRef
+                                  - host
+                                properties:
+                                  accountSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  host:
+                                    type: string
+                              akamai:
+                                description: Use the Akamai DNS zone management API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - accessTokenSecretRef
+                                  - clientSecretSecretRef
+                                  - clientTokenSecretRef
+                                  - serviceConsumerDomain
+                                properties:
+                                  accessTokenSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  clientSecretSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  clientTokenSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  serviceConsumerDomain:
+                                    type: string
+                              azureDNS:
+                                description: Use the Microsoft Azure DNS API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - resourceGroupName
+                                  - subscriptionID
+                                properties:
+                                  clientID:
+                                    description: if both this and ClientSecret are left unset MSI will be used
+                                    type: string
+                                  clientSecretSecretRef:
+                                    description: if both this and ClientID are left unset MSI will be used
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  environment:
+                                    description: name of the Azure environment (default AzurePublicCloud)
+                                    type: string
+                                    enum:
+                                      - AzurePublicCloud
+                                      - AzureChinaCloud
+                                      - AzureGermanCloud
+                                      - AzureUSGovernmentCloud
+                                  hostedZoneName:
+                                    description: name of the DNS zone that should be used
+                                    type: string
+                                  managedIdentity:
+                                    description: managed identity configuration, can not be used at the same time as clientID, clientSecretSecretRef or tenantID
+                                    type: object
+                                    properties:
+                                      clientID:
+                                        description: client ID of the managed identity, can not be used at the same time as resourceID
+                                        type: string
+                                      resourceID:
+                                        description: resource ID of the managed identity, can not be used at the same time as clientID
+                                        type: string
+                                  resourceGroupName:
+                                    description: resource group the DNS zone is located in
+                                    type: string
+                                  subscriptionID:
+                                    description: ID of the Azure subscription
+                                    type: string
+                                  tenantID:
+                                    description: when specifying ClientID and ClientSecret then this field is also needed
+                                    type: string
+                              cloudDNS:
+                                description: Use the Google Cloud DNS API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - project
+                                properties:
+                                  hostedZoneName:
+                                    description: HostedZoneName is an optional field that tells cert-manager in which Cloud DNS zone the challenge record has to be created. If left empty cert-manager will automatically choose a zone.
+                                    type: string
+                                  project:
+                                    type: string
+                                  serviceAccountSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                              cloudflare:
+                                description: Use the Cloudflare API to manage DNS01 challenge records.
+                                type: object
+                                properties:
+                                  apiKeySecretRef:
+                                    description: 'API key to use to authenticate with Cloudflare. Note: using an API token to authenticate is now the recommended method as it allows greater control of permissions.'
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  apiTokenSecretRef:
+                                    description: API token used to authenticate with Cloudflare.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  email:
+                                    description: Email of the account, only required when using API key based authentication.
+                                    type: string
+                              cnameStrategy:
+                                description: CNAMEStrategy configures how the DNS01 provider should handle CNAME records when found in DNS zones.
+                                type: string
+                                enum:
+                                  - None
+                                  - Follow
+                              digitalocean:
+                                description: Use the DigitalOcean DNS API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - tokenSecretRef
+                                properties:
+                                  tokenSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                              rfc2136:
+                                description: Use RFC2136 ("Dynamic Updates in the Domain Name System") (https://datatracker.ietf.org/doc/rfc2136/) to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - nameserver
+                                properties:
+                                  nameserver:
+                                    description: The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. This field is required.
+                                    type: string
+                                  tsigAlgorithm:
+                                    description: 'The TSIG Algorithm configured in the DNS supporting RFC2136. Used only when ``tsigSecretSecretRef`` and ``tsigKeyName`` are defined. Supported values are (case-insensitive): ``HMACMD5`` (default), ``HMACSHA1``, ``HMACSHA256`` or ``HMACSHA512``.'
+                                    type: string
+                                  tsigKeyName:
+                                    description: The TSIG Key name configured in the DNS. If ``tsigSecretSecretRef`` is defined, this field is required.
+                                    type: string
+                                  tsigSecretSecretRef:
+                                    description: The name of the secret containing the TSIG value. If ``tsigKeyName`` is defined, this field is required.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                              route53:
+                                description: Use the AWS Route53 API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - region
+                                properties:
+                                  accessKeyID:
+                                    description: 'The AccessKeyID is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials'
+                                    type: string
+                                  hostedZoneID:
+                                    description: If set, the provider will manage only this zone in Route53 and will not do an lookup using the route53:ListHostedZonesByName api call.
+                                    type: string
+                                  region:
+                                    description: Always set the region when using AccessKeyID and SecretAccessKey
+                                    type: string
+                                  role:
+                                    description: Role is a Role ARN which the Route53 provider will assume using either the explicit credentials AccessKeyID/SecretAccessKey or the inferred credentials from environment variables, shared credentials file or AWS Instance metadata
+                                    type: string
+                                  secretAccessKeySecretRef:
+                                    description: The SecretAccessKey is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                              webhook:
+                                description: Configure an external webhook based DNS01 challenge solver to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - groupName
+                                  - solverName
+                                properties:
+                                  config:
+                                    description: Additional configuration that should be passed to the webhook apiserver when challenges are processed. This can contain arbitrary JSON data. Secret values should not be specified in this stanza. If secret values are needed (e.g. credentials for a DNS service), you should use a SecretKeySelector to reference a Secret resource. For details on the schema of this field, consult the webhook provider implementation's documentation.
+                                    x-kubernetes-preserve-unknown-fields: true
+                                  groupName:
+                                    description: The API group name that should be used when POSTing ChallengePayload resources to the webhook apiserver. This should be the same as the GroupName specified in the webhook provider implementation.
+                                    type: string
+                                  solverName:
+                                    description: The name of the solver to use, as defined in the webhook provider implementation. This will typically be the name of the provider, e.g. 'cloudflare'.
+                                    type: string
+                          http01:
+                            description: Configures cert-manager to attempt to complete authorizations by performing the HTTP01 challenge flow. It is not possible to obtain certificates for wildcard domain names (e.g. `*.example.com`) using the HTTP01 challenge mechanism.
+                            type: object
+                            properties:
+                              gatewayHTTPRoute:
+                                description: The Gateway API is a sig-network community API that models service networking in Kubernetes (https://gateway-api.sigs.k8s.io/). The Gateway solver will create HTTPRoutes with the specified labels in the same namespace as the challenge. This solver is experimental, and fields / behaviour may change in the future.
+                                type: object
+                                properties:
+                                  labels:
+                                    description: Custom labels that will be applied to HTTPRoutes created by cert-manager while solving HTTP-01 challenges.
+                                    type: object
+                                    additionalProperties:
+                                      type: string
+                                  parentRefs:
+                                    description: 'When solving an HTTP-01 challenge, cert-manager creates an HTTPRoute. cert-manager needs to know which parentRefs should be used when creating the HTTPRoute. Usually, the parentRef references a Gateway. See: https://gateway-api.sigs.k8s.io/v1alpha2/api-types/httproute/#attaching-to-gateways'
+                                    type: array
+                                    items:
+                                      description: "ParentRef identifies an API object (usually a Gateway) that can be considered a parent of this resource (usually a route). The only kind of parent resource with \"Core\" support is Gateway. This API may be extended in the future to support additional kinds of parent resources, such as HTTPRoute. \n The API object must be valid in the cluster; the Group and Kind must be registered in the cluster for this reference to be valid. \n References to objects with invalid Group and Kind are not valid, and must be rejected by the implementation, with appropriate Conditions set on the containing object."
+                                      type: object
+                                      required:
+                                        - name
+                                      properties:
+                                        group:
+                                          description: "Group is the group of the referent. \n Support: Core"
+                                          type: string
+                                          default: gateway.networking.k8s.io
+                                          maxLength: 253
+                                          pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                        kind:
+                                          description: "Kind is kind of the referent. \n Support: Core (Gateway) Support: Custom (Other Resources)"
+                                          type: string
+                                          default: Gateway
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                                        name:
+                                          description: "Name is the name of the referent. \n Support: Core"
+                                          type: string
+                                          maxLength: 253
+                                          minLength: 1
+                                        namespace:
+                                          description: "Namespace is the namespace of the referent. When unspecified (or empty string), this refers to the local namespace of the Route. \n Support: Core"
+                                          type: string
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                        sectionName:
+                                          description: "SectionName is the name of a section within the target resource. In the following resources, SectionName is interpreted as the following: \n * Gateway: Listener Name \n Implementations MAY choose to support attaching Routes to other resources. If that is the case, they MUST clearly document how SectionName is interpreted. \n When unspecified (empty string), this will reference the entire resource. For the purpose of status, an attachment is considered successful if at least one section in the parent resource accepts it. For example, Gateway listeners can restrict which Routes can attach to them by Route kind, namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from the referencing Route, the Route MUST be considered successfully attached. If no Gateway listeners accept attachment from this Route, the Route MUST be considered detached from the Gateway. \n Support: Core"
+                                          type: string
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  serviceType:
+                                    description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
+                                    type: string
+                              ingress:
+                                description: The ingress based HTTP01 challenge solver will solve challenges by creating or modifying Ingress resources in order to route requests for '/.well-known/acme-challenge/XYZ' to 'challenge solver' pods that are provisioned by cert-manager for each Challenge to be completed.
+                                type: object
+                                properties:
+                                  class:
+                                    description: The ingress class to use when creating Ingress resources to solve ACME challenges that use this challenge solver. Only one of 'class' or 'name' may be specified.
+                                    type: string
+                                  ingressTemplate:
+                                    description: Optional ingress template used to configure the ACME challenge solver ingress used for HTTP01 challenges.
+                                    type: object
+                                    properties:
+                                      metadata:
+                                        description: ObjectMeta overrides for the ingress used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
+                                        type: object
+                                        properties:
+                                          annotations:
+                                            description: Annotations that should be added to the created ACME HTTP01 solver ingress.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                          labels:
+                                            description: Labels that should be added to the created ACME HTTP01 solver ingress.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                  name:
+                                    description: The name of the ingress resource that should have ACME challenge solving routes inserted into it in order to solve HTTP01 challenges. This is typically used in conjunction with ingress controllers like ingress-gce, which maintains a 1:1 mapping between external IPs and ingress resources.
+                                    type: string
+                                  podTemplate:
+                                    description: Optional pod template used to configure the ACME challenge solver pods used for HTTP01 challenges.
+                                    type: object
+                                    properties:
+                                      metadata:
+                                        description: ObjectMeta overrides for the pod used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
+                                        type: object
+                                        properties:
+                                          annotations:
+                                            description: Annotations that should be added to the create ACME HTTP01 solver pods.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                          labels:
+                                            description: Labels that should be added to the created ACME HTTP01 solver pods.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      spec:
+                                        description: PodSpec defines overrides for the HTTP01 challenge solver pod. Only the 'priorityClassName', 'nodeSelector', 'affinity', 'serviceAccountName' and 'tolerations' fields are supported currently. All other fields will be ignored.
+                                        type: object
+                                        properties:
+                                          affinity:
+                                            description: If specified, the pod's scheduling constraints
+                                            type: object
+                                            properties:
+                                              nodeAffinity:
+                                                description: Describes node affinity scheduling rules for the pod.
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                                                      type: object
+                                                      required:
+                                                        - preference
+                                                        - weight
+                                                      properties:
+                                                        preference:
+                                                          description: A node selector term, associated with the corresponding weight.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: A list of node selector requirements by node's labels.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchFields:
+                                                              description: A list of node selector requirements by node's fields.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                        weight:
+                                                          description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
+                                                    type: object
+                                                    required:
+                                                      - nodeSelectorTerms
+                                                    properties:
+                                                      nodeSelectorTerms:
+                                                        description: Required. A list of node selector terms. The terms are ORed.
+                                                        type: array
+                                                        items:
+                                                          description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: A list of node selector requirements by node's labels.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchFields:
+                                                              description: A list of node selector requirements by node's fields.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                              podAffinity:
+                                                description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                                      type: object
+                                                      required:
+                                                        - podAffinityTerm
+                                                        - weight
+                                                      properties:
+                                                        podAffinityTerm:
+                                                          description: Required. A pod affinity term, associated with the corresponding weight.
+                                                          type: object
+                                                          required:
+                                                            - topologyKey
+                                                          properties:
+                                                            labelSelector:
+                                                              description: A label query over a set of resources, in this case pods.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaceSelector:
+                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaces:
+                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                            topologyKey:
+                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                              type: string
+                                                        weight:
+                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                                    type: array
+                                                    items:
+                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                                      type: object
+                                                      required:
+                                                        - topologyKey
+                                                      properties:
+                                                        labelSelector:
+                                                          description: A label query over a set of resources, in this case pods.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaceSelector:
+                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaces:
+                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                        topologyKey:
+                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                          type: string
+                                              podAntiAffinity:
+                                                description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                                      type: object
+                                                      required:
+                                                        - podAffinityTerm
+                                                        - weight
+                                                      properties:
+                                                        podAffinityTerm:
+                                                          description: Required. A pod affinity term, associated with the corresponding weight.
+                                                          type: object
+                                                          required:
+                                                            - topologyKey
+                                                          properties:
+                                                            labelSelector:
+                                                              description: A label query over a set of resources, in this case pods.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaceSelector:
+                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaces:
+                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                            topologyKey:
+                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                              type: string
+                                                        weight:
+                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                                    type: array
+                                                    items:
+                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                                      type: object
+                                                      required:
+                                                        - topologyKey
+                                                      properties:
+                                                        labelSelector:
+                                                          description: A label query over a set of resources, in this case pods.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaceSelector:
+                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaces:
+                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                        topologyKey:
+                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                          type: string
+                                          nodeSelector:
+                                            description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                          priorityClassName:
+                                            description: If specified, the pod's priorityClassName.
+                                            type: string
+                                          serviceAccountName:
+                                            description: If specified, the pod's service account
+                                            type: string
+                                          tolerations:
+                                            description: If specified, the pod's tolerations.
+                                            type: array
+                                            items:
+                                              description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
+                                              type: object
+                                              properties:
+                                                effect:
+                                                  description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                                                  type: string
+                                                key:
+                                                  description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                                                  type: string
+                                                operator:
+                                                  description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
+                                                  type: string
+                                                tolerationSeconds:
+                                                  description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
+                                                  type: integer
+                                                  format: int64
+                                                value:
+                                                  description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
+                                                  type: string
+                                  serviceType:
+                                    description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
+                                    type: string
+                          selector:
+                            description: Selector selects a set of DNSNames on the Certificate resource that should be solved using this challenge solver. If not specified, the solver will be treated as the 'default' solver with the lowest priority, i.e. if any other solver has a more specific match, it will be used instead.
+                            type: object
+                            properties:
+                              dnsNames:
+                                description: List of DNSNames that this solver will be used to solve. If specified and a match is found, a dnsNames selector will take precedence over a dnsZones selector. If multiple solvers match with the same dnsNames value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
+                                type: array
+                                items:
+                                  type: string
+                              dnsZones:
+                                description: List of DNSZones that this solver will be used to solve. The most specific DNS zone match specified here will take precedence over other DNS zone matches, so a solver specifying sys.example.com will be selected over one specifying example.com for the domain www.sys.example.com. If multiple solvers match with the same dnsZones value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
+                                type: array
+                                items:
+                                  type: string
+                              matchLabels:
+                                description: A label selector that is used to refine the set of certificate's that this challenge solver will apply to.
+                                type: object
+                                additionalProperties:
+                                  type: string
+                ca:
+                  description: CA configures this issuer to sign certificates using a signing CA keypair stored in a Secret resource. This is used to build internal PKIs that are managed by cert-manager.
+                  type: object
+                  required:
+                    - secretName
+                  properties:
+                    crlDistributionPoints:
+                      description: The CRL distribution points is an X.509 v3 certificate extension which identifies the location of the CRL from which the revocation of this certificate can be checked. If not set, certificates will be issued without distribution points set.
+                      type: array
+                      items:
+                        type: string
+                    ocspServers:
+                      description: The OCSP server list is an X.509 v3 extension that defines a list of URLs of OCSP responders. The OCSP responders can be queried for the revocation status of an issued certificate. If not set, the certificate will be issued with no OCSP servers set. For example, an OCSP server URL could be "http://ocsp.int-x3.letsencrypt.org".
+                      type: array
+                      items:
+                        type: string
+                    secretName:
+                      description: SecretName is the name of the secret used to sign Certificates issued by this Issuer.
+                      type: string
+                selfSigned:
+                  description: SelfSigned configures this issuer to 'self sign' certificates using the private key used to create the CertificateRequest object.
+                  type: object
+                  properties:
+                    crlDistributionPoints:
+                      description: The CRL distribution points is an X.509 v3 certificate extension which identifies the location of the CRL from which the revocation of this certificate can be checked. If not set certificate will be issued without CDP. Values are strings.
+                      type: array
+                      items:
+                        type: string
+                vault:
+                  description: Vault configures this issuer to sign certificates using a HashiCorp Vault PKI backend.
+                  type: object
+                  required:
+                    - auth
+                    - path
+                    - server
+                  properties:
+                    auth:
+                      description: Auth configures how cert-manager authenticates with the Vault server.
+                      type: object
+                      properties:
+                        appRole:
+                          description: AppRole authenticates with Vault using the App Role auth mechanism, with the role and secret stored in a Kubernetes Secret resource.
+                          type: object
+                          required:
+                            - path
+                            - roleId
+                            - secretRef
+                          properties:
+                            path:
+                              description: 'Path where the App Role authentication backend is mounted in Vault, e.g: "approle"'
+                              type: string
+                            roleId:
+                              description: RoleID configured in the App Role authentication backend when setting up the authentication backend in Vault.
+                              type: string
+                            secretRef:
+                              description: Reference to a key in a Secret that contains the App Role secret used to authenticate with Vault. The `key` field must be specified and denotes which entry within the Secret resource is used as the app role secret.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                        kubernetes:
+                          description: Kubernetes authenticates with Vault by passing the ServiceAccount token stored in the named Secret resource to the Vault server.
+                          type: object
+                          required:
+                            - role
+                            - secretRef
+                          properties:
+                            mountPath:
+                              description: The Vault mountPath here is the mount path to use when authenticating with Vault. For example, setting a value to `/v1/auth/foo`, will use the path `/v1/auth/foo/login` to authenticate with Vault. If unspecified, the default value "/v1/auth/kubernetes" will be used.
+                              type: string
+                            role:
+                              description: A required field containing the Vault Role to assume. A Role binds a Kubernetes ServiceAccount with a set of Vault policies.
+                              type: string
+                            secretRef:
+                              description: The required Secret field containing a Kubernetes ServiceAccount JWT used for authenticating with Vault. Use of 'ambient credentials' is not supported.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                        tokenSecretRef:
+                          description: TokenSecretRef authenticates with Vault by presenting a token.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            key:
+                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                              type: string
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                    caBundle:
+                      description: PEM-encoded CA bundle (base64-encoded) used to validate Vault server certificate. Only used if the Server URL is using HTTPS protocol. This parameter is ignored for plain HTTP protocol connection. If not set the system root certificates are used to validate the TLS connection.
+                      type: string
+                      format: byte
+                    namespace:
+                      description: 'Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows Vault environments to support Secure Multi-tenancy. e.g: "ns1" More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces'
+                      type: string
+                    path:
+                      description: 'Path is the mount path of the Vault PKI backend''s `sign` endpoint, e.g: "my_pki_mount/sign/my-role-name".'
+                      type: string
+                    server:
+                      description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
+                      type: string
+                venafi:
+                  description: Venafi configures this issuer to sign certificates using a Venafi TPP or Venafi Cloud policy zone.
+                  type: object
+                  required:
+                    - zone
+                  properties:
+                    cloud:
+                      description: Cloud specifies the Venafi cloud configuration settings. Only one of TPP or Cloud may be specified.
+                      type: object
+                      required:
+                        - apiTokenSecretRef
+                      properties:
+                        apiTokenSecretRef:
+                          description: APITokenSecretRef is a secret key selector for the Venafi Cloud API token.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            key:
+                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                              type: string
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                        url:
+                          description: URL is the base URL for Venafi Cloud. Defaults to "https://api.venafi.cloud/v1".
+                          type: string
+                    tpp:
+                      description: TPP specifies Trust Protection Platform configuration settings. Only one of TPP or Cloud may be specified.
+                      type: object
+                      required:
+                        - credentialsRef
+                        - url
+                      properties:
+                        caBundle:
+                          description: CABundle is a PEM encoded TLS certificate to use to verify connections to the TPP instance. If specified, system roots will not be used and the issuing CA for the TPP instance must be verifiable using the provided root. If not specified, the connection will be verified using the cert-manager system root certificates.
+                          type: string
+                          format: byte
+                        credentialsRef:
+                          description: CredentialsRef is a reference to a Secret containing the username and password for the TPP server. The secret must contain two keys, 'username' and 'password'.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                        url:
+                          description: 'URL is the base URL for the vedsdk endpoint of the Venafi TPP instance, for example: "https://tpp.example.com/vedsdk".'
+                          type: string
+                    zone:
+                      description: Zone is the Venafi Policy Zone to use for this issuer. All requests made to the Venafi platform will be restricted by the named zone policy. This field is required.
+                      type: string
+            status:
+              description: Status of the ClusterIssuer. This is set and managed automatically.
+              type: object
+              properties:
+                acme:
+                  description: ACME specific status options. This field should only be set if the Issuer is configured to use an ACME server to issue certificates.
+                  type: object
+                  properties:
+                    lastRegisteredEmail:
+                      description: LastRegisteredEmail is the email associated with the latest registered ACME account, in order to track changes made to registered account associated with the  Issuer
+                      type: string
+                    uri:
+                      description: URI is the unique account identifier, which can also be used to retrieve account details from the CA
+                      type: string
+                conditions:
+                  description: List of status conditions to indicate the status of a CertificateRequest. Known condition types are `Ready`.
+                  type: array
+                  items:
+                    description: IssuerCondition contains condition information for an Issuer.
+                    type: object
+                    required:
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
+                        type: string
+                        format: date-time
+                      message:
+                        description: Message is a human readable description of the details of the last transition, complementing reason.
+                        type: string
+                      observedGeneration:
+                        description: If set, this represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date with respect to the current state of the Issuer.
+                        type: integer
+                        format: int64
+                      reason:
+                        description: Reason is a brief machine readable explanation for the condition's last transition.
+                        type: string
+                      status:
+                        description: Status of the condition, one of (`True`, `False`, `Unknown`).
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: Type of the condition, known values are (`Ready`).
+                        type: string
+                  x-kubernetes-list-map-keys:
+                    - type
+                  x-kubernetes-list-type: map
+      served: true
+      storage: true
+---
+# Source: cert-manager/templates/crd-templates.yaml
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: issuers.cert-manager.io
+  annotations:
+    cert-manager.io/inject-ca-from-secret: 'cert-manager/cert-manager-webhook-ca'
+  labels:
+    app: 'cert-manager'
+    app.kubernetes.io/name: 'cert-manager'
+    app.kubernetes.io/instance: 'cert-manager'
+    # Generated labels
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  group: cert-manager.io
+  names:
+    kind: Issuer
+    listKind: IssuerList
+    plural: issuers
+    singular: issuer
+    categories:
+      - cert-manager
+  scope: Namespaced
+  versions:
+    - name: v1
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+        - jsonPath: .status.conditions[?(@.type=="Ready")].status
+          name: Ready
+          type: string
+        - jsonPath: .status.conditions[?(@.type=="Ready")].message
+          name: Status
+          priority: 1
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
+          name: Age
+          type: date
+      schema:
+        openAPIV3Schema:
+          description: An Issuer represents a certificate issuing authority which can be referenced as part of `issuerRef` fields. It is scoped to a single namespace and can therefore only be referenced by resources within the same namespace.
+          type: object
+          required:
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: Desired state of the Issuer resource.
+              type: object
+              properties:
+                acme:
+                  description: ACME configures this issuer to communicate with a RFC8555 (ACME) server to obtain signed x509 certificates.
+                  type: object
+                  required:
+                    - privateKeySecretRef
+                    - server
+                  properties:
+                    disableAccountKeyGeneration:
+                      description: Enables or disables generating a new ACME account key. If true, the Issuer resource will *not* request a new account but will expect the account key to be supplied via an existing secret. If false, the cert-manager system will generate a new ACME account key for the Issuer. Defaults to false.
+                      type: boolean
+                    email:
+                      description: Email is the email address to be associated with the ACME account. This field is optional, but it is strongly recommended to be set. It will be used to contact you in case of issues with your account or certificates, including expiry notification emails. This field may be updated after the account is initially registered.
+                      type: string
+                    enableDurationFeature:
+                      description: Enables requesting a Not After date on certificates that matches the duration of the certificate. This is not supported by all ACME servers like Let's Encrypt. If set to true when the ACME server does not support it it will create an error on the Order. Defaults to false.
+                      type: boolean
+                    externalAccountBinding:
+                      description: ExternalAccountBinding is a reference to a CA external account of the ACME server. If set, upon registration cert-manager will attempt to associate the given external account credentials with the registered ACME account.
+                      type: object
+                      required:
+                        - keyID
+                        - keySecretRef
+                      properties:
+                        keyAlgorithm:
+                          description: 'Deprecated: keyAlgorithm field exists for historical compatibility reasons and should not be used. The algorithm is now hardcoded to HS256 in golang/x/crypto/acme.'
+                          type: string
+                          enum:
+                            - HS256
+                            - HS384
+                            - HS512
+                        keyID:
+                          description: keyID is the ID of the CA key that the External Account is bound to.
+                          type: string
+                        keySecretRef:
+                          description: keySecretRef is a Secret Key Selector referencing a data item in a Kubernetes Secret which holds the symmetric MAC key of the External Account Binding. The `key` is the index string that is paired with the key data in the Secret and should not be confused with the key data itself, or indeed with the External Account Binding keyID above. The secret key stored in the Secret **must** be un-padded, base64 URL encoded data.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            key:
+                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                              type: string
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                    preferredChain:
+                      description: 'PreferredChain is the chain to use if the ACME server outputs multiple. PreferredChain is no guarantee that this one gets delivered by the ACME endpoint. For example, for Let''s Encrypt''s DST crosssign you would use: "DST Root CA X3" or "ISRG Root X1" for the newer Let''s Encrypt root CA. This value picks the first certificate bundle in the ACME alternative chains that has a certificate with this value as its issuer''s CN'
+                      type: string
+                      maxLength: 64
+                    privateKeySecretRef:
+                      description: PrivateKey is the name of a Kubernetes Secret resource that will be used to store the automatically generated ACME account private key. Optionally, a `key` may be specified to select a specific entry within the named Secret resource. If `key` is not specified, a default of `tls.key` will be used.
+                      type: object
+                      required:
+                        - name
+                      properties:
+                        key:
+                          description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                          type: string
+                        name:
+                          description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                          type: string
+                    server:
+                      description: 'Server is the URL used to access the ACME server''s ''directory'' endpoint. For example, for Let''s Encrypt''s staging endpoint, you would use: "https://acme-staging-v02.api.letsencrypt.org/directory". Only ACME v2 endpoints (i.e. RFC 8555) are supported.'
+                      type: string
+                    skipTLSVerify:
+                      description: Enables or disables validation of the ACME server TLS certificate. If true, requests to the ACME server will not have their TLS certificate validated (i.e. insecure connections will be allowed). Only enable this option in development environments. The cert-manager system installed roots will be used to verify connections to the ACME server if this is false. Defaults to false.
+                      type: boolean
+                    solvers:
+                      description: 'Solvers is a list of challenge solvers that will be used to solve ACME challenges for the matching domains. Solver configurations must be provided in order to obtain certificates from an ACME server. For more information, see: https://cert-manager.io/docs/configuration/acme/'
+                      type: array
+                      items:
+                        description: An ACMEChallengeSolver describes how to solve ACME challenges for the issuer it is part of. A selector may be provided to use different solving strategies for different DNS names. Only one of HTTP01 or DNS01 must be provided.
+                        type: object
+                        properties:
+                          dns01:
+                            description: Configures cert-manager to attempt to complete authorizations by performing the DNS01 challenge flow.
+                            type: object
+                            properties:
+                              acmeDNS:
+                                description: Use the 'ACME DNS' (https://github.com/joohoi/acme-dns) API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - accountSecretRef
+                                  - host
+                                properties:
+                                  accountSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  host:
+                                    type: string
+                              akamai:
+                                description: Use the Akamai DNS zone management API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - accessTokenSecretRef
+                                  - clientSecretSecretRef
+                                  - clientTokenSecretRef
+                                  - serviceConsumerDomain
+                                properties:
+                                  accessTokenSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  clientSecretSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  clientTokenSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  serviceConsumerDomain:
+                                    type: string
+                              azureDNS:
+                                description: Use the Microsoft Azure DNS API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - resourceGroupName
+                                  - subscriptionID
+                                properties:
+                                  clientID:
+                                    description: if both this and ClientSecret are left unset MSI will be used
+                                    type: string
+                                  clientSecretSecretRef:
+                                    description: if both this and ClientID are left unset MSI will be used
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  environment:
+                                    description: name of the Azure environment (default AzurePublicCloud)
+                                    type: string
+                                    enum:
+                                      - AzurePublicCloud
+                                      - AzureChinaCloud
+                                      - AzureGermanCloud
+                                      - AzureUSGovernmentCloud
+                                  hostedZoneName:
+                                    description: name of the DNS zone that should be used
+                                    type: string
+                                  managedIdentity:
+                                    description: managed identity configuration, can not be used at the same time as clientID, clientSecretSecretRef or tenantID
+                                    type: object
+                                    properties:
+                                      clientID:
+                                        description: client ID of the managed identity, can not be used at the same time as resourceID
+                                        type: string
+                                      resourceID:
+                                        description: resource ID of the managed identity, can not be used at the same time as clientID
+                                        type: string
+                                  resourceGroupName:
+                                    description: resource group the DNS zone is located in
+                                    type: string
+                                  subscriptionID:
+                                    description: ID of the Azure subscription
+                                    type: string
+                                  tenantID:
+                                    description: when specifying ClientID and ClientSecret then this field is also needed
+                                    type: string
+                              cloudDNS:
+                                description: Use the Google Cloud DNS API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - project
+                                properties:
+                                  hostedZoneName:
+                                    description: HostedZoneName is an optional field that tells cert-manager in which Cloud DNS zone the challenge record has to be created. If left empty cert-manager will automatically choose a zone.
+                                    type: string
+                                  project:
+                                    type: string
+                                  serviceAccountSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                              cloudflare:
+                                description: Use the Cloudflare API to manage DNS01 challenge records.
+                                type: object
+                                properties:
+                                  apiKeySecretRef:
+                                    description: 'API key to use to authenticate with Cloudflare. Note: using an API token to authenticate is now the recommended method as it allows greater control of permissions.'
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  apiTokenSecretRef:
+                                    description: API token used to authenticate with Cloudflare.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                                  email:
+                                    description: Email of the account, only required when using API key based authentication.
+                                    type: string
+                              cnameStrategy:
+                                description: CNAMEStrategy configures how the DNS01 provider should handle CNAME records when found in DNS zones.
+                                type: string
+                                enum:
+                                  - None
+                                  - Follow
+                              digitalocean:
+                                description: Use the DigitalOcean DNS API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - tokenSecretRef
+                                properties:
+                                  tokenSecretRef:
+                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                              rfc2136:
+                                description: Use RFC2136 ("Dynamic Updates in the Domain Name System") (https://datatracker.ietf.org/doc/rfc2136/) to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - nameserver
+                                properties:
+                                  nameserver:
+                                    description: The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. This field is required.
+                                    type: string
+                                  tsigAlgorithm:
+                                    description: 'The TSIG Algorithm configured in the DNS supporting RFC2136. Used only when ``tsigSecretSecretRef`` and ``tsigKeyName`` are defined. Supported values are (case-insensitive): ``HMACMD5`` (default), ``HMACSHA1``, ``HMACSHA256`` or ``HMACSHA512``.'
+                                    type: string
+                                  tsigKeyName:
+                                    description: The TSIG Key name configured in the DNS. If ``tsigSecretSecretRef`` is defined, this field is required.
+                                    type: string
+                                  tsigSecretSecretRef:
+                                    description: The name of the secret containing the TSIG value. If ``tsigKeyName`` is defined, this field is required.
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                              route53:
+                                description: Use the AWS Route53 API to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - region
+                                properties:
+                                  accessKeyID:
+                                    description: 'The AccessKeyID is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials'
+                                    type: string
+                                  hostedZoneID:
+                                    description: If set, the provider will manage only this zone in Route53 and will not do an lookup using the route53:ListHostedZonesByName api call.
+                                    type: string
+                                  region:
+                                    description: Always set the region when using AccessKeyID and SecretAccessKey
+                                    type: string
+                                  role:
+                                    description: Role is a Role ARN which the Route53 provider will assume using either the explicit credentials AccessKeyID/SecretAccessKey or the inferred credentials from environment variables, shared credentials file or AWS Instance metadata
+                                    type: string
+                                  secretAccessKeySecretRef:
+                                    description: The SecretAccessKey is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
+                                    type: object
+                                    required:
+                                      - name
+                                    properties:
+                                      key:
+                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                        type: string
+                                      name:
+                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                        type: string
+                              webhook:
+                                description: Configure an external webhook based DNS01 challenge solver to manage DNS01 challenge records.
+                                type: object
+                                required:
+                                  - groupName
+                                  - solverName
+                                properties:
+                                  config:
+                                    description: Additional configuration that should be passed to the webhook apiserver when challenges are processed. This can contain arbitrary JSON data. Secret values should not be specified in this stanza. If secret values are needed (e.g. credentials for a DNS service), you should use a SecretKeySelector to reference a Secret resource. For details on the schema of this field, consult the webhook provider implementation's documentation.
+                                    x-kubernetes-preserve-unknown-fields: true
+                                  groupName:
+                                    description: The API group name that should be used when POSTing ChallengePayload resources to the webhook apiserver. This should be the same as the GroupName specified in the webhook provider implementation.
+                                    type: string
+                                  solverName:
+                                    description: The name of the solver to use, as defined in the webhook provider implementation. This will typically be the name of the provider, e.g. 'cloudflare'.
+                                    type: string
+                          http01:
+                            description: Configures cert-manager to attempt to complete authorizations by performing the HTTP01 challenge flow. It is not possible to obtain certificates for wildcard domain names (e.g. `*.example.com`) using the HTTP01 challenge mechanism.
+                            type: object
+                            properties:
+                              gatewayHTTPRoute:
+                                description: The Gateway API is a sig-network community API that models service networking in Kubernetes (https://gateway-api.sigs.k8s.io/). The Gateway solver will create HTTPRoutes with the specified labels in the same namespace as the challenge. This solver is experimental, and fields / behaviour may change in the future.
+                                type: object
+                                properties:
+                                  labels:
+                                    description: Custom labels that will be applied to HTTPRoutes created by cert-manager while solving HTTP-01 challenges.
+                                    type: object
+                                    additionalProperties:
+                                      type: string
+                                  parentRefs:
+                                    description: 'When solving an HTTP-01 challenge, cert-manager creates an HTTPRoute. cert-manager needs to know which parentRefs should be used when creating the HTTPRoute. Usually, the parentRef references a Gateway. See: https://gateway-api.sigs.k8s.io/v1alpha2/api-types/httproute/#attaching-to-gateways'
+                                    type: array
+                                    items:
+                                      description: "ParentRef identifies an API object (usually a Gateway) that can be considered a parent of this resource (usually a route). The only kind of parent resource with \"Core\" support is Gateway. This API may be extended in the future to support additional kinds of parent resources, such as HTTPRoute. \n The API object must be valid in the cluster; the Group and Kind must be registered in the cluster for this reference to be valid. \n References to objects with invalid Group and Kind are not valid, and must be rejected by the implementation, with appropriate Conditions set on the containing object."
+                                      type: object
+                                      required:
+                                        - name
+                                      properties:
+                                        group:
+                                          description: "Group is the group of the referent. \n Support: Core"
+                                          type: string
+                                          default: gateway.networking.k8s.io
+                                          maxLength: 253
+                                          pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                        kind:
+                                          description: "Kind is kind of the referent. \n Support: Core (Gateway) Support: Custom (Other Resources)"
+                                          type: string
+                                          default: Gateway
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                                        name:
+                                          description: "Name is the name of the referent. \n Support: Core"
+                                          type: string
+                                          maxLength: 253
+                                          minLength: 1
+                                        namespace:
+                                          description: "Namespace is the namespace of the referent. When unspecified (or empty string), this refers to the local namespace of the Route. \n Support: Core"
+                                          type: string
+                                          maxLength: 63
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                                        sectionName:
+                                          description: "SectionName is the name of a section within the target resource. In the following resources, SectionName is interpreted as the following: \n * Gateway: Listener Name \n Implementations MAY choose to support attaching Routes to other resources. If that is the case, they MUST clearly document how SectionName is interpreted. \n When unspecified (empty string), this will reference the entire resource. For the purpose of status, an attachment is considered successful if at least one section in the parent resource accepts it. For example, Gateway listeners can restrict which Routes can attach to them by Route kind, namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from the referencing Route, the Route MUST be considered successfully attached. If no Gateway listeners accept attachment from this Route, the Route MUST be considered detached from the Gateway. \n Support: Core"
+                                          type: string
+                                          maxLength: 253
+                                          minLength: 1
+                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                                  serviceType:
+                                    description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
+                                    type: string
+                              ingress:
+                                description: The ingress based HTTP01 challenge solver will solve challenges by creating or modifying Ingress resources in order to route requests for '/.well-known/acme-challenge/XYZ' to 'challenge solver' pods that are provisioned by cert-manager for each Challenge to be completed.
+                                type: object
+                                properties:
+                                  class:
+                                    description: The ingress class to use when creating Ingress resources to solve ACME challenges that use this challenge solver. Only one of 'class' or 'name' may be specified.
+                                    type: string
+                                  ingressTemplate:
+                                    description: Optional ingress template used to configure the ACME challenge solver ingress used for HTTP01 challenges.
+                                    type: object
+                                    properties:
+                                      metadata:
+                                        description: ObjectMeta overrides for the ingress used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
+                                        type: object
+                                        properties:
+                                          annotations:
+                                            description: Annotations that should be added to the created ACME HTTP01 solver ingress.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                          labels:
+                                            description: Labels that should be added to the created ACME HTTP01 solver ingress.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                  name:
+                                    description: The name of the ingress resource that should have ACME challenge solving routes inserted into it in order to solve HTTP01 challenges. This is typically used in conjunction with ingress controllers like ingress-gce, which maintains a 1:1 mapping between external IPs and ingress resources.
+                                    type: string
+                                  podTemplate:
+                                    description: Optional pod template used to configure the ACME challenge solver pods used for HTTP01 challenges.
+                                    type: object
+                                    properties:
+                                      metadata:
+                                        description: ObjectMeta overrides for the pod used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
+                                        type: object
+                                        properties:
+                                          annotations:
+                                            description: Annotations that should be added to the create ACME HTTP01 solver pods.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                          labels:
+                                            description: Labels that should be added to the created ACME HTTP01 solver pods.
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                      spec:
+                                        description: PodSpec defines overrides for the HTTP01 challenge solver pod. Only the 'priorityClassName', 'nodeSelector', 'affinity', 'serviceAccountName' and 'tolerations' fields are supported currently. All other fields will be ignored.
+                                        type: object
+                                        properties:
+                                          affinity:
+                                            description: If specified, the pod's scheduling constraints
+                                            type: object
+                                            properties:
+                                              nodeAffinity:
+                                                description: Describes node affinity scheduling rules for the pod.
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                                                      type: object
+                                                      required:
+                                                        - preference
+                                                        - weight
+                                                      properties:
+                                                        preference:
+                                                          description: A node selector term, associated with the corresponding weight.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: A list of node selector requirements by node's labels.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchFields:
+                                                              description: A list of node selector requirements by node's fields.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                        weight:
+                                                          description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
+                                                    type: object
+                                                    required:
+                                                      - nodeSelectorTerms
+                                                    properties:
+                                                      nodeSelectorTerms:
+                                                        description: Required. A list of node selector terms. The terms are ORed.
+                                                        type: array
+                                                        items:
+                                                          description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: A list of node selector requirements by node's labels.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchFields:
+                                                              description: A list of node selector requirements by node's fields.
+                                                              type: array
+                                                              items:
+                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: The label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                                    type: string
+                                                                  values:
+                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                              podAffinity:
+                                                description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                                      type: object
+                                                      required:
+                                                        - podAffinityTerm
+                                                        - weight
+                                                      properties:
+                                                        podAffinityTerm:
+                                                          description: Required. A pod affinity term, associated with the corresponding weight.
+                                                          type: object
+                                                          required:
+                                                            - topologyKey
+                                                          properties:
+                                                            labelSelector:
+                                                              description: A label query over a set of resources, in this case pods.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaceSelector:
+                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaces:
+                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                            topologyKey:
+                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                              type: string
+                                                        weight:
+                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                                    type: array
+                                                    items:
+                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                                      type: object
+                                                      required:
+                                                        - topologyKey
+                                                      properties:
+                                                        labelSelector:
+                                                          description: A label query over a set of resources, in this case pods.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaceSelector:
+                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaces:
+                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                        topologyKey:
+                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                          type: string
+                                              podAntiAffinity:
+                                                description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+                                                type: object
+                                                properties:
+                                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
+                                                    type: array
+                                                    items:
+                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                                      type: object
+                                                      required:
+                                                        - podAffinityTerm
+                                                        - weight
+                                                      properties:
+                                                        podAffinityTerm:
+                                                          description: Required. A pod affinity term, associated with the corresponding weight.
+                                                          type: object
+                                                          required:
+                                                            - topologyKey
+                                                          properties:
+                                                            labelSelector:
+                                                              description: A label query over a set of resources, in this case pods.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaceSelector:
+                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                              type: object
+                                                              properties:
+                                                                matchExpressions:
+                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                                  type: array
+                                                                  items:
+                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                    type: object
+                                                                    required:
+                                                                      - key
+                                                                      - operator
+                                                                    properties:
+                                                                      key:
+                                                                        description: key is the label key that the selector applies to.
+                                                                        type: string
+                                                                      operator:
+                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                        type: string
+                                                                      values:
+                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                        type: array
+                                                                        items:
+                                                                          type: string
+                                                                matchLabels:
+                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                                  type: object
+                                                                  additionalProperties:
+                                                                    type: string
+                                                            namespaces:
+                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                              type: array
+                                                              items:
+                                                                type: string
+                                                            topologyKey:
+                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                              type: string
+                                                        weight:
+                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
+                                                          type: integer
+                                                          format: int32
+                                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                                    description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                                    type: array
+                                                    items:
+                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
+                                                      type: object
+                                                      required:
+                                                        - topologyKey
+                                                      properties:
+                                                        labelSelector:
+                                                          description: A label query over a set of resources, in this case pods.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaceSelector:
+                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
+                                                          type: object
+                                                          properties:
+                                                            matchExpressions:
+                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                              type: array
+                                                              items:
+                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+                                                                type: object
+                                                                required:
+                                                                  - key
+                                                                  - operator
+                                                                properties:
+                                                                  key:
+                                                                    description: key is the label key that the selector applies to.
+                                                                    type: string
+                                                                  operator:
+                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                                    type: string
+                                                                  values:
+                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
+                                                                    type: array
+                                                                    items:
+                                                                      type: string
+                                                            matchLabels:
+                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                              type: object
+                                                              additionalProperties:
+                                                                type: string
+                                                        namespaces:
+                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
+                                                          type: array
+                                                          items:
+                                                            type: string
+                                                        topologyKey:
+                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
+                                                          type: string
+                                          nodeSelector:
+                                            description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
+                                            type: object
+                                            additionalProperties:
+                                              type: string
+                                          priorityClassName:
+                                            description: If specified, the pod's priorityClassName.
+                                            type: string
+                                          serviceAccountName:
+                                            description: If specified, the pod's service account
+                                            type: string
+                                          tolerations:
+                                            description: If specified, the pod's tolerations.
+                                            type: array
+                                            items:
+                                              description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
+                                              type: object
+                                              properties:
+                                                effect:
+                                                  description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                                                  type: string
+                                                key:
+                                                  description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                                                  type: string
+                                                operator:
+                                                  description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
+                                                  type: string
+                                                tolerationSeconds:
+                                                  description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
+                                                  type: integer
+                                                  format: int64
+                                                value:
+                                                  description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
+                                                  type: string
+                                  serviceType:
+                                    description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
+                                    type: string
+                          selector:
+                            description: Selector selects a set of DNSNames on the Certificate resource that should be solved using this challenge solver. If not specified, the solver will be treated as the 'default' solver with the lowest priority, i.e. if any other solver has a more specific match, it will be used instead.
+                            type: object
+                            properties:
+                              dnsNames:
+                                description: List of DNSNames that this solver will be used to solve. If specified and a match is found, a dnsNames selector will take precedence over a dnsZones selector. If multiple solvers match with the same dnsNames value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
+                                type: array
+                                items:
+                                  type: string
+                              dnsZones:
+                                description: List of DNSZones that this solver will be used to solve. The most specific DNS zone match specified here will take precedence over other DNS zone matches, so a solver specifying sys.example.com will be selected over one specifying example.com for the domain www.sys.example.com. If multiple solvers match with the same dnsZones value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
+                                type: array
+                                items:
+                                  type: string
+                              matchLabels:
+                                description: A label selector that is used to refine the set of certificate's that this challenge solver will apply to.
+                                type: object
+                                additionalProperties:
+                                  type: string
+                ca:
+                  description: CA configures this issuer to sign certificates using a signing CA keypair stored in a Secret resource. This is used to build internal PKIs that are managed by cert-manager.
+                  type: object
+                  required:
+                    - secretName
+                  properties:
+                    crlDistributionPoints:
+                      description: The CRL distribution points is an X.509 v3 certificate extension which identifies the location of the CRL from which the revocation of this certificate can be checked. If not set, certificates will be issued without distribution points set.
+                      type: array
+                      items:
+                        type: string
+                    ocspServers:
+                      description: The OCSP server list is an X.509 v3 extension that defines a list of URLs of OCSP responders. The OCSP responders can be queried for the revocation status of an issued certificate. If not set, the certificate will be issued with no OCSP servers set. For example, an OCSP server URL could be "http://ocsp.int-x3.letsencrypt.org".
+                      type: array
+                      items:
+                        type: string
+                    secretName:
+                      description: SecretName is the name of the secret used to sign Certificates issued by this Issuer.
+                      type: string
+                selfSigned:
+                  description: SelfSigned configures this issuer to 'self sign' certificates using the private key used to create the CertificateRequest object.
+                  type: object
+                  properties:
+                    crlDistributionPoints:
+                      description: The CRL distribution points is an X.509 v3 certificate extension which identifies the location of the CRL from which the revocation of this certificate can be checked. If not set certificate will be issued without CDP. Values are strings.
+                      type: array
+                      items:
+                        type: string
+                vault:
+                  description: Vault configures this issuer to sign certificates using a HashiCorp Vault PKI backend.
+                  type: object
+                  required:
+                    - auth
+                    - path
+                    - server
+                  properties:
+                    auth:
+                      description: Auth configures how cert-manager authenticates with the Vault server.
+                      type: object
+                      properties:
+                        appRole:
+                          description: AppRole authenticates with Vault using the App Role auth mechanism, with the role and secret stored in a Kubernetes Secret resource.
+                          type: object
+                          required:
+                            - path
+                            - roleId
+                            - secretRef
+                          properties:
+                            path:
+                              description: 'Path where the App Role authentication backend is mounted in Vault, e.g: "approle"'
+                              type: string
+                            roleId:
+                              description: RoleID configured in the App Role authentication backend when setting up the authentication backend in Vault.
+                              type: string
+                            secretRef:
+                              description: Reference to a key in a Secret that contains the App Role secret used to authenticate with Vault. The `key` field must be specified and denotes which entry within the Secret resource is used as the app role secret.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                        kubernetes:
+                          description: Kubernetes authenticates with Vault by passing the ServiceAccount token stored in the named Secret resource to the Vault server.
+                          type: object
+                          required:
+                            - role
+                            - secretRef
+                          properties:
+                            mountPath:
+                              description: The Vault mountPath here is the mount path to use when authenticating with Vault. For example, setting a value to `/v1/auth/foo`, will use the path `/v1/auth/foo/login` to authenticate with Vault. If unspecified, the default value "/v1/auth/kubernetes" will be used.
+                              type: string
+                            role:
+                              description: A required field containing the Vault Role to assume. A Role binds a Kubernetes ServiceAccount with a set of Vault policies.
+                              type: string
+                            secretRef:
+                              description: The required Secret field containing a Kubernetes ServiceAccount JWT used for authenticating with Vault. Use of 'ambient credentials' is not supported.
+                              type: object
+                              required:
+                                - name
+                              properties:
+                                key:
+                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                                  type: string
+                                name:
+                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                                  type: string
+                        tokenSecretRef:
+                          description: TokenSecretRef authenticates with Vault by presenting a token.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            key:
+                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                              type: string
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                    caBundle:
+                      description: PEM-encoded CA bundle (base64-encoded) used to validate Vault server certificate. Only used if the Server URL is using HTTPS protocol. This parameter is ignored for plain HTTP protocol connection. If not set the system root certificates are used to validate the TLS connection.
+                      type: string
+                      format: byte
+                    namespace:
+                      description: 'Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows Vault environments to support Secure Multi-tenancy. e.g: "ns1" More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces'
+                      type: string
+                    path:
+                      description: 'Path is the mount path of the Vault PKI backend''s `sign` endpoint, e.g: "my_pki_mount/sign/my-role-name".'
+                      type: string
+                    server:
+                      description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
+                      type: string
+                venafi:
+                  description: Venafi configures this issuer to sign certificates using a Venafi TPP or Venafi Cloud policy zone.
+                  type: object
+                  required:
+                    - zone
+                  properties:
+                    cloud:
+                      description: Cloud specifies the Venafi cloud configuration settings. Only one of TPP or Cloud may be specified.
+                      type: object
+                      required:
+                        - apiTokenSecretRef
+                      properties:
+                        apiTokenSecretRef:
+                          description: APITokenSecretRef is a secret key selector for the Venafi Cloud API token.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            key:
+                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
+                              type: string
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                        url:
+                          description: URL is the base URL for Venafi Cloud. Defaults to "https://api.venafi.cloud/v1".
+                          type: string
+                    tpp:
+                      description: TPP specifies Trust Protection Platform configuration settings. Only one of TPP or Cloud may be specified.
+                      type: object
+                      required:
+                        - credentialsRef
+                        - url
+                      properties:
+                        caBundle:
+                          description: CABundle is a PEM encoded TLS certificate to use to verify connections to the TPP instance. If specified, system roots will not be used and the issuing CA for the TPP instance must be verifiable using the provided root. If not specified, the connection will be verified using the cert-manager system root certificates.
+                          type: string
+                          format: byte
+                        credentialsRef:
+                          description: CredentialsRef is a reference to a Secret containing the username and password for the TPP server. The secret must contain two keys, 'username' and 'password'.
+                          type: object
+                          required:
+                            - name
+                          properties:
+                            name:
+                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                              type: string
+                        url:
+                          description: 'URL is the base URL for the vedsdk endpoint of the Venafi TPP instance, for example: "https://tpp.example.com/vedsdk".'
+                          type: string
+                    zone:
+                      description: Zone is the Venafi Policy Zone to use for this issuer. All requests made to the Venafi platform will be restricted by the named zone policy. This field is required.
+                      type: string
+            status:
+              description: Status of the Issuer. This is set and managed automatically.
+              type: object
+              properties:
+                acme:
+                  description: ACME specific status options. This field should only be set if the Issuer is configured to use an ACME server to issue certificates.
+                  type: object
+                  properties:
+                    lastRegisteredEmail:
+                      description: LastRegisteredEmail is the email associated with the latest registered ACME account, in order to track changes made to registered account associated with the  Issuer
+                      type: string
+                    uri:
+                      description: URI is the unique account identifier, which can also be used to retrieve account details from the CA
+                      type: string
+                conditions:
+                  description: List of status conditions to indicate the status of a CertificateRequest. Known condition types are `Ready`.
+                  type: array
+                  items:
+                    description: IssuerCondition contains condition information for an Issuer.
+                    type: object
+                    required:
+                      - status
+                      - type
+                    properties:
+                      lastTransitionTime:
+                        description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
+                        type: string
+                        format: date-time
+                      message:
+                        description: Message is a human readable description of the details of the last transition, complementing reason.
+                        type: string
+                      observedGeneration:
+                        description: If set, this represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date with respect to the current state of the Issuer.
+                        type: integer
+                        format: int64
+                      reason:
+                        description: Reason is a brief machine readable explanation for the condition's last transition.
+                        type: string
+                      status:
+                        description: Status of the condition, one of (`True`, `False`, `Unknown`).
+                        type: string
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                      type:
+                        description: Type of the condition, known values are (`Ready`).
+                        type: string
+                  x-kubernetes-list-map-keys:
+                    - type
+                  x-kubernetes-list-type: map
+      served: true
+      storage: true
+---
+# Source: cert-manager/templates/crd-templates.yaml
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: orders.acme.cert-manager.io
+  annotations:
+    cert-manager.io/inject-ca-from-secret: 'cert-manager/cert-manager-webhook-ca'
+  labels:
+    app: 'cert-manager'
+    app.kubernetes.io/name: 'cert-manager'
+    app.kubernetes.io/instance: 'cert-manager'
+    # Generated labels
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  group: acme.cert-manager.io
+  names:
+    kind: Order
+    listKind: OrderList
+    plural: orders
+    singular: order
+    categories:
+      - cert-manager
+      - cert-manager-acme
+  scope: Namespaced
+  versions:
+    - name: v1
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+        - jsonPath: .status.state
+          name: State
+          type: string
+        - jsonPath: .spec.issuerRef.name
+          name: Issuer
+          priority: 1
+          type: string
+        - jsonPath: .status.reason
+          name: Reason
+          priority: 1
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
+          name: Age
+          type: date
+      schema:
+        openAPIV3Schema:
+          description: Order is a type to represent an Order with an ACME server
+          type: object
+          required:
+            - metadata
+            - spec
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              type: object
+              required:
+                - issuerRef
+                - request
+              properties:
+                commonName:
+                  description: CommonName is the common name as specified on the DER encoded CSR. If specified, this value must also be present in `dnsNames` or `ipAddresses`. This field must match the corresponding field on the DER encoded CSR.
+                  type: string
+                dnsNames:
+                  description: DNSNames is a list of DNS names that should be included as part of the Order validation process. This field must match the corresponding field on the DER encoded CSR.
+                  type: array
+                  items:
+                    type: string
+                duration:
+                  description: Duration is the duration for the not after date for the requested certificate. this is set on order creation as pe the ACME spec.
+                  type: string
+                ipAddresses:
+                  description: IPAddresses is a list of IP addresses that should be included as part of the Order validation process. This field must match the corresponding field on the DER encoded CSR.
+                  type: array
+                  items:
+                    type: string
+                issuerRef:
+                  description: IssuerRef references a properly configured ACME-type Issuer which should be used to create this Order. If the Issuer does not exist, processing will be retried. If the Issuer is not an 'ACME' Issuer, an error will be returned and the Order will be marked as failed.
+                  type: object
+                  required:
+                    - name
+                  properties:
+                    group:
+                      description: Group of the resource being referred to.
+                      type: string
+                    kind:
+                      description: Kind of the resource being referred to.
+                      type: string
+                    name:
+                      description: Name of the resource being referred to.
+                      type: string
+                request:
+                  description: Certificate signing request bytes in DER encoding. This will be used when finalizing the order. This field must be set on the order.
+                  type: string
+                  format: byte
+            status:
+              type: object
+              properties:
+                authorizations:
+                  description: Authorizations contains data returned from the ACME server on what authorizations must be completed in order to validate the DNS names specified on the Order.
+                  type: array
+                  items:
+                    description: ACMEAuthorization contains data returned from the ACME server on an authorization that must be completed in order validate a DNS name on an ACME Order resource.
+                    type: object
+                    required:
+                      - url
+                    properties:
+                      challenges:
+                        description: Challenges specifies the challenge types offered by the ACME server. One of these challenge types will be selected when validating the DNS name and an appropriate Challenge resource will be created to perform the ACME challenge process.
+                        type: array
+                        items:
+                          description: Challenge specifies a challenge offered by the ACME server for an Order. An appropriate Challenge resource can be created to perform the ACME challenge process.
+                          type: object
+                          required:
+                            - token
+                            - type
+                            - url
+                          properties:
+                            token:
+                              description: Token is the token that must be presented for this challenge. This is used to compute the 'key' that must also be presented.
+                              type: string
+                            type:
+                              description: Type is the type of challenge being offered, e.g. 'http-01', 'dns-01', 'tls-sni-01', etc. This is the raw value retrieved from the ACME server. Only 'http-01' and 'dns-01' are supported by cert-manager, other values will be ignored.
+                              type: string
+                            url:
+                              description: URL is the URL of this challenge. It can be used to retrieve additional metadata about the Challenge from the ACME server.
+                              type: string
+                      identifier:
+                        description: Identifier is the DNS name to be validated as part of this authorization
+                        type: string
+                      initialState:
+                        description: InitialState is the initial state of the ACME authorization when first fetched from the ACME server. If an Authorization is already 'valid', the Order controller will not create a Challenge resource for the authorization. This will occur when working with an ACME server that enables 'authz reuse' (such as Let's Encrypt's production endpoint). If not set and 'identifier' is set, the state is assumed to be pending and a Challenge will be created.
+                        type: string
+                        enum:
+                          - valid
+                          - ready
+                          - pending
+                          - processing
+                          - invalid
+                          - expired
+                          - errored
+                      url:
+                        description: URL is the URL of the Authorization that must be completed
+                        type: string
+                      wildcard:
+                        description: Wildcard will be true if this authorization is for a wildcard DNS name. If this is true, the identifier will be the *non-wildcard* version of the DNS name. For example, if '*.example.com' is the DNS name being validated, this field will be 'true' and the 'identifier' field will be 'example.com'.
+                        type: boolean
+                certificate:
+                  description: Certificate is a copy of the PEM encoded certificate for this Order. This field will be populated after the order has been successfully finalized with the ACME server, and the order has transitioned to the 'valid' state.
+                  type: string
+                  format: byte
+                failureTime:
+                  description: FailureTime stores the time that this order failed. This is used to influence garbage collection and back-off.
+                  type: string
+                  format: date-time
+                finalizeURL:
+                  description: FinalizeURL of the Order. This is used to obtain certificates for this order once it has been completed.
+                  type: string
+                reason:
+                  description: Reason optionally provides more information about a why the order is in the current state.
+                  type: string
+                state:
+                  description: State contains the current state of this Order resource. States 'success' and 'expired' are 'final'
+                  type: string
+                  enum:
+                    - valid
+                    - ready
+                    - pending
+                    - processing
+                    - invalid
+                    - expired
+                    - errored
+                url:
+                  description: URL of the Order. This will initially be empty when the resource is first created. The Order controller will populate this field when the Order is first processed. This field will be immutable after it is initially set.
+                  type: string
+      served: true
+      storage: true
+---
+# Source: cert-manager/templates/cainjector-serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+automountServiceAccountToken: true
+metadata:
+  name: cert-manager-cainjector
+  namespace: "cert-manager"
+  labels:
+    app: cainjector
+    app.kubernetes.io/name: cainjector
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cainjector"
+    app.kubernetes.io/version: "v1.8.0"
+---
+# Source: cert-manager/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+automountServiceAccountToken: true
+metadata:
+  name: cert-manager
+  namespace: "cert-manager"
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+---
+# Source: cert-manager/templates/webhook-serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+automountServiceAccountToken: true
+metadata:
+  name: cert-manager-webhook
+  namespace: "cert-manager"
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+---
+# Source: cert-manager/templates/webhook-config.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cert-manager-webhook
+  namespace: "cert-manager"
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+data:
+---
+# Source: cert-manager/templates/cainjector-rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-cainjector
+  labels:
+    app: cainjector
+    app.kubernetes.io/name: cainjector
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cainjector"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["get", "create", "update", "patch"]
+  - apiGroups: ["admissionregistration.k8s.io"]
+    resources: ["validatingwebhookconfigurations", "mutatingwebhookconfigurations"]
+    verbs: ["get", "list", "watch", "update"]
+  - apiGroups: ["apiregistration.k8s.io"]
+    resources: ["apiservices"]
+    verbs: ["get", "list", "watch", "update"]
+  - apiGroups: ["apiextensions.k8s.io"]
+    resources: ["customresourcedefinitions"]
+    verbs: ["get", "list", "watch", "update"]
+---
+# Source: cert-manager/templates/rbac.yaml
+# Issuer controller role
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-controller-issuers
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["issuers", "issuers/status"]
+    verbs: ["update", "patch"]
+  - apiGroups: ["cert-manager.io"]
+    resources: ["issuers"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list", "watch", "create", "update", "delete"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["create", "patch"]
+---
+# Source: cert-manager/templates/rbac.yaml
+# ClusterIssuer controller role
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-controller-clusterissuers
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["clusterissuers", "clusterissuers/status"]
+    verbs: ["update", "patch"]
+  - apiGroups: ["cert-manager.io"]
+    resources: ["clusterissuers"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list", "watch", "create", "update", "delete"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["create", "patch"]
+---
+# Source: cert-manager/templates/rbac.yaml
+# Certificates controller role
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-controller-certificates
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates", "certificates/status", "certificaterequests", "certificaterequests/status"]
+    verbs: ["update", "patch"]
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates", "certificaterequests", "clusterissuers", "issuers"]
+    verbs: ["get", "list", "watch"]
+  # We require these rules to support users with the OwnerReferencesPermissionEnforcement
+  # admission controller enabled:
+  # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates/finalizers", "certificaterequests/finalizers"]
+    verbs: ["update"]
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["orders"]
+    verbs: ["create", "delete", "get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list", "watch", "create", "update", "delete", "patch"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["create", "patch"]
+---
+# Source: cert-manager/templates/rbac.yaml
+# Orders controller role
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-controller-orders
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["orders", "orders/status"]
+    verbs: ["update", "patch"]
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["orders", "challenges"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["cert-manager.io"]
+    resources: ["clusterissuers", "issuers"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["challenges"]
+    verbs: ["create", "delete"]
+  # We require these rules to support users with the OwnerReferencesPermissionEnforcement
+  # admission controller enabled:
+  # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["orders/finalizers"]
+    verbs: ["update"]
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["create", "patch"]
+---
+# Source: cert-manager/templates/rbac.yaml
+# Challenges controller role
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-controller-challenges
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  # Use to update challenge resource status
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["challenges", "challenges/status"]
+    verbs: ["update", "patch"]
+  # Used to watch challenge resources
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["challenges"]
+    verbs: ["get", "list", "watch"]
+  # Used to watch challenges, issuer and clusterissuer resources
+  - apiGroups: ["cert-manager.io"]
+    resources: ["issuers", "clusterissuers"]
+    verbs: ["get", "list", "watch"]
+  # Need to be able to retrieve ACME account private key to complete challenges
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list", "watch"]
+  # Used to create events
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["create", "patch"]
+  # HTTP01 rules
+  - apiGroups: [""]
+    resources: ["pods", "services"]
+    verbs: ["get", "list", "watch", "create", "delete"]
+  - apiGroups: ["networking.k8s.io"]
+    resources: ["ingresses"]
+    verbs: ["get", "list", "watch", "create", "delete", "update"]
+  - apiGroups: [ "gateway.networking.k8s.io" ]
+    resources: [ "httproutes" ]
+    verbs: ["get", "list", "watch", "create", "delete", "update"]
+  # We require the ability to specify a custom hostname when we are creating
+  # new ingress resources.
+  # See: https://github.com/openshift/origin/blob/21f191775636f9acadb44fa42beeb4f75b255532/pkg/route/apiserver/admission/ingress_admission.go#L84-L148
+  - apiGroups: ["route.openshift.io"]
+    resources: ["routes/custom-host"]
+    verbs: ["create"]
+  # We require these rules to support users with the OwnerReferencesPermissionEnforcement
+  # admission controller enabled:
+  # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["challenges/finalizers"]
+    verbs: ["update"]
+  # DNS01 rules (duplicated above)
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list", "watch"]
+---
+# Source: cert-manager/templates/rbac.yaml
+# ingress-shim controller role
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-controller-ingress-shim
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates", "certificaterequests"]
+    verbs: ["create", "update", "delete"]
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates", "certificaterequests", "issuers", "clusterissuers"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["networking.k8s.io"]
+    resources: ["ingresses"]
+    verbs: ["get", "list", "watch"]
+  # We require these rules to support users with the OwnerReferencesPermissionEnforcement
+  # admission controller enabled:
+  # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement
+  - apiGroups: ["networking.k8s.io"]
+    resources: ["ingresses/finalizers"]
+    verbs: ["update"]
+  - apiGroups: ["gateway.networking.k8s.io"]
+    resources: ["gateways", "httproutes"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["gateway.networking.k8s.io"]
+    resources: ["gateways/finalizers", "httproutes/finalizers"]
+    verbs: ["update"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["create", "patch"]
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-view
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates", "certificaterequests", "issuers"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["challenges", "orders"]
+    verbs: ["get", "list", "watch"]
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-edit
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates", "certificaterequests", "issuers"]
+    verbs: ["create", "delete", "deletecollection", "patch", "update"]
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates/status"]
+    verbs: ["update"]
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["challenges", "orders"]
+    verbs: ["create", "delete", "deletecollection", "patch", "update"]
+---
+# Source: cert-manager/templates/rbac.yaml
+# Permission to approve CertificateRequests referencing cert-manager.io Issuers and ClusterIssuers
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-controller-approve:cert-manager-io
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cert-manager"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["signers"]
+    verbs: ["approve"]
+    resourceNames: ["issuers.cert-manager.io/*", "clusterissuers.cert-manager.io/*"]
+---
+# Source: cert-manager/templates/rbac.yaml
+# Permission to:
+# - Update and sign CertificatSigningeRequests referencing cert-manager.io Issuers and ClusterIssuers
+# - Perform SubjectAccessReviews to test whether users are able to reference Namespaced Issuers
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-controller-certificatesigningrequests
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cert-manager"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["certificates.k8s.io"]
+    resources: ["certificatesigningrequests"]
+    verbs: ["get", "list", "watch", "update"]
+  - apiGroups: ["certificates.k8s.io"]
+    resources: ["certificatesigningrequests/status"]
+    verbs: ["update", "patch"]
+  - apiGroups: ["certificates.k8s.io"]
+    resources: ["signers"]
+    resourceNames: ["issuers.cert-manager.io/*", "clusterissuers.cert-manager.io/*"]
+    verbs: ["sign"]
+  - apiGroups: ["authorization.k8s.io"]
+    resources: ["subjectaccessreviews"]
+    verbs: ["create"]
+---
+# Source: cert-manager/templates/webhook-rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cert-manager-webhook:subjectaccessreviews
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+- apiGroups: ["authorization.k8s.io"]
+  resources: ["subjectaccessreviews"]
+  verbs: ["create"]
+---
+# Source: cert-manager/templates/cainjector-rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-cainjector
+  labels:
+    app: cainjector
+    app.kubernetes.io/name: cainjector
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cainjector"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-cainjector
+subjects:
+  - name: cert-manager-cainjector
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-controller-issuers
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-controller-issuers
+subjects:
+  - name: cert-manager
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-controller-clusterissuers
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-controller-clusterissuers
+subjects:
+  - name: cert-manager
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-controller-certificates
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-controller-certificates
+subjects:
+  - name: cert-manager
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-controller-orders
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-controller-orders
+subjects:
+  - name: cert-manager
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-controller-challenges
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-controller-challenges
+subjects:
+  - name: cert-manager
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-controller-ingress-shim
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-controller-ingress-shim
+subjects:
+  - name: cert-manager
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-controller-approve:cert-manager-io
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cert-manager"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-controller-approve:cert-manager-io
+subjects:
+  - name: cert-manager
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-controller-certificatesigningrequests
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cert-manager"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-controller-certificatesigningrequests
+subjects:
+  - name: cert-manager
+    namespace: "cert-manager"
+    kind: ServiceAccount
+---
+# Source: cert-manager/templates/webhook-rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cert-manager-webhook:subjectaccessreviews
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cert-manager-webhook:subjectaccessreviews
+subjects:
+- apiGroup: ""
+  kind: ServiceAccount
+  name: cert-manager-webhook
+  namespace: cert-manager
+---
+# Source: cert-manager/templates/cainjector-rbac.yaml
+# leader election rules
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cert-manager-cainjector:leaderelection
+  namespace: kube-system
+  labels:
+    app: cainjector
+    app.kubernetes.io/name: cainjector
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cainjector"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  # Used for leader election by the controller
+  # cert-manager-cainjector-leader-election is used by the CertificateBased injector controller
+  #   see cmd/cainjector/start.go#L113
+  # cert-manager-cainjector-leader-election-core is used by the SecretBased injector controller
+  #   see cmd/cainjector/start.go#L137
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    resourceNames: ["cert-manager-cainjector-leader-election", "cert-manager-cainjector-leader-election-core"]
+    verbs: ["get", "update", "patch"]
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    verbs: ["create"]
+---
+# Source: cert-manager/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cert-manager:leaderelection
+  namespace: kube-system
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    resourceNames: ["cert-manager-controller"]
+    verbs: ["get", "update", "patch"]
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    verbs: ["create"]
+---
+# Source: cert-manager/templates/webhook-rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cert-manager-webhook:dynamic-serving
+  namespace: "cert-manager"
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+rules:
+- apiGroups: [""]
+  resources: ["secrets"]
+  resourceNames:
+  - 'cert-manager-webhook-ca'
+  verbs: ["get", "list", "watch", "update"]
+# It's not possible to grant CREATE permission on a single resourceName.
+- apiGroups: [""]
+  resources: ["secrets"]
+  verbs: ["create"]
+---
+# Source: cert-manager/templates/cainjector-rbac.yaml
+# grant cert-manager permission to manage the leaderelection configmap in the
+# leader election namespace
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cert-manager-cainjector:leaderelection
+  namespace: kube-system
+  labels:
+    app: cainjector
+    app.kubernetes.io/name: cainjector
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cainjector"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cert-manager-cainjector:leaderelection
+subjects:
+  - kind: ServiceAccount
+    name: cert-manager-cainjector
+    namespace: cert-manager
+---
+# Source: cert-manager/templates/rbac.yaml
+# grant cert-manager permission to manage the leaderelection configmap in the
+# leader election namespace
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cert-manager:leaderelection
+  namespace: kube-system
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cert-manager:leaderelection
+subjects:
+  - apiGroup: ""
+    kind: ServiceAccount
+    name: cert-manager
+    namespace: cert-manager
+---
+# Source: cert-manager/templates/webhook-rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cert-manager-webhook:dynamic-serving
+  namespace: "cert-manager"
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cert-manager-webhook:dynamic-serving
+subjects:
+- apiGroup: ""
+  kind: ServiceAccount
+  name: cert-manager-webhook
+  namespace: cert-manager
+---
+# Source: cert-manager/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: cert-manager
+  namespace: "cert-manager"
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  type: ClusterIP
+  ports:
+  - protocol: TCP
+    port: 9402
+    name: tcp-prometheus-servicemonitor
+    targetPort: 9402
+  selector:
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+---
+# Source: cert-manager/templates/webhook-service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: cert-manager-webhook
+  namespace: "cert-manager"
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  type: ClusterIP
+  ports:
+  - name: https
+    port: 443
+    protocol: TCP
+    targetPort: "https"
+  selector:
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+---
+# Source: cert-manager/templates/cainjector-deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cert-manager-cainjector
+  namespace: "cert-manager"
+  labels:
+    app: cainjector
+    app.kubernetes.io/name: cainjector
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "cainjector"
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: cainjector
+      app.kubernetes.io/instance: cert-manager
+      app.kubernetes.io/component: "cainjector"
+  template:
+    metadata:
+      labels:
+        app: cainjector
+        app.kubernetes.io/name: cainjector
+        app.kubernetes.io/instance: cert-manager
+        app.kubernetes.io/component: "cainjector"
+        app.kubernetes.io/version: "v1.8.0"
+    spec:
+      serviceAccountName: cert-manager-cainjector
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        - name: cert-manager
+          image: "quay.io/jetstack/cert-manager-cainjector:v1.8.0"
+          imagePullPolicy: IfNotPresent
+          args:
+          - --v=2
+          - --leader-election-namespace=kube-system
+          env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          securityContext:
+            allowPrivilegeEscalation: false
+      nodeSelector:
+        kubernetes.io/os: linux
+---
+# Source: cert-manager/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cert-manager
+  namespace: "cert-manager"
+  labels:
+    app: cert-manager
+    app.kubernetes.io/name: cert-manager
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "controller"
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: cert-manager
+      app.kubernetes.io/instance: cert-manager
+      app.kubernetes.io/component: "controller"
+  template:
+    metadata:
+      labels:
+        app: cert-manager
+        app.kubernetes.io/name: cert-manager
+        app.kubernetes.io/instance: cert-manager
+        app.kubernetes.io/component: "controller"
+        app.kubernetes.io/version: "v1.8.0"
+      annotations:
+        prometheus.io/path: "/metrics"
+        prometheus.io/scrape: 'true'
+        prometheus.io/port: '9402'
+    spec:
+      serviceAccountName: cert-manager
+      securityContext:
+
+        runAsNonRoot: true
+      containers:
+        - name: cert-manager
+          image: "quay.io/jetstack/cert-manager-controller:v1.8.0"
+          imagePullPolicy: IfNotPresent
+          args:
+          - --v=2
+          - --cluster-resource-namespace=$(POD_NAMESPACE)
+          - --leader-election-namespace=kube-system
+          ports:
+          - containerPort: 9402
+            name: http-metrics
+            protocol: TCP
+          securityContext:
+            allowPrivilegeEscalation: false
+          env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+      nodeSelector:
+        kubernetes.io/os: linux
+---
+# Source: cert-manager/templates/webhook-deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cert-manager-webhook
+  namespace: "cert-manager"
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: webhook
+      app.kubernetes.io/instance: cert-manager
+      app.kubernetes.io/component: "webhook"
+  template:
+    metadata:
+      labels:
+        app: webhook
+        app.kubernetes.io/name: webhook
+        app.kubernetes.io/instance: cert-manager
+        app.kubernetes.io/component: "webhook"
+        app.kubernetes.io/version: "v1.8.0"
+    spec:
+      serviceAccountName: cert-manager-webhook
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        - name: cert-manager
+          image: "quay.io/jetstack/cert-manager-webhook:v1.8.0"
+          imagePullPolicy: IfNotPresent
+          args:
+          - --v=2
+          - --secure-port=10250
+          - --dynamic-serving-ca-secret-namespace=$(POD_NAMESPACE)
+          - --dynamic-serving-ca-secret-name=cert-manager-webhook-ca
+          - --dynamic-serving-dns-names=cert-manager-webhook,cert-manager-webhook.cert-manager,cert-manager-webhook.cert-manager.svc
+          ports:
+          - name: https
+            protocol: TCP
+            containerPort: 10250
+          livenessProbe:
+            httpGet:
+              path: /livez
+              port: 6080
+              scheme: HTTP
+            initialDelaySeconds: 60
+            periodSeconds: 10
+            timeoutSeconds: 1
+            successThreshold: 1
+            failureThreshold: 3
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: 6080
+              scheme: HTTP
+            initialDelaySeconds: 5
+            periodSeconds: 5
+            timeoutSeconds: 1
+            successThreshold: 1
+            failureThreshold: 3
+          securityContext:
+            allowPrivilegeEscalation: false
+          env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+      nodeSelector:
+        kubernetes.io/os: linux
+---
+# Source: cert-manager/templates/webhook-mutating-webhook.yaml
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: cert-manager-webhook
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+  annotations:
+    cert-manager.io/inject-ca-from-secret: "cert-manager/cert-manager-webhook-ca"
+webhooks:
+  - name: webhook.cert-manager.io
+    rules:
+      - apiGroups:
+          - "cert-manager.io"
+          - "acme.cert-manager.io"
+        apiVersions:
+          - "v1"
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - "*/*"
+    admissionReviewVersions: ["v1"]
+    # This webhook only accepts v1 cert-manager resources.
+    # Equivalent matchPolicy ensures that non-v1 resource requests are sent to
+    # this webhook (after the resources have been converted to v1).
+    matchPolicy: Equivalent
+    timeoutSeconds: 10
+    failurePolicy: Fail
+    # Only include 'sideEffects' field in Kubernetes 1.12+
+    sideEffects: None
+    clientConfig:
+      service:
+        name: cert-manager-webhook
+        namespace: "cert-manager"
+        path: /mutate
+---
+# Source: cert-manager/templates/webhook-validating-webhook.yaml
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: cert-manager-webhook
+  labels:
+    app: webhook
+    app.kubernetes.io/name: webhook
+    app.kubernetes.io/instance: cert-manager
+    app.kubernetes.io/component: "webhook"
+    app.kubernetes.io/version: "v1.8.0"
+  annotations:
+    cert-manager.io/inject-ca-from-secret: "cert-manager/cert-manager-webhook-ca"
+webhooks:
+  - name: webhook.cert-manager.io
+    namespaceSelector:
+      matchExpressions:
+      - key: "cert-manager.io/disable-validation"
+        operator: "NotIn"
+        values:
+        - "true"
+      - key: "name"
+        operator: "NotIn"
+        values:
+        - cert-manager
+    rules:
+      - apiGroups:
+          - "cert-manager.io"
+          - "acme.cert-manager.io"
+        apiVersions:
+          - "v1"
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - "*/*"
+    admissionReviewVersions: ["v1"]
+    # This webhook only accepts v1 cert-manager resources.
+    # Equivalent matchPolicy ensures that non-v1 resource requests are sent to
+    # this webhook (after the resources have been converted to v1).
+    matchPolicy: Equivalent
+    timeoutSeconds: 10
+    failurePolicy: Fail
+    sideEffects: None
+    clientConfig:
+      service:
+        name: cert-manager-webhook
+        namespace: "cert-manager"
+        path: /validate
diff --git a/kubernetes/terraform/helm/charts/global/templates/ns.yaml b/kubernetes/terraform/helm/charts/global/templates/ns.yaml
index 34f8cd190..a4740dbfe 100644
--- a/kubernetes/terraform/helm/charts/global/templates/ns.yaml
+++ b/kubernetes/terraform/helm/charts/global/templates/ns.yaml
@@ -2,8 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: pychat
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: cert-manager
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 92713fdb8..0faf89992 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -58,14 +58,7 @@ resource "helm_release" "backend" {
   }
 }
 
-resource "helm_release" "certmanager-definition" {
-  name = "cert-manager-definition"
-  chart = "jetstack/cert-manager"
-  namespace = "cert-manager"
-  version = "1.8.0"
-}
-
-resource "helm_release" "certmanager" {
+resource "helm_release" certmanager {
   name  = "certmanager"
   chart = "${path.module}/charts/certmanager"
   set {
@@ -80,7 +73,7 @@ resource "helm_release" "certmanager" {
     name  = "cf_api_token"
     value = var.cf_api_token
   }
-  depends_on = [helm_release.global, helm_release.certmanager-definition]
+  depends_on = [helm_release.global]
 }
 
 resource "helm_release" "backup" {
@@ -93,8 +86,8 @@ resource "helm_release" "backup" {
     value = var.email
   }
   set {
-    name  = "idr_rsa"
-    value = var.idr_rsa
+    name  = "id_rsa"
+    value = var.id_rsa
   }
   set {
     name  = "id_rsa_pub"
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index d7d5b4772..666d8bdc6 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,7 +1,7 @@
 variable "domain" {}
 variable "email" {}
 variable "github" {}
-variable "idr_rsa" {}
+variable "id_rsa" {}
 variable "id_rsa_pub" {}
 variable "ip_address" {}
 variable "SECRET_KEY" {}
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index 4804739f5..c5fc9345d 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -4,11 +4,11 @@ variable "cloud_flare_api_token" {}
 variable "domain_name" {}
 variable "email" {}
 variable "github" {}
-variable "idr_rsa" {}
+variable "id_rsa" {}
 variable "id_rsa_pub" {}
 variable "ip_address" {}
-variable "kubeconfig" {}
 variable "cf_api_token" {}
+
 module "linode" {
   source                  = "./linode"
   linode_token = var.linode_token
@@ -30,7 +30,7 @@ module "helm" {
   cf_api_token = var.cloud_flare_api_token
   email = var.email
   github = var.github
-  idr_rsa = var.idr_rsa
+  id_rsa = var.id_rsa
   id_rsa_pub = var.id_rsa_pub
   SECRET_KEY = var.SECRET_KEY
   RECAPTCHA_PRIVATE_KEY = var.RECAPTCHA_PRIVATE_KEY

From 79f89d795bb4951e0288462ce2ecb416a89becbc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 27 May 2023 19:21:13 +0300
Subject: [PATCH 180/221] Playing with cert_manager

---
 .excludeMAIN                                  |  1 -
 kubernetes/DockerfileBackup                   |  9 +++++
 kubernetes/backup.sh                          | 36 +++++++++++++++++++
 .../charts/backend/templates/deployment.yaml  |  8 +++++
 .../helm/charts/backend/templates/secret.yaml | 24 ++++++-------
 .../charts/certmanager/templates/secret.yaml  |  2 +-
 .../helm/charts/certmanager/values.yaml       |  2 +-
 .../global/templates/ns-certmanager.yaml      |  4 +++
 .../templates/{ns.yaml => ns-pychat.yaml}     |  0
 kubernetes/terraform/helm/main.tf             | 21 ++++++++---
 kubernetes/terraform/helm/variables.tf        |  2 +-
 kubernetes/terraform/main.tf                  |  4 +--
 kubernetes/terraform/variables.tf             |  2 +-
 13 files changed, 92 insertions(+), 23 deletions(-)
 create mode 100644 kubernetes/DockerfileBackup
 create mode 100644 kubernetes/backup.sh
 create mode 100644 kubernetes/terraform/helm/charts/global/templates/ns-certmanager.yaml
 rename kubernetes/terraform/helm/charts/global/templates/{ns.yaml => ns-pychat.yaml} (100%)

diff --git a/.excludeMAIN b/.excludeMAIN
index 7606e33fc..76fe9db97 100644
--- a/.excludeMAIN
+++ b/.excludeMAIN
@@ -7,7 +7,6 @@ md5
 md5-wasm-example
 test/
 dump.rdb
-backup.sh
 data.sql
 cron-bu
 trash
diff --git a/kubernetes/DockerfileBackup b/kubernetes/DockerfileBackup
new file mode 100644
index 000000000..4b36dd09c
--- /dev/null
+++ b/kubernetes/DockerfileBackup
@@ -0,0 +1,9 @@
+# docker build -f ./kubernetes/DockerfileBackup -t deathangel908/pychat-backup .
+# docker push deathangel908/pychat-backup
+
+FROM alpine:3.15
+
+WORKDIR /src
+
+RUN apk --update add bash git openssh-client mysql-client
+COPY ./backup.sh /src/
diff --git a/kubernetes/backup.sh b/kubernetes/backup.sh
new file mode 100644
index 000000000..0aca6ccdc
--- /dev/null
+++ b/kubernetes/backup.sh
@@ -0,0 +1,36 @@
+WORK='/src/git'
+set -x
+cd "$WORK"
+
+commitNoFail() {
+  if ! git diff-index --quiet HEAD; then
+    git commit -m "periodic refresh at `date`" || exit 1
+  fi
+}
+
+git config --global user.email "deathangel908@gmail.com"
+git config --global user.name "cronjob"
+mkdir ~/.ssh -p
+cp /src/ssh/id_rsa ~/.ssh/id_rsa
+cp /src/ssh/id_rsa.pub ~/.ssh/id_rsa.pub
+chmod 600 ~/.ssh/id_rsa
+chmod 600 ~/.ssh/id_rsa.pub
+ssh-keyscan github.com > ~/.ssh/known_hosts
+if [ ! -d "$WORK/.git" ]; then
+  git init &&
+  git remote add origin $GITHUB_REPO &&
+  git fetch &&
+  git checkout master -f &&
+  git branch --set-upstream-to origin/master || exit 1
+fi
+# --comments=FALSE to avoid dump-time in dump.sql that allows empty-data commit
+git config pull.rebase false
+git pull && \
+mysqldump -u $MYSQL_USER -p$MYSQL_PASSWORD -h $MYSQL_HOST --comments=FALSE $MYSQL_DATABASE > "$WORK/backend/data.sql" && \
+cd "$WORK/backend/photos" && \
+find . -size +25000k  > .gitignore && \
+cd "$WORK" && \
+git add -A && \
+commitNoFail && \
+git push || exit 1
+
diff --git a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
index 06691a426..d9ccde7a5 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
@@ -15,6 +15,14 @@ spec:
       labels:
         app: backend
     spec:
+      initContainers:
+      - name: init-database
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
+        command: ['sh', '/usr/src/backend/download_content.sh', "create_django_tables"]
+        env:
+        - name: BE_DIRECTORY
+          value: /usr/src/backend
       containers:
       - name: backend
         imagePullPolicy: {{ .Values.image.pullPolicy }}
diff --git a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
index 941deb8e8..da43e1930 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
@@ -5,17 +5,17 @@ metadata:
   name: backend-secret
   namespace: pychat
 stringData:
-  MYSQL_PASSWORD: {{ .Values.mysql_password }}
-  MYSQL_USER: {{ .Values.mysql_database_name }}
-  EMAIL_HOST_USER: ''
-  EMAIL_HOST_PASSWORD: ''
+  MYSQL_PASSWORD: "{{ .Values.mysql_password }}"
+  MYSQL_USER: "{{ .Values.mysql_database_name }}"
+  EMAIL_HOST_USER: ""
+  EMAIL_HOST_PASSWORD: ""
   SERVER_EMAIL: "root@{{ .Values.domain }}"
-  SECRET_KEY: {{ .Values.SECRET_KEY }}
-  RECAPTCHA_PRIVATE_KEY: {{ .Values.RECAPTCHA_PRIVATE_KEY }}
-  RECAPTCHA_PUBLIC_KEY: {{ .Values.RECAPTCHA_PUBLIC_KEY }}
-  GOOGLE_OAUTH_2_CLIENT_ID: {{ .Values.GOOGLE_OAUTH_2_CLIENT_ID }}
-  FACEBOOK_ACCESS_TOKEN: {{ .Values.FACEBOOK_ACCESS_TOKEN }}
-  GIPHY_API_KEY: {{ .Values.GIPHY_API_KEY }}
-  FIREBASE_API_KEY: {{ .Values.FIREBASE_API_KEY }}
-  DEFAULT_PROFILE_ID: {{ .Values.DEFAULT_PROFILE_ID }}
+  SECRET_KEY: "{{ .Values.SECRET_KEY }}"
+  RECAPTCHA_PRIVATE_KEY: "{{ .Values.RECAPTCHA_PRIVATE_KEY }}"
+  RECAPTCHA_PUBLIC_KEY: "{{ .Values.RECAPTCHA_PUBLIC_KEY }}"
+  GOOGLE_OAUTH_2_CLIENT_ID: "{{ .Values.GOOGLE_OAUTH_2_CLIENT_ID }}"
+  FACEBOOK_ACCESS_TOKEN: "{{ .Values.FACEBOOK_ACCESS_TOKEN }}"
+  GIPHY_API_KEY: "{{ .Values.GIPHY_API_KEY }}"
+  FIREBASE_API_KEY: "{{ .Values.FIREBASE_API_KEY }}"
+  DEFAULT_PROFILE_ID: "{{ .Values.DEFAULT_PROFILE_ID }}"
 
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
index b29e90016..58a4d67ba 100644
--- a/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
@@ -5,4 +5,4 @@ metadata:
   namespace: pychat
 type: Opaque
 stringData:
-  api-token: {{ .Values.cf_api_token }}
+  api-token: {{ .Values.cloud_flare_api_token }}
diff --git a/kubernetes/terraform/helm/charts/certmanager/values.yaml b/kubernetes/terraform/helm/charts/certmanager/values.yaml
index 6aadddc2f..5567d0c4f 100644
--- a/kubernetes/terraform/helm/charts/certmanager/values.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/values.yaml
@@ -1,3 +1,3 @@
 email: $email
-cf_api_token: $cf_api_token
+cloud_flare_api_token: $cloud_flare_api_token
 domain: $domain
diff --git a/kubernetes/terraform/helm/charts/global/templates/ns-certmanager.yaml b/kubernetes/terraform/helm/charts/global/templates/ns-certmanager.yaml
new file mode 100644
index 000000000..c90416ff4
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/global/templates/ns-certmanager.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
diff --git a/kubernetes/terraform/helm/charts/global/templates/ns.yaml b/kubernetes/terraform/helm/charts/global/templates/ns-pychat.yaml
similarity index 100%
rename from kubernetes/terraform/helm/charts/global/templates/ns.yaml
rename to kubernetes/terraform/helm/charts/global/templates/ns-pychat.yaml
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 0faf89992..163b8c7cb 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -58,6 +58,19 @@ resource "helm_release" "backend" {
   }
 }
 
+resource "helm_release" "certmanager-definition" {
+  name = "cert-manager-definition"
+  chart = "jetstack/cert-manager"
+  namespace = "cert-manager"
+  version = "1.8.0"
+}
+
+resource "time_sleep" "wait_certmanager" {
+  create_duration = "3s"
+
+  depends_on = [helm_release.certmanager-definition]
+}
+
 resource "helm_release" certmanager {
   name  = "certmanager"
   chart = "${path.module}/charts/certmanager"
@@ -70,10 +83,10 @@ resource "helm_release" certmanager {
     value = var.email
   }
   set {
-    name  = "cf_api_token"
-    value = var.cf_api_token
+    name  = "cloud_flare_api_token"
+    value = var.cloud_flare_api_token
   }
-  depends_on = [helm_release.global]
+  depends_on = [helm_release.global, time_sleep.wait_certmanager]
 }
 
 resource "helm_release" "backup" {
@@ -139,7 +152,7 @@ resource "helm_release" "ingress" {
     name  = "external_ip"
     value = var.ip_address
   }
-  depends_on = [helm_release.global]
+  depends_on = [helm_release.global, helm_release.certmanager]
 }
 
 resource "helm_release" "mariadb" {
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 666d8bdc6..a37cc8bb3 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -13,7 +13,7 @@ variable "GIPHY_API_KEY" {}
 variable "FIREBASE_API_KEY" {}
 variable "DEFAULT_PROFILE_ID" {}
 variable "kubeconfig" {}
-variable "cf_api_token" {}
+variable "cloud_flare_api_token" {}
 variable "mysql_password" {
   default = "pypass"
 }
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index c5fc9345d..e4e8f6e2a 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -7,7 +7,7 @@ variable "github" {}
 variable "id_rsa" {}
 variable "id_rsa_pub" {}
 variable "ip_address" {}
-variable "cf_api_token" {}
+variable "cloud_flare_api_token" {}
 
 module "linode" {
   source                  = "./linode"
@@ -27,7 +27,7 @@ module "helm" {
   kubeconfig = module.linode.kubeconfig
   domain = var.domain_name
   ip_address = module.linode.ip_address
-  cf_api_token = var.cloud_flare_api_token
+  cloud_flare_api_token = var.cloud_flare_api_token
   email = var.email
   github = var.github
   id_rsa = var.id_rsa
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index fd4786b4f..4938b7c4a 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -20,5 +20,5 @@ variable "FIREBASE_API_KEY" {
   default = ""
 }
 variable "DEFAULT_PROFILE_ID" {
-  default = 1
+  default = "1"
 }

From a99fca3c9a858135f18a3f43107886f15b7066f6 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 27 May 2023 20:10:25 +0300
Subject: [PATCH 181/221] Fixed frontend

---
 .../charts/backend/templates/deployment.yaml  |    8 -
 .../helm/charts/backend/templates/init.yaml   |   23 +
 .../certmanager/templates/jetstack.yaml       | 5394 -----------------
 .../helm/charts/frontend/values.yaml          |    4 +
 kubernetes/terraform/helm/main.tf             |   19 +-
 5 files changed, 39 insertions(+), 5409 deletions(-)
 create mode 100644 kubernetes/terraform/helm/charts/backend/templates/init.yaml
 delete mode 100644 kubernetes/terraform/helm/charts/certmanager/templates/jetstack.yaml
 create mode 100644 kubernetes/terraform/helm/charts/frontend/values.yaml

diff --git a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
index d9ccde7a5..06691a426 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
@@ -15,14 +15,6 @@ spec:
       labels:
         app: backend
     spec:
-      initContainers:
-      - name: init-database
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
-        command: ['sh', '/usr/src/backend/download_content.sh', "create_django_tables"]
-        env:
-        - name: BE_DIRECTORY
-          value: /usr/src/backend
       containers:
       - name: backend
         imagePullPolicy: {{ .Values.image.pullPolicy }}
diff --git a/kubernetes/terraform/helm/charts/backend/templates/init.yaml b/kubernetes/terraform/helm/charts/backend/templates/init.yaml
new file mode 100644
index 000000000..1f9160aa4
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backend/templates/init.yaml
@@ -0,0 +1,23 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: migrate-backend-job
+  namespace: pychat
+spec:
+  template:
+    spec:
+      containers:
+      - name: migrate-backend
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
+        command: ['/bin/bash', '/usr/src/backend/download_content.sh', "create_django_tables"]
+        env:
+        - name: BE_DIRECTORY
+          value: /usr/src/backend
+        envFrom:
+        - secretRef:
+            name: backend-secret
+        - configMapRef:
+            name: cm-backend
+      restartPolicy: Never
+  backoffLimit: 4
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/jetstack.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/jetstack.yaml
deleted file mode 100644
index 02a8c6def..000000000
--- a/kubernetes/terraform/helm/charts/certmanager/templates/jetstack.yaml
+++ /dev/null
@@ -1,5394 +0,0 @@
-# https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml
-
-# This chart was put here manually since you cannot install it without Certificate and Issuer, readiness prob will fail
-# If you try to install issuer first it will fail since CRD is not installed yet
-# So the only option is to install them together
-
-# Copyright 2021 The cert-manager Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: cert-manager
----
-# Source: cert-manager/templates/crd-templates.yaml
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: certificaterequests.cert-manager.io
-  labels:
-    app: 'cert-manager'
-    app.kubernetes.io/name: 'cert-manager'
-    app.kubernetes.io/instance: 'cert-manager'
-    # Generated labels
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  group: cert-manager.io
-  names:
-    kind: CertificateRequest
-    listKind: CertificateRequestList
-    plural: certificaterequests
-    shortNames:
-      - cr
-      - crs
-    singular: certificaterequest
-    categories:
-      - cert-manager
-  scope: Namespaced
-  versions:
-    - name: v1
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - jsonPath: .status.conditions[?(@.type=="Approved")].status
-          name: Approved
-          type: string
-        - jsonPath: .status.conditions[?(@.type=="Denied")].status
-          name: Denied
-          type: string
-        - jsonPath: .status.conditions[?(@.type=="Ready")].status
-          name: Ready
-          type: string
-        - jsonPath: .spec.issuerRef.name
-          name: Issuer
-          type: string
-        - jsonPath: .spec.username
-          name: Requestor
-          type: string
-        - jsonPath: .status.conditions[?(@.type=="Ready")].message
-          name: Status
-          priority: 1
-          type: string
-        - jsonPath: .metadata.creationTimestamp
-          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
-          name: Age
-          type: date
-      schema:
-        openAPIV3Schema:
-          description: "A CertificateRequest is used to request a signed certificate from one of the configured issuers. \n All fields within the CertificateRequest's `spec` are immutable after creation. A CertificateRequest will either succeed or fail, as denoted by its `status.state` field. \n A CertificateRequest is a one-shot resource, meaning it represents a single point in time request for a certificate and cannot be re-used."
-          type: object
-          required:
-            - spec
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: Desired state of the CertificateRequest resource.
-              type: object
-              required:
-                - issuerRef
-                - request
-              properties:
-                duration:
-                  description: The requested 'duration' (i.e. lifetime) of the Certificate. This option may be ignored/overridden by some issuer types.
-                  type: string
-                extra:
-                  description: Extra contains extra attributes of the user that created the CertificateRequest. Populated by the cert-manager webhook on creation and immutable.
-                  type: object
-                  additionalProperties:
-                    type: array
-                    items:
-                      type: string
-                groups:
-                  description: Groups contains group membership of the user that created the CertificateRequest. Populated by the cert-manager webhook on creation and immutable.
-                  type: array
-                  items:
-                    type: string
-                  x-kubernetes-list-type: atomic
-                isCA:
-                  description: IsCA will request to mark the certificate as valid for certificate signing when submitting to the issuer. This will automatically add the `cert sign` usage to the list of `usages`.
-                  type: boolean
-                issuerRef:
-                  description: IssuerRef is a reference to the issuer for this CertificateRequest.  If the `kind` field is not set, or set to `Issuer`, an Issuer resource with the given name in the same namespace as the CertificateRequest will be used.  If the `kind` field is set to `ClusterIssuer`, a ClusterIssuer with the provided name will be used. The `name` field in this stanza is required at all times. The group field refers to the API group of the issuer which defaults to `cert-manager.io` if empty.
-                  type: object
-                  required:
-                    - name
-                  properties:
-                    group:
-                      description: Group of the resource being referred to.
-                      type: string
-                    kind:
-                      description: Kind of the resource being referred to.
-                      type: string
-                    name:
-                      description: Name of the resource being referred to.
-                      type: string
-                request:
-                  description: The PEM-encoded x509 certificate signing request to be submitted to the CA for signing.
-                  type: string
-                  format: byte
-                uid:
-                  description: UID contains the uid of the user that created the CertificateRequest. Populated by the cert-manager webhook on creation and immutable.
-                  type: string
-                usages:
-                  description: Usages is the set of x509 usages that are requested for the certificate. If usages are set they SHOULD be encoded inside the CSR spec Defaults to `digital signature` and `key encipherment` if not specified.
-                  type: array
-                  items:
-                    description: 'KeyUsage specifies valid usage contexts for keys. See: https://tools.ietf.org/html/rfc5280#section-4.2.1.3      https://tools.ietf.org/html/rfc5280#section-4.2.1.12 Valid KeyUsage values are as follows: "signing", "digital signature", "content commitment", "key encipherment", "key agreement", "data encipherment", "cert sign", "crl sign", "encipher only", "decipher only", "any", "server auth", "client auth", "code signing", "email protection", "s/mime", "ipsec end system", "ipsec tunnel", "ipsec user", "timestamping", "ocsp signing", "microsoft sgc", "netscape sgc"'
-                    type: string
-                    enum:
-                      - signing
-                      - digital signature
-                      - content commitment
-                      - key encipherment
-                      - key agreement
-                      - data encipherment
-                      - cert sign
-                      - crl sign
-                      - encipher only
-                      - decipher only
-                      - any
-                      - server auth
-                      - client auth
-                      - code signing
-                      - email protection
-                      - s/mime
-                      - ipsec end system
-                      - ipsec tunnel
-                      - ipsec user
-                      - timestamping
-                      - ocsp signing
-                      - microsoft sgc
-                      - netscape sgc
-                username:
-                  description: Username contains the name of the user that created the CertificateRequest. Populated by the cert-manager webhook on creation and immutable.
-                  type: string
-            status:
-              description: Status of the CertificateRequest. This is set and managed automatically.
-              type: object
-              properties:
-                ca:
-                  description: The PEM encoded x509 certificate of the signer, also known as the CA (Certificate Authority). This is set on a best-effort basis by different issuers. If not set, the CA is assumed to be unknown/not available.
-                  type: string
-                  format: byte
-                certificate:
-                  description: The PEM encoded x509 certificate resulting from the certificate signing request. If not set, the CertificateRequest has either not been completed or has failed. More information on failure can be found by checking the `conditions` field.
-                  type: string
-                  format: byte
-                conditions:
-                  description: List of status conditions to indicate the status of a CertificateRequest. Known condition types are `Ready` and `InvalidRequest`.
-                  type: array
-                  items:
-                    description: CertificateRequestCondition contains condition information for a CertificateRequest.
-                    type: object
-                    required:
-                      - status
-                      - type
-                    properties:
-                      lastTransitionTime:
-                        description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
-                        type: string
-                        format: date-time
-                      message:
-                        description: Message is a human readable description of the details of the last transition, complementing reason.
-                        type: string
-                      reason:
-                        description: Reason is a brief machine readable explanation for the condition's last transition.
-                        type: string
-                      status:
-                        description: Status of the condition, one of (`True`, `False`, `Unknown`).
-                        type: string
-                        enum:
-                          - "True"
-                          - "False"
-                          - Unknown
-                      type:
-                        description: Type of the condition, known values are (`Ready`, `InvalidRequest`, `Approved`, `Denied`).
-                        type: string
-                  x-kubernetes-list-map-keys:
-                    - type
-                  x-kubernetes-list-type: map
-                failureTime:
-                  description: FailureTime stores the time that this CertificateRequest failed. This is used to influence garbage collection and back-off.
-                  type: string
-                  format: date-time
-      served: true
-      storage: true
----
-# Source: cert-manager/templates/crd-templates.yaml
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: certificates.cert-manager.io
-  labels:
-    app: 'cert-manager'
-    app.kubernetes.io/name: 'cert-manager'
-    app.kubernetes.io/instance: 'cert-manager'
-    # Generated labels
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  group: cert-manager.io
-  names:
-    kind: Certificate
-    listKind: CertificateList
-    plural: certificates
-    shortNames:
-      - cert
-      - certs
-    singular: certificate
-    categories:
-      - cert-manager
-  scope: Namespaced
-  versions:
-    - name: v1
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - jsonPath: .status.conditions[?(@.type=="Ready")].status
-          name: Ready
-          type: string
-        - jsonPath: .spec.secretName
-          name: Secret
-          type: string
-        - jsonPath: .spec.issuerRef.name
-          name: Issuer
-          priority: 1
-          type: string
-        - jsonPath: .status.conditions[?(@.type=="Ready")].message
-          name: Status
-          priority: 1
-          type: string
-        - jsonPath: .metadata.creationTimestamp
-          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
-          name: Age
-          type: date
-      schema:
-        openAPIV3Schema:
-          description: "A Certificate resource should be created to ensure an up to date and signed x509 certificate is stored in the Kubernetes Secret resource named in `spec.secretName`. \n The stored certificate will be renewed before it expires (as configured by `spec.renewBefore`)."
-          type: object
-          required:
-            - spec
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: Desired state of the Certificate resource.
-              type: object
-              required:
-                - issuerRef
-                - secretName
-              properties:
-                additionalOutputFormats:
-                  description: AdditionalOutputFormats defines extra output formats of the private key and signed certificate chain to be written to this Certificate's target Secret. This is an Alpha Feature and is only enabled with the `--feature-gates=AdditionalCertificateOutputFormats=true` option on both the controller and webhook components.
-                  type: array
-                  items:
-                    description: CertificateAdditionalOutputFormat defines an additional output format of a Certificate resource. These contain supplementary data formats of the signed certificate chain and paired private key.
-                    type: object
-                    required:
-                      - type
-                    properties:
-                      type:
-                        description: Type is the name of the format type that should be written to the Certificate's target Secret.
-                        type: string
-                        enum:
-                          - DER
-                          - CombinedPEM
-                commonName:
-                  description: 'CommonName is a common name to be used on the Certificate. The CommonName should have a length of 64 characters or fewer to avoid generating invalid CSRs. This value is ignored by TLS clients when any subject alt name is set. This is x509 behaviour: https://tools.ietf.org/html/rfc6125#section-6.4.4'
-                  type: string
-                dnsNames:
-                  description: DNSNames is a list of DNS subjectAltNames to be set on the Certificate.
-                  type: array
-                  items:
-                    type: string
-                duration:
-                  description: The requested 'duration' (i.e. lifetime) of the Certificate. This option may be ignored/overridden by some issuer types. If unset this defaults to 90 days. Certificate will be renewed either 2/3 through its duration or `renewBefore` period before its expiry, whichever is later. Minimum accepted duration is 1 hour. Value must be in units accepted by Go time.ParseDuration https://golang.org/pkg/time/#ParseDuration
-                  type: string
-                emailAddresses:
-                  description: EmailAddresses is a list of email subjectAltNames to be set on the Certificate.
-                  type: array
-                  items:
-                    type: string
-                encodeUsagesInRequest:
-                  description: EncodeUsagesInRequest controls whether key usages should be present in the CertificateRequest
-                  type: boolean
-                ipAddresses:
-                  description: IPAddresses is a list of IP address subjectAltNames to be set on the Certificate.
-                  type: array
-                  items:
-                    type: string
-                isCA:
-                  description: IsCA will mark this Certificate as valid for certificate signing. This will automatically add the `cert sign` usage to the list of `usages`.
-                  type: boolean
-                issuerRef:
-                  description: IssuerRef is a reference to the issuer for this certificate. If the `kind` field is not set, or set to `Issuer`, an Issuer resource with the given name in the same namespace as the Certificate will be used. If the `kind` field is set to `ClusterIssuer`, a ClusterIssuer with the provided name will be used. The `name` field in this stanza is required at all times.
-                  type: object
-                  required:
-                    - name
-                  properties:
-                    group:
-                      description: Group of the resource being referred to.
-                      type: string
-                    kind:
-                      description: Kind of the resource being referred to.
-                      type: string
-                    name:
-                      description: Name of the resource being referred to.
-                      type: string
-                keystores:
-                  description: Keystores configures additional keystore output formats stored in the `secretName` Secret resource.
-                  type: object
-                  properties:
-                    jks:
-                      description: JKS configures options for storing a JKS keystore in the `spec.secretName` Secret resource.
-                      type: object
-                      required:
-                        - create
-                        - passwordSecretRef
-                      properties:
-                        create:
-                          description: Create enables JKS keystore creation for the Certificate. If true, a file named `keystore.jks` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef`. The keystore file will only be updated upon re-issuance. A file named `truststore.jks` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
-                          type: boolean
-                        passwordSecretRef:
-                          description: PasswordSecretRef is a reference to a key in a Secret resource containing the password used to encrypt the JKS keystore.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            key:
-                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                              type: string
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                    pkcs12:
-                      description: PKCS12 configures options for storing a PKCS12 keystore in the `spec.secretName` Secret resource.
-                      type: object
-                      required:
-                        - create
-                        - passwordSecretRef
-                      properties:
-                        create:
-                          description: Create enables PKCS12 keystore creation for the Certificate. If true, a file named `keystore.p12` will be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef`. The keystore file will only be updated upon re-issuance. A file named `truststore.p12` will also be created in the target Secret resource, encrypted using the password stored in `passwordSecretRef` containing the issuing Certificate Authority
-                          type: boolean
-                        passwordSecretRef:
-                          description: PasswordSecretRef is a reference to a key in a Secret resource containing the password used to encrypt the PKCS12 keystore.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            key:
-                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                              type: string
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                privateKey:
-                  description: Options to control private keys used for the Certificate.
-                  type: object
-                  properties:
-                    algorithm:
-                      description: Algorithm is the private key algorithm of the corresponding private key for this certificate. If provided, allowed values are either `RSA`,`Ed25519` or `ECDSA` If `algorithm` is specified and `size` is not provided, key size of 256 will be used for `ECDSA` key algorithm and key size of 2048 will be used for `RSA` key algorithm. key size is ignored when using the `Ed25519` key algorithm.
-                      type: string
-                      enum:
-                        - RSA
-                        - ECDSA
-                        - Ed25519
-                    encoding:
-                      description: The private key cryptography standards (PKCS) encoding for this certificate's private key to be encoded in. If provided, allowed values are `PKCS1` and `PKCS8` standing for PKCS#1 and PKCS#8, respectively. Defaults to `PKCS1` if not specified.
-                      type: string
-                      enum:
-                        - PKCS1
-                        - PKCS8
-                    rotationPolicy:
-                      description: RotationPolicy controls how private keys should be regenerated when a re-issuance is being processed. If set to Never, a private key will only be generated if one does not already exist in the target `spec.secretName`. If one does exists but it does not have the correct algorithm or size, a warning will be raised to await user intervention. If set to Always, a private key matching the specified requirements will be generated whenever a re-issuance occurs. Default is 'Never' for backward compatibility.
-                      type: string
-                      enum:
-                        - Never
-                        - Always
-                    size:
-                      description: Size is the key bit size of the corresponding private key for this certificate. If `algorithm` is set to `RSA`, valid values are `2048`, `4096` or `8192`, and will default to `2048` if not specified. If `algorithm` is set to `ECDSA`, valid values are `256`, `384` or `521`, and will default to `256` if not specified. If `algorithm` is set to `Ed25519`, Size is ignored. No other values are allowed.
-                      type: integer
-                renewBefore:
-                  description: How long before the currently issued certificate's expiry cert-manager should renew the certificate. The default is 2/3 of the issued certificate's duration. Minimum accepted value is 5 minutes. Value must be in units accepted by Go time.ParseDuration https://golang.org/pkg/time/#ParseDuration
-                  type: string
-                revisionHistoryLimit:
-                  description: revisionHistoryLimit is the maximum number of CertificateRequest revisions that are maintained in the Certificate's history. Each revision represents a single `CertificateRequest` created by this Certificate, either when it was created, renewed, or Spec was changed. Revisions will be removed by oldest first if the number of revisions exceeds this number. If set, revisionHistoryLimit must be a value of `1` or greater. If unset (`nil`), revisions will not be garbage collected. Default value is `nil`.
-                  type: integer
-                  format: int32
-                secretName:
-                  description: SecretName is the name of the secret resource that will be automatically created and managed by this Certificate resource. It will be populated with a private key and certificate, signed by the denoted issuer.
-                  type: string
-                secretTemplate:
-                  description: SecretTemplate defines annotations and labels to be copied to the Certificate's Secret. Labels and annotations on the Secret will be changed as they appear on the SecretTemplate when added or removed. SecretTemplate annotations are added in conjunction with, and cannot overwrite, the base set of annotations cert-manager sets on the Certificate's Secret.
-                  type: object
-                  properties:
-                    annotations:
-                      description: Annotations is a key value map to be copied to the target Kubernetes Secret.
-                      type: object
-                      additionalProperties:
-                        type: string
-                    labels:
-                      description: Labels is a key value map to be copied to the target Kubernetes Secret.
-                      type: object
-                      additionalProperties:
-                        type: string
-                subject:
-                  description: Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).
-                  type: object
-                  properties:
-                    countries:
-                      description: Countries to be used on the Certificate.
-                      type: array
-                      items:
-                        type: string
-                    localities:
-                      description: Cities to be used on the Certificate.
-                      type: array
-                      items:
-                        type: string
-                    organizationalUnits:
-                      description: Organizational Units to be used on the Certificate.
-                      type: array
-                      items:
-                        type: string
-                    organizations:
-                      description: Organizations to be used on the Certificate.
-                      type: array
-                      items:
-                        type: string
-                    postalCodes:
-                      description: Postal codes to be used on the Certificate.
-                      type: array
-                      items:
-                        type: string
-                    provinces:
-                      description: State/Provinces to be used on the Certificate.
-                      type: array
-                      items:
-                        type: string
-                    serialNumber:
-                      description: Serial number to be used on the Certificate.
-                      type: string
-                    streetAddresses:
-                      description: Street addresses to be used on the Certificate.
-                      type: array
-                      items:
-                        type: string
-                uris:
-                  description: URIs is a list of URI subjectAltNames to be set on the Certificate.
-                  type: array
-                  items:
-                    type: string
-                usages:
-                  description: Usages is the set of x509 usages that are requested for the certificate. Defaults to `digital signature` and `key encipherment` if not specified.
-                  type: array
-                  items:
-                    description: 'KeyUsage specifies valid usage contexts for keys. See: https://tools.ietf.org/html/rfc5280#section-4.2.1.3      https://tools.ietf.org/html/rfc5280#section-4.2.1.12 Valid KeyUsage values are as follows: "signing", "digital signature", "content commitment", "key encipherment", "key agreement", "data encipherment", "cert sign", "crl sign", "encipher only", "decipher only", "any", "server auth", "client auth", "code signing", "email protection", "s/mime", "ipsec end system", "ipsec tunnel", "ipsec user", "timestamping", "ocsp signing", "microsoft sgc", "netscape sgc"'
-                    type: string
-                    enum:
-                      - signing
-                      - digital signature
-                      - content commitment
-                      - key encipherment
-                      - key agreement
-                      - data encipherment
-                      - cert sign
-                      - crl sign
-                      - encipher only
-                      - decipher only
-                      - any
-                      - server auth
-                      - client auth
-                      - code signing
-                      - email protection
-                      - s/mime
-                      - ipsec end system
-                      - ipsec tunnel
-                      - ipsec user
-                      - timestamping
-                      - ocsp signing
-                      - microsoft sgc
-                      - netscape sgc
-            status:
-              description: Status of the Certificate. This is set and managed automatically.
-              type: object
-              properties:
-                conditions:
-                  description: List of status conditions to indicate the status of certificates. Known condition types are `Ready` and `Issuing`.
-                  type: array
-                  items:
-                    description: CertificateCondition contains condition information for an Certificate.
-                    type: object
-                    required:
-                      - status
-                      - type
-                    properties:
-                      lastTransitionTime:
-                        description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
-                        type: string
-                        format: date-time
-                      message:
-                        description: Message is a human readable description of the details of the last transition, complementing reason.
-                        type: string
-                      observedGeneration:
-                        description: If set, this represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date with respect to the current state of the Certificate.
-                        type: integer
-                        format: int64
-                      reason:
-                        description: Reason is a brief machine readable explanation for the condition's last transition.
-                        type: string
-                      status:
-                        description: Status of the condition, one of (`True`, `False`, `Unknown`).
-                        type: string
-                        enum:
-                          - "True"
-                          - "False"
-                          - Unknown
-                      type:
-                        description: Type of the condition, known values are (`Ready`, `Issuing`).
-                        type: string
-                  x-kubernetes-list-map-keys:
-                    - type
-                  x-kubernetes-list-type: map
-                failedIssuanceAttempts:
-                  description: The number of continuous failed issuance attempts up till now. This field gets removed (if set) on a successful issuance and gets set to 1 if unset and an issuance has failed. If an issuance has failed, the delay till the next issuance will be calculated using formula time.Hour * 2 ^ (failedIssuanceAttempts - 1).
-                  type: integer
-                lastFailureTime:
-                  description: LastFailureTime is the time as recorded by the Certificate controller of the most recent failure to complete a CertificateRequest for this Certificate resource. If set, cert-manager will not re-request another Certificate until 1 hour has elapsed from this time.
-                  type: string
-                  format: date-time
-                nextPrivateKeySecretName:
-                  description: The name of the Secret resource containing the private key to be used for the next certificate iteration. The keymanager controller will automatically set this field if the `Issuing` condition is set to `True`. It will automatically unset this field when the Issuing condition is not set or False.
-                  type: string
-                notAfter:
-                  description: The expiration time of the certificate stored in the secret named by this resource in `spec.secretName`.
-                  type: string
-                  format: date-time
-                notBefore:
-                  description: The time after which the certificate stored in the secret named by this resource in spec.secretName is valid.
-                  type: string
-                  format: date-time
-                renewalTime:
-                  description: RenewalTime is the time at which the certificate will be next renewed. If not set, no upcoming renewal is scheduled.
-                  type: string
-                  format: date-time
-                revision:
-                  description: "The current 'revision' of the certificate as issued. \n When a CertificateRequest resource is created, it will have the `cert-manager.io/certificate-revision` set to one greater than the current value of this field. \n Upon issuance, this field will be set to the value of the annotation on the CertificateRequest resource used to issue the certificate. \n Persisting the value on the CertificateRequest resource allows the certificates controller to know whether a request is part of an old issuance or if it is part of the ongoing revision's issuance by checking if the revision value in the annotation is greater than this field."
-                  type: integer
-      served: true
-      storage: true
----
-# Source: cert-manager/templates/crd-templates.yaml
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: challenges.acme.cert-manager.io
-  labels:
-    app: 'cert-manager'
-    app.kubernetes.io/name: 'cert-manager'
-    app.kubernetes.io/instance: 'cert-manager'
-    # Generated labels
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  group: acme.cert-manager.io
-  names:
-    kind: Challenge
-    listKind: ChallengeList
-    plural: challenges
-    singular: challenge
-    categories:
-      - cert-manager
-      - cert-manager-acme
-  scope: Namespaced
-  versions:
-    - additionalPrinterColumns:
-        - jsonPath: .status.state
-          name: State
-          type: string
-        - jsonPath: .spec.dnsName
-          name: Domain
-          type: string
-        - jsonPath: .status.reason
-          name: Reason
-          priority: 1
-          type: string
-        - description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
-          jsonPath: .metadata.creationTimestamp
-          name: Age
-          type: date
-      name: v1
-      schema:
-        openAPIV3Schema:
-          description: Challenge is a type to represent a Challenge request with an ACME server
-          type: object
-          required:
-            - metadata
-            - spec
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              type: object
-              required:
-                - authorizationURL
-                - dnsName
-                - issuerRef
-                - key
-                - solver
-                - token
-                - type
-                - url
-              properties:
-                authorizationURL:
-                  description: The URL to the ACME Authorization resource that this challenge is a part of.
-                  type: string
-                dnsName:
-                  description: dnsName is the identifier that this challenge is for, e.g. example.com. If the requested DNSName is a 'wildcard', this field MUST be set to the non-wildcard domain, e.g. for `*.example.com`, it must be `example.com`.
-                  type: string
-                issuerRef:
-                  description: References a properly configured ACME-type Issuer which should be used to create this Challenge. If the Issuer does not exist, processing will be retried. If the Issuer is not an 'ACME' Issuer, an error will be returned and the Challenge will be marked as failed.
-                  type: object
-                  required:
-                    - name
-                  properties:
-                    group:
-                      description: Group of the resource being referred to.
-                      type: string
-                    kind:
-                      description: Kind of the resource being referred to.
-                      type: string
-                    name:
-                      description: Name of the resource being referred to.
-                      type: string
-                key:
-                  description: 'The ACME challenge key for this challenge For HTTP01 challenges, this is the value that must be responded with to complete the HTTP01 challenge in the format: `<private key JWK thumbprint>.<key from acme server for challenge>`. For DNS01 challenges, this is the base64 encoded SHA256 sum of the `<private key JWK thumbprint>.<key from acme server for challenge>` text that must be set as the TXT record content.'
-                  type: string
-                solver:
-                  description: Contains the domain solving configuration that should be used to solve this challenge resource.
-                  type: object
-                  properties:
-                    dns01:
-                      description: Configures cert-manager to attempt to complete authorizations by performing the DNS01 challenge flow.
-                      type: object
-                      properties:
-                        acmeDNS:
-                          description: Use the 'ACME DNS' (https://github.com/joohoi/acme-dns) API to manage DNS01 challenge records.
-                          type: object
-                          required:
-                            - accountSecretRef
-                            - host
-                          properties:
-                            accountSecretRef:
-                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                            host:
-                              type: string
-                        akamai:
-                          description: Use the Akamai DNS zone management API to manage DNS01 challenge records.
-                          type: object
-                          required:
-                            - accessTokenSecretRef
-                            - clientSecretSecretRef
-                            - clientTokenSecretRef
-                            - serviceConsumerDomain
-                          properties:
-                            accessTokenSecretRef:
-                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                            clientSecretSecretRef:
-                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                            clientTokenSecretRef:
-                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                            serviceConsumerDomain:
-                              type: string
-                        azureDNS:
-                          description: Use the Microsoft Azure DNS API to manage DNS01 challenge records.
-                          type: object
-                          required:
-                            - resourceGroupName
-                            - subscriptionID
-                          properties:
-                            clientID:
-                              description: if both this and ClientSecret are left unset MSI will be used
-                              type: string
-                            clientSecretSecretRef:
-                              description: if both this and ClientID are left unset MSI will be used
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                            environment:
-                              description: name of the Azure environment (default AzurePublicCloud)
-                              type: string
-                              enum:
-                                - AzurePublicCloud
-                                - AzureChinaCloud
-                                - AzureGermanCloud
-                                - AzureUSGovernmentCloud
-                            hostedZoneName:
-                              description: name of the DNS zone that should be used
-                              type: string
-                            managedIdentity:
-                              description: managed identity configuration, can not be used at the same time as clientID, clientSecretSecretRef or tenantID
-                              type: object
-                              properties:
-                                clientID:
-                                  description: client ID of the managed identity, can not be used at the same time as resourceID
-                                  type: string
-                                resourceID:
-                                  description: resource ID of the managed identity, can not be used at the same time as clientID
-                                  type: string
-                            resourceGroupName:
-                              description: resource group the DNS zone is located in
-                              type: string
-                            subscriptionID:
-                              description: ID of the Azure subscription
-                              type: string
-                            tenantID:
-                              description: when specifying ClientID and ClientSecret then this field is also needed
-                              type: string
-                        cloudDNS:
-                          description: Use the Google Cloud DNS API to manage DNS01 challenge records.
-                          type: object
-                          required:
-                            - project
-                          properties:
-                            hostedZoneName:
-                              description: HostedZoneName is an optional field that tells cert-manager in which Cloud DNS zone the challenge record has to be created. If left empty cert-manager will automatically choose a zone.
-                              type: string
-                            project:
-                              type: string
-                            serviceAccountSecretRef:
-                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                        cloudflare:
-                          description: Use the Cloudflare API to manage DNS01 challenge records.
-                          type: object
-                          properties:
-                            apiKeySecretRef:
-                              description: 'API key to use to authenticate with Cloudflare. Note: using an API token to authenticate is now the recommended method as it allows greater control of permissions.'
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                            apiTokenSecretRef:
-                              description: API token used to authenticate with Cloudflare.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                            email:
-                              description: Email of the account, only required when using API key based authentication.
-                              type: string
-                        cnameStrategy:
-                          description: CNAMEStrategy configures how the DNS01 provider should handle CNAME records when found in DNS zones.
-                          type: string
-                          enum:
-                            - None
-                            - Follow
-                        digitalocean:
-                          description: Use the DigitalOcean DNS API to manage DNS01 challenge records.
-                          type: object
-                          required:
-                            - tokenSecretRef
-                          properties:
-                            tokenSecretRef:
-                              description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                        rfc2136:
-                          description: Use RFC2136 ("Dynamic Updates in the Domain Name System") (https://datatracker.ietf.org/doc/rfc2136/) to manage DNS01 challenge records.
-                          type: object
-                          required:
-                            - nameserver
-                          properties:
-                            nameserver:
-                              description: The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. This field is required.
-                              type: string
-                            tsigAlgorithm:
-                              description: 'The TSIG Algorithm configured in the DNS supporting RFC2136. Used only when ``tsigSecretSecretRef`` and ``tsigKeyName`` are defined. Supported values are (case-insensitive): ``HMACMD5`` (default), ``HMACSHA1``, ``HMACSHA256`` or ``HMACSHA512``.'
-                              type: string
-                            tsigKeyName:
-                              description: The TSIG Key name configured in the DNS. If ``tsigSecretSecretRef`` is defined, this field is required.
-                              type: string
-                            tsigSecretSecretRef:
-                              description: The name of the secret containing the TSIG value. If ``tsigKeyName`` is defined, this field is required.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                        route53:
-                          description: Use the AWS Route53 API to manage DNS01 challenge records.
-                          type: object
-                          required:
-                            - region
-                          properties:
-                            accessKeyID:
-                              description: 'The AccessKeyID is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials'
-                              type: string
-                            hostedZoneID:
-                              description: If set, the provider will manage only this zone in Route53 and will not do an lookup using the route53:ListHostedZonesByName api call.
-                              type: string
-                            region:
-                              description: Always set the region when using AccessKeyID and SecretAccessKey
-                              type: string
-                            role:
-                              description: Role is a Role ARN which the Route53 provider will assume using either the explicit credentials AccessKeyID/SecretAccessKey or the inferred credentials from environment variables, shared credentials file or AWS Instance metadata
-                              type: string
-                            secretAccessKeySecretRef:
-                              description: The SecretAccessKey is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                        webhook:
-                          description: Configure an external webhook based DNS01 challenge solver to manage DNS01 challenge records.
-                          type: object
-                          required:
-                            - groupName
-                            - solverName
-                          properties:
-                            config:
-                              description: Additional configuration that should be passed to the webhook apiserver when challenges are processed. This can contain arbitrary JSON data. Secret values should not be specified in this stanza. If secret values are needed (e.g. credentials for a DNS service), you should use a SecretKeySelector to reference a Secret resource. For details on the schema of this field, consult the webhook provider implementation's documentation.
-                              x-kubernetes-preserve-unknown-fields: true
-                            groupName:
-                              description: The API group name that should be used when POSTing ChallengePayload resources to the webhook apiserver. This should be the same as the GroupName specified in the webhook provider implementation.
-                              type: string
-                            solverName:
-                              description: The name of the solver to use, as defined in the webhook provider implementation. This will typically be the name of the provider, e.g. 'cloudflare'.
-                              type: string
-                    http01:
-                      description: Configures cert-manager to attempt to complete authorizations by performing the HTTP01 challenge flow. It is not possible to obtain certificates for wildcard domain names (e.g. `*.example.com`) using the HTTP01 challenge mechanism.
-                      type: object
-                      properties:
-                        gatewayHTTPRoute:
-                          description: The Gateway API is a sig-network community API that models service networking in Kubernetes (https://gateway-api.sigs.k8s.io/). The Gateway solver will create HTTPRoutes with the specified labels in the same namespace as the challenge. This solver is experimental, and fields / behaviour may change in the future.
-                          type: object
-                          properties:
-                            labels:
-                              description: Custom labels that will be applied to HTTPRoutes created by cert-manager while solving HTTP-01 challenges.
-                              type: object
-                              additionalProperties:
-                                type: string
-                            parentRefs:
-                              description: 'When solving an HTTP-01 challenge, cert-manager creates an HTTPRoute. cert-manager needs to know which parentRefs should be used when creating the HTTPRoute. Usually, the parentRef references a Gateway. See: https://gateway-api.sigs.k8s.io/v1alpha2/api-types/httproute/#attaching-to-gateways'
-                              type: array
-                              items:
-                                description: "ParentRef identifies an API object (usually a Gateway) that can be considered a parent of this resource (usually a route). The only kind of parent resource with \"Core\" support is Gateway. This API may be extended in the future to support additional kinds of parent resources, such as HTTPRoute. \n The API object must be valid in the cluster; the Group and Kind must be registered in the cluster for this reference to be valid. \n References to objects with invalid Group and Kind are not valid, and must be rejected by the implementation, with appropriate Conditions set on the containing object."
-                                type: object
-                                required:
-                                  - name
-                                properties:
-                                  group:
-                                    description: "Group is the group of the referent. \n Support: Core"
-                                    type: string
-                                    default: gateway.networking.k8s.io
-                                    maxLength: 253
-                                    pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                                  kind:
-                                    description: "Kind is kind of the referent. \n Support: Core (Gateway) Support: Custom (Other Resources)"
-                                    type: string
-                                    default: Gateway
-                                    maxLength: 63
-                                    minLength: 1
-                                    pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
-                                  name:
-                                    description: "Name is the name of the referent. \n Support: Core"
-                                    type: string
-                                    maxLength: 253
-                                    minLength: 1
-                                  namespace:
-                                    description: "Namespace is the namespace of the referent. When unspecified (or empty string), this refers to the local namespace of the Route. \n Support: Core"
-                                    type: string
-                                    maxLength: 63
-                                    minLength: 1
-                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
-                                  sectionName:
-                                    description: "SectionName is the name of a section within the target resource. In the following resources, SectionName is interpreted as the following: \n * Gateway: Listener Name \n Implementations MAY choose to support attaching Routes to other resources. If that is the case, they MUST clearly document how SectionName is interpreted. \n When unspecified (empty string), this will reference the entire resource. For the purpose of status, an attachment is considered successful if at least one section in the parent resource accepts it. For example, Gateway listeners can restrict which Routes can attach to them by Route kind, namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from the referencing Route, the Route MUST be considered successfully attached. If no Gateway listeners accept attachment from this Route, the Route MUST be considered detached from the Gateway. \n Support: Core"
-                                    type: string
-                                    maxLength: 253
-                                    minLength: 1
-                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                            serviceType:
-                              description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
-                              type: string
-                        ingress:
-                          description: The ingress based HTTP01 challenge solver will solve challenges by creating or modifying Ingress resources in order to route requests for '/.well-known/acme-challenge/XYZ' to 'challenge solver' pods that are provisioned by cert-manager for each Challenge to be completed.
-                          type: object
-                          properties:
-                            class:
-                              description: The ingress class to use when creating Ingress resources to solve ACME challenges that use this challenge solver. Only one of 'class' or 'name' may be specified.
-                              type: string
-                            ingressTemplate:
-                              description: Optional ingress template used to configure the ACME challenge solver ingress used for HTTP01 challenges.
-                              type: object
-                              properties:
-                                metadata:
-                                  description: ObjectMeta overrides for the ingress used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
-                                  type: object
-                                  properties:
-                                    annotations:
-                                      description: Annotations that should be added to the created ACME HTTP01 solver ingress.
-                                      type: object
-                                      additionalProperties:
-                                        type: string
-                                    labels:
-                                      description: Labels that should be added to the created ACME HTTP01 solver ingress.
-                                      type: object
-                                      additionalProperties:
-                                        type: string
-                            name:
-                              description: The name of the ingress resource that should have ACME challenge solving routes inserted into it in order to solve HTTP01 challenges. This is typically used in conjunction with ingress controllers like ingress-gce, which maintains a 1:1 mapping between external IPs and ingress resources.
-                              type: string
-                            podTemplate:
-                              description: Optional pod template used to configure the ACME challenge solver pods used for HTTP01 challenges.
-                              type: object
-                              properties:
-                                metadata:
-                                  description: ObjectMeta overrides for the pod used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
-                                  type: object
-                                  properties:
-                                    annotations:
-                                      description: Annotations that should be added to the create ACME HTTP01 solver pods.
-                                      type: object
-                                      additionalProperties:
-                                        type: string
-                                    labels:
-                                      description: Labels that should be added to the created ACME HTTP01 solver pods.
-                                      type: object
-                                      additionalProperties:
-                                        type: string
-                                spec:
-                                  description: PodSpec defines overrides for the HTTP01 challenge solver pod. Only the 'priorityClassName', 'nodeSelector', 'affinity', 'serviceAccountName' and 'tolerations' fields are supported currently. All other fields will be ignored.
-                                  type: object
-                                  properties:
-                                    affinity:
-                                      description: If specified, the pod's scheduling constraints
-                                      type: object
-                                      properties:
-                                        nodeAffinity:
-                                          description: Describes node affinity scheduling rules for the pod.
-                                          type: object
-                                          properties:
-                                            preferredDuringSchedulingIgnoredDuringExecution:
-                                              description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
-                                              type: array
-                                              items:
-                                                description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
-                                                type: object
-                                                required:
-                                                  - preference
-                                                  - weight
-                                                properties:
-                                                  preference:
-                                                    description: A node selector term, associated with the corresponding weight.
-                                                    type: object
-                                                    properties:
-                                                      matchExpressions:
-                                                        description: A list of node selector requirements by node's labels.
-                                                        type: array
-                                                        items:
-                                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                          type: object
-                                                          required:
-                                                            - key
-                                                            - operator
-                                                          properties:
-                                                            key:
-                                                              description: The label key that the selector applies to.
-                                                              type: string
-                                                            operator:
-                                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                              type: string
-                                                            values:
-                                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                      matchFields:
-                                                        description: A list of node selector requirements by node's fields.
-                                                        type: array
-                                                        items:
-                                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                          type: object
-                                                          required:
-                                                            - key
-                                                            - operator
-                                                          properties:
-                                                            key:
-                                                              description: The label key that the selector applies to.
-                                                              type: string
-                                                            operator:
-                                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                              type: string
-                                                            values:
-                                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                  weight:
-                                                    description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
-                                                    type: integer
-                                                    format: int32
-                                            requiredDuringSchedulingIgnoredDuringExecution:
-                                              description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
-                                              type: object
-                                              required:
-                                                - nodeSelectorTerms
-                                              properties:
-                                                nodeSelectorTerms:
-                                                  description: Required. A list of node selector terms. The terms are ORed.
-                                                  type: array
-                                                  items:
-                                                    description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
-                                                    type: object
-                                                    properties:
-                                                      matchExpressions:
-                                                        description: A list of node selector requirements by node's labels.
-                                                        type: array
-                                                        items:
-                                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                          type: object
-                                                          required:
-                                                            - key
-                                                            - operator
-                                                          properties:
-                                                            key:
-                                                              description: The label key that the selector applies to.
-                                                              type: string
-                                                            operator:
-                                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                              type: string
-                                                            values:
-                                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                      matchFields:
-                                                        description: A list of node selector requirements by node's fields.
-                                                        type: array
-                                                        items:
-                                                          description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                          type: object
-                                                          required:
-                                                            - key
-                                                            - operator
-                                                          properties:
-                                                            key:
-                                                              description: The label key that the selector applies to.
-                                                              type: string
-                                                            operator:
-                                                              description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                              type: string
-                                                            values:
-                                                              description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                        podAffinity:
-                                          description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
-                                          type: object
-                                          properties:
-                                            preferredDuringSchedulingIgnoredDuringExecution:
-                                              description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
-                                              type: array
-                                              items:
-                                                description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
-                                                type: object
-                                                required:
-                                                  - podAffinityTerm
-                                                  - weight
-                                                properties:
-                                                  podAffinityTerm:
-                                                    description: Required. A pod affinity term, associated with the corresponding weight.
-                                                    type: object
-                                                    required:
-                                                      - topologyKey
-                                                    properties:
-                                                      labelSelector:
-                                                        description: A label query over a set of resources, in this case pods.
-                                                        type: object
-                                                        properties:
-                                                          matchExpressions:
-                                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                            type: array
-                                                            items:
-                                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                              type: object
-                                                              required:
-                                                                - key
-                                                                - operator
-                                                              properties:
-                                                                key:
-                                                                  description: key is the label key that the selector applies to.
-                                                                  type: string
-                                                                operator:
-                                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                  type: string
-                                                                values:
-                                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                  type: array
-                                                                  items:
-                                                                    type: string
-                                                          matchLabels:
-                                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                            type: object
-                                                            additionalProperties:
-                                                              type: string
-                                                      namespaceSelector:
-                                                        description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                        type: object
-                                                        properties:
-                                                          matchExpressions:
-                                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                            type: array
-                                                            items:
-                                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                              type: object
-                                                              required:
-                                                                - key
-                                                                - operator
-                                                              properties:
-                                                                key:
-                                                                  description: key is the label key that the selector applies to.
-                                                                  type: string
-                                                                operator:
-                                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                  type: string
-                                                                values:
-                                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                  type: array
-                                                                  items:
-                                                                    type: string
-                                                          matchLabels:
-                                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                            type: object
-                                                            additionalProperties:
-                                                              type: string
-                                                      namespaces:
-                                                        description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                        type: array
-                                                        items:
-                                                          type: string
-                                                      topologyKey:
-                                                        description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                        type: string
-                                                  weight:
-                                                    description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
-                                                    type: integer
-                                                    format: int32
-                                            requiredDuringSchedulingIgnoredDuringExecution:
-                                              description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
-                                              type: array
-                                              items:
-                                                description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
-                                                type: object
-                                                required:
-                                                  - topologyKey
-                                                properties:
-                                                  labelSelector:
-                                                    description: A label query over a set of resources, in this case pods.
-                                                    type: object
-                                                    properties:
-                                                      matchExpressions:
-                                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                        type: array
-                                                        items:
-                                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                          type: object
-                                                          required:
-                                                            - key
-                                                            - operator
-                                                          properties:
-                                                            key:
-                                                              description: key is the label key that the selector applies to.
-                                                              type: string
-                                                            operator:
-                                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                              type: string
-                                                            values:
-                                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                      matchLabels:
-                                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                        type: object
-                                                        additionalProperties:
-                                                          type: string
-                                                  namespaceSelector:
-                                                    description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                    type: object
-                                                    properties:
-                                                      matchExpressions:
-                                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                        type: array
-                                                        items:
-                                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                          type: object
-                                                          required:
-                                                            - key
-                                                            - operator
-                                                          properties:
-                                                            key:
-                                                              description: key is the label key that the selector applies to.
-                                                              type: string
-                                                            operator:
-                                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                              type: string
-                                                            values:
-                                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                      matchLabels:
-                                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                        type: object
-                                                        additionalProperties:
-                                                          type: string
-                                                  namespaces:
-                                                    description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                    type: array
-                                                    items:
-                                                      type: string
-                                                  topologyKey:
-                                                    description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                    type: string
-                                        podAntiAffinity:
-                                          description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
-                                          type: object
-                                          properties:
-                                            preferredDuringSchedulingIgnoredDuringExecution:
-                                              description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
-                                              type: array
-                                              items:
-                                                description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
-                                                type: object
-                                                required:
-                                                  - podAffinityTerm
-                                                  - weight
-                                                properties:
-                                                  podAffinityTerm:
-                                                    description: Required. A pod affinity term, associated with the corresponding weight.
-                                                    type: object
-                                                    required:
-                                                      - topologyKey
-                                                    properties:
-                                                      labelSelector:
-                                                        description: A label query over a set of resources, in this case pods.
-                                                        type: object
-                                                        properties:
-                                                          matchExpressions:
-                                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                            type: array
-                                                            items:
-                                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                              type: object
-                                                              required:
-                                                                - key
-                                                                - operator
-                                                              properties:
-                                                                key:
-                                                                  description: key is the label key that the selector applies to.
-                                                                  type: string
-                                                                operator:
-                                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                  type: string
-                                                                values:
-                                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                  type: array
-                                                                  items:
-                                                                    type: string
-                                                          matchLabels:
-                                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                            type: object
-                                                            additionalProperties:
-                                                              type: string
-                                                      namespaceSelector:
-                                                        description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                        type: object
-                                                        properties:
-                                                          matchExpressions:
-                                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                            type: array
-                                                            items:
-                                                              description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                              type: object
-                                                              required:
-                                                                - key
-                                                                - operator
-                                                              properties:
-                                                                key:
-                                                                  description: key is the label key that the selector applies to.
-                                                                  type: string
-                                                                operator:
-                                                                  description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                  type: string
-                                                                values:
-                                                                  description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                  type: array
-                                                                  items:
-                                                                    type: string
-                                                          matchLabels:
-                                                            description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                            type: object
-                                                            additionalProperties:
-                                                              type: string
-                                                      namespaces:
-                                                        description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                        type: array
-                                                        items:
-                                                          type: string
-                                                      topologyKey:
-                                                        description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                        type: string
-                                                  weight:
-                                                    description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
-                                                    type: integer
-                                                    format: int32
-                                            requiredDuringSchedulingIgnoredDuringExecution:
-                                              description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
-                                              type: array
-                                              items:
-                                                description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
-                                                type: object
-                                                required:
-                                                  - topologyKey
-                                                properties:
-                                                  labelSelector:
-                                                    description: A label query over a set of resources, in this case pods.
-                                                    type: object
-                                                    properties:
-                                                      matchExpressions:
-                                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                        type: array
-                                                        items:
-                                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                          type: object
-                                                          required:
-                                                            - key
-                                                            - operator
-                                                          properties:
-                                                            key:
-                                                              description: key is the label key that the selector applies to.
-                                                              type: string
-                                                            operator:
-                                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                              type: string
-                                                            values:
-                                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                      matchLabels:
-                                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                        type: object
-                                                        additionalProperties:
-                                                          type: string
-                                                  namespaceSelector:
-                                                    description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                    type: object
-                                                    properties:
-                                                      matchExpressions:
-                                                        description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                        type: array
-                                                        items:
-                                                          description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                          type: object
-                                                          required:
-                                                            - key
-                                                            - operator
-                                                          properties:
-                                                            key:
-                                                              description: key is the label key that the selector applies to.
-                                                              type: string
-                                                            operator:
-                                                              description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                              type: string
-                                                            values:
-                                                              description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                      matchLabels:
-                                                        description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                        type: object
-                                                        additionalProperties:
-                                                          type: string
-                                                  namespaces:
-                                                    description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                    type: array
-                                                    items:
-                                                      type: string
-                                                  topologyKey:
-                                                    description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                    type: string
-                                    nodeSelector:
-                                      description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
-                                      type: object
-                                      additionalProperties:
-                                        type: string
-                                    priorityClassName:
-                                      description: If specified, the pod's priorityClassName.
-                                      type: string
-                                    serviceAccountName:
-                                      description: If specified, the pod's service account
-                                      type: string
-                                    tolerations:
-                                      description: If specified, the pod's tolerations.
-                                      type: array
-                                      items:
-                                        description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
-                                        type: object
-                                        properties:
-                                          effect:
-                                            description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
-                                            type: string
-                                          key:
-                                            description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
-                                            type: string
-                                          operator:
-                                            description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
-                                            type: string
-                                          tolerationSeconds:
-                                            description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
-                                            type: integer
-                                            format: int64
-                                          value:
-                                            description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
-                                            type: string
-                            serviceType:
-                              description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
-                              type: string
-                    selector:
-                      description: Selector selects a set of DNSNames on the Certificate resource that should be solved using this challenge solver. If not specified, the solver will be treated as the 'default' solver with the lowest priority, i.e. if any other solver has a more specific match, it will be used instead.
-                      type: object
-                      properties:
-                        dnsNames:
-                          description: List of DNSNames that this solver will be used to solve. If specified and a match is found, a dnsNames selector will take precedence over a dnsZones selector. If multiple solvers match with the same dnsNames value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
-                          type: array
-                          items:
-                            type: string
-                        dnsZones:
-                          description: List of DNSZones that this solver will be used to solve. The most specific DNS zone match specified here will take precedence over other DNS zone matches, so a solver specifying sys.example.com will be selected over one specifying example.com for the domain www.sys.example.com. If multiple solvers match with the same dnsZones value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
-                          type: array
-                          items:
-                            type: string
-                        matchLabels:
-                          description: A label selector that is used to refine the set of certificate's that this challenge solver will apply to.
-                          type: object
-                          additionalProperties:
-                            type: string
-                token:
-                  description: The ACME challenge token for this challenge. This is the raw value returned from the ACME server.
-                  type: string
-                type:
-                  description: The type of ACME challenge this resource represents. One of "HTTP-01" or "DNS-01".
-                  type: string
-                  enum:
-                    - HTTP-01
-                    - DNS-01
-                url:
-                  description: The URL of the ACME Challenge resource for this challenge. This can be used to lookup details about the status of this challenge.
-                  type: string
-                wildcard:
-                  description: wildcard will be true if this challenge is for a wildcard identifier, for example '*.example.com'.
-                  type: boolean
-            status:
-              type: object
-              properties:
-                presented:
-                  description: presented will be set to true if the challenge values for this challenge are currently 'presented'. This *does not* imply the self check is passing. Only that the values have been 'submitted' for the appropriate challenge mechanism (i.e. the DNS01 TXT record has been presented, or the HTTP01 configuration has been configured).
-                  type: boolean
-                processing:
-                  description: Used to denote whether this challenge should be processed or not. This field will only be set to true by the 'scheduling' component. It will only be set to false by the 'challenges' controller, after the challenge has reached a final state or timed out. If this field is set to false, the challenge controller will not take any more action.
-                  type: boolean
-                reason:
-                  description: Contains human readable information on why the Challenge is in the current state.
-                  type: string
-                state:
-                  description: Contains the current 'state' of the challenge. If not set, the state of the challenge is unknown.
-                  type: string
-                  enum:
-                    - valid
-                    - ready
-                    - pending
-                    - processing
-                    - invalid
-                    - expired
-                    - errored
-      served: true
-      storage: true
-      subresources:
-        status: {}
----
-# Source: cert-manager/templates/crd-templates.yaml
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: clusterissuers.cert-manager.io
-  labels:
-    app: 'cert-manager'
-    app.kubernetes.io/name: 'cert-manager'
-    app.kubernetes.io/instance: 'cert-manager'
-    # Generated labels
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  group: cert-manager.io
-  names:
-    kind: ClusterIssuer
-    listKind: ClusterIssuerList
-    plural: clusterissuers
-    singular: clusterissuer
-    categories:
-      - cert-manager
-  scope: Cluster
-  versions:
-    - name: v1
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - jsonPath: .status.conditions[?(@.type=="Ready")].status
-          name: Ready
-          type: string
-        - jsonPath: .status.conditions[?(@.type=="Ready")].message
-          name: Status
-          priority: 1
-          type: string
-        - jsonPath: .metadata.creationTimestamp
-          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
-          name: Age
-          type: date
-      schema:
-        openAPIV3Schema:
-          description: A ClusterIssuer represents a certificate issuing authority which can be referenced as part of `issuerRef` fields. It is similar to an Issuer, however it is cluster-scoped and therefore can be referenced by resources that exist in *any* namespace, not just the same namespace as the referent.
-          type: object
-          required:
-            - spec
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: Desired state of the ClusterIssuer resource.
-              type: object
-              properties:
-                acme:
-                  description: ACME configures this issuer to communicate with a RFC8555 (ACME) server to obtain signed x509 certificates.
-                  type: object
-                  required:
-                    - privateKeySecretRef
-                    - server
-                  properties:
-                    disableAccountKeyGeneration:
-                      description: Enables or disables generating a new ACME account key. If true, the Issuer resource will *not* request a new account but will expect the account key to be supplied via an existing secret. If false, the cert-manager system will generate a new ACME account key for the Issuer. Defaults to false.
-                      type: boolean
-                    email:
-                      description: Email is the email address to be associated with the ACME account. This field is optional, but it is strongly recommended to be set. It will be used to contact you in case of issues with your account or certificates, including expiry notification emails. This field may be updated after the account is initially registered.
-                      type: string
-                    enableDurationFeature:
-                      description: Enables requesting a Not After date on certificates that matches the duration of the certificate. This is not supported by all ACME servers like Let's Encrypt. If set to true when the ACME server does not support it it will create an error on the Order. Defaults to false.
-                      type: boolean
-                    externalAccountBinding:
-                      description: ExternalAccountBinding is a reference to a CA external account of the ACME server. If set, upon registration cert-manager will attempt to associate the given external account credentials with the registered ACME account.
-                      type: object
-                      required:
-                        - keyID
-                        - keySecretRef
-                      properties:
-                        keyAlgorithm:
-                          description: 'Deprecated: keyAlgorithm field exists for historical compatibility reasons and should not be used. The algorithm is now hardcoded to HS256 in golang/x/crypto/acme.'
-                          type: string
-                          enum:
-                            - HS256
-                            - HS384
-                            - HS512
-                        keyID:
-                          description: keyID is the ID of the CA key that the External Account is bound to.
-                          type: string
-                        keySecretRef:
-                          description: keySecretRef is a Secret Key Selector referencing a data item in a Kubernetes Secret which holds the symmetric MAC key of the External Account Binding. The `key` is the index string that is paired with the key data in the Secret and should not be confused with the key data itself, or indeed with the External Account Binding keyID above. The secret key stored in the Secret **must** be un-padded, base64 URL encoded data.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            key:
-                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                              type: string
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                    preferredChain:
-                      description: 'PreferredChain is the chain to use if the ACME server outputs multiple. PreferredChain is no guarantee that this one gets delivered by the ACME endpoint. For example, for Let''s Encrypt''s DST crosssign you would use: "DST Root CA X3" or "ISRG Root X1" for the newer Let''s Encrypt root CA. This value picks the first certificate bundle in the ACME alternative chains that has a certificate with this value as its issuer''s CN'
-                      type: string
-                      maxLength: 64
-                    privateKeySecretRef:
-                      description: PrivateKey is the name of a Kubernetes Secret resource that will be used to store the automatically generated ACME account private key. Optionally, a `key` may be specified to select a specific entry within the named Secret resource. If `key` is not specified, a default of `tls.key` will be used.
-                      type: object
-                      required:
-                        - name
-                      properties:
-                        key:
-                          description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                          type: string
-                        name:
-                          description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                          type: string
-                    server:
-                      description: 'Server is the URL used to access the ACME server''s ''directory'' endpoint. For example, for Let''s Encrypt''s staging endpoint, you would use: "https://acme-staging-v02.api.letsencrypt.org/directory". Only ACME v2 endpoints (i.e. RFC 8555) are supported.'
-                      type: string
-                    skipTLSVerify:
-                      description: Enables or disables validation of the ACME server TLS certificate. If true, requests to the ACME server will not have their TLS certificate validated (i.e. insecure connections will be allowed). Only enable this option in development environments. The cert-manager system installed roots will be used to verify connections to the ACME server if this is false. Defaults to false.
-                      type: boolean
-                    solvers:
-                      description: 'Solvers is a list of challenge solvers that will be used to solve ACME challenges for the matching domains. Solver configurations must be provided in order to obtain certificates from an ACME server. For more information, see: https://cert-manager.io/docs/configuration/acme/'
-                      type: array
-                      items:
-                        description: An ACMEChallengeSolver describes how to solve ACME challenges for the issuer it is part of. A selector may be provided to use different solving strategies for different DNS names. Only one of HTTP01 or DNS01 must be provided.
-                        type: object
-                        properties:
-                          dns01:
-                            description: Configures cert-manager to attempt to complete authorizations by performing the DNS01 challenge flow.
-                            type: object
-                            properties:
-                              acmeDNS:
-                                description: Use the 'ACME DNS' (https://github.com/joohoi/acme-dns) API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - accountSecretRef
-                                  - host
-                                properties:
-                                  accountSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  host:
-                                    type: string
-                              akamai:
-                                description: Use the Akamai DNS zone management API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - accessTokenSecretRef
-                                  - clientSecretSecretRef
-                                  - clientTokenSecretRef
-                                  - serviceConsumerDomain
-                                properties:
-                                  accessTokenSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  clientSecretSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  clientTokenSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  serviceConsumerDomain:
-                                    type: string
-                              azureDNS:
-                                description: Use the Microsoft Azure DNS API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - resourceGroupName
-                                  - subscriptionID
-                                properties:
-                                  clientID:
-                                    description: if both this and ClientSecret are left unset MSI will be used
-                                    type: string
-                                  clientSecretSecretRef:
-                                    description: if both this and ClientID are left unset MSI will be used
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  environment:
-                                    description: name of the Azure environment (default AzurePublicCloud)
-                                    type: string
-                                    enum:
-                                      - AzurePublicCloud
-                                      - AzureChinaCloud
-                                      - AzureGermanCloud
-                                      - AzureUSGovernmentCloud
-                                  hostedZoneName:
-                                    description: name of the DNS zone that should be used
-                                    type: string
-                                  managedIdentity:
-                                    description: managed identity configuration, can not be used at the same time as clientID, clientSecretSecretRef or tenantID
-                                    type: object
-                                    properties:
-                                      clientID:
-                                        description: client ID of the managed identity, can not be used at the same time as resourceID
-                                        type: string
-                                      resourceID:
-                                        description: resource ID of the managed identity, can not be used at the same time as clientID
-                                        type: string
-                                  resourceGroupName:
-                                    description: resource group the DNS zone is located in
-                                    type: string
-                                  subscriptionID:
-                                    description: ID of the Azure subscription
-                                    type: string
-                                  tenantID:
-                                    description: when specifying ClientID and ClientSecret then this field is also needed
-                                    type: string
-                              cloudDNS:
-                                description: Use the Google Cloud DNS API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - project
-                                properties:
-                                  hostedZoneName:
-                                    description: HostedZoneName is an optional field that tells cert-manager in which Cloud DNS zone the challenge record has to be created. If left empty cert-manager will automatically choose a zone.
-                                    type: string
-                                  project:
-                                    type: string
-                                  serviceAccountSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                              cloudflare:
-                                description: Use the Cloudflare API to manage DNS01 challenge records.
-                                type: object
-                                properties:
-                                  apiKeySecretRef:
-                                    description: 'API key to use to authenticate with Cloudflare. Note: using an API token to authenticate is now the recommended method as it allows greater control of permissions.'
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  apiTokenSecretRef:
-                                    description: API token used to authenticate with Cloudflare.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  email:
-                                    description: Email of the account, only required when using API key based authentication.
-                                    type: string
-                              cnameStrategy:
-                                description: CNAMEStrategy configures how the DNS01 provider should handle CNAME records when found in DNS zones.
-                                type: string
-                                enum:
-                                  - None
-                                  - Follow
-                              digitalocean:
-                                description: Use the DigitalOcean DNS API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - tokenSecretRef
-                                properties:
-                                  tokenSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                              rfc2136:
-                                description: Use RFC2136 ("Dynamic Updates in the Domain Name System") (https://datatracker.ietf.org/doc/rfc2136/) to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - nameserver
-                                properties:
-                                  nameserver:
-                                    description: The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. This field is required.
-                                    type: string
-                                  tsigAlgorithm:
-                                    description: 'The TSIG Algorithm configured in the DNS supporting RFC2136. Used only when ``tsigSecretSecretRef`` and ``tsigKeyName`` are defined. Supported values are (case-insensitive): ``HMACMD5`` (default), ``HMACSHA1``, ``HMACSHA256`` or ``HMACSHA512``.'
-                                    type: string
-                                  tsigKeyName:
-                                    description: The TSIG Key name configured in the DNS. If ``tsigSecretSecretRef`` is defined, this field is required.
-                                    type: string
-                                  tsigSecretSecretRef:
-                                    description: The name of the secret containing the TSIG value. If ``tsigKeyName`` is defined, this field is required.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                              route53:
-                                description: Use the AWS Route53 API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - region
-                                properties:
-                                  accessKeyID:
-                                    description: 'The AccessKeyID is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials'
-                                    type: string
-                                  hostedZoneID:
-                                    description: If set, the provider will manage only this zone in Route53 and will not do an lookup using the route53:ListHostedZonesByName api call.
-                                    type: string
-                                  region:
-                                    description: Always set the region when using AccessKeyID and SecretAccessKey
-                                    type: string
-                                  role:
-                                    description: Role is a Role ARN which the Route53 provider will assume using either the explicit credentials AccessKeyID/SecretAccessKey or the inferred credentials from environment variables, shared credentials file or AWS Instance metadata
-                                    type: string
-                                  secretAccessKeySecretRef:
-                                    description: The SecretAccessKey is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                              webhook:
-                                description: Configure an external webhook based DNS01 challenge solver to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - groupName
-                                  - solverName
-                                properties:
-                                  config:
-                                    description: Additional configuration that should be passed to the webhook apiserver when challenges are processed. This can contain arbitrary JSON data. Secret values should not be specified in this stanza. If secret values are needed (e.g. credentials for a DNS service), you should use a SecretKeySelector to reference a Secret resource. For details on the schema of this field, consult the webhook provider implementation's documentation.
-                                    x-kubernetes-preserve-unknown-fields: true
-                                  groupName:
-                                    description: The API group name that should be used when POSTing ChallengePayload resources to the webhook apiserver. This should be the same as the GroupName specified in the webhook provider implementation.
-                                    type: string
-                                  solverName:
-                                    description: The name of the solver to use, as defined in the webhook provider implementation. This will typically be the name of the provider, e.g. 'cloudflare'.
-                                    type: string
-                          http01:
-                            description: Configures cert-manager to attempt to complete authorizations by performing the HTTP01 challenge flow. It is not possible to obtain certificates for wildcard domain names (e.g. `*.example.com`) using the HTTP01 challenge mechanism.
-                            type: object
-                            properties:
-                              gatewayHTTPRoute:
-                                description: The Gateway API is a sig-network community API that models service networking in Kubernetes (https://gateway-api.sigs.k8s.io/). The Gateway solver will create HTTPRoutes with the specified labels in the same namespace as the challenge. This solver is experimental, and fields / behaviour may change in the future.
-                                type: object
-                                properties:
-                                  labels:
-                                    description: Custom labels that will be applied to HTTPRoutes created by cert-manager while solving HTTP-01 challenges.
-                                    type: object
-                                    additionalProperties:
-                                      type: string
-                                  parentRefs:
-                                    description: 'When solving an HTTP-01 challenge, cert-manager creates an HTTPRoute. cert-manager needs to know which parentRefs should be used when creating the HTTPRoute. Usually, the parentRef references a Gateway. See: https://gateway-api.sigs.k8s.io/v1alpha2/api-types/httproute/#attaching-to-gateways'
-                                    type: array
-                                    items:
-                                      description: "ParentRef identifies an API object (usually a Gateway) that can be considered a parent of this resource (usually a route). The only kind of parent resource with \"Core\" support is Gateway. This API may be extended in the future to support additional kinds of parent resources, such as HTTPRoute. \n The API object must be valid in the cluster; the Group and Kind must be registered in the cluster for this reference to be valid. \n References to objects with invalid Group and Kind are not valid, and must be rejected by the implementation, with appropriate Conditions set on the containing object."
-                                      type: object
-                                      required:
-                                        - name
-                                      properties:
-                                        group:
-                                          description: "Group is the group of the referent. \n Support: Core"
-                                          type: string
-                                          default: gateway.networking.k8s.io
-                                          maxLength: 253
-                                          pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                                        kind:
-                                          description: "Kind is kind of the referent. \n Support: Core (Gateway) Support: Custom (Other Resources)"
-                                          type: string
-                                          default: Gateway
-                                          maxLength: 63
-                                          minLength: 1
-                                          pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
-                                        name:
-                                          description: "Name is the name of the referent. \n Support: Core"
-                                          type: string
-                                          maxLength: 253
-                                          minLength: 1
-                                        namespace:
-                                          description: "Namespace is the namespace of the referent. When unspecified (or empty string), this refers to the local namespace of the Route. \n Support: Core"
-                                          type: string
-                                          maxLength: 63
-                                          minLength: 1
-                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
-                                        sectionName:
-                                          description: "SectionName is the name of a section within the target resource. In the following resources, SectionName is interpreted as the following: \n * Gateway: Listener Name \n Implementations MAY choose to support attaching Routes to other resources. If that is the case, they MUST clearly document how SectionName is interpreted. \n When unspecified (empty string), this will reference the entire resource. For the purpose of status, an attachment is considered successful if at least one section in the parent resource accepts it. For example, Gateway listeners can restrict which Routes can attach to them by Route kind, namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from the referencing Route, the Route MUST be considered successfully attached. If no Gateway listeners accept attachment from this Route, the Route MUST be considered detached from the Gateway. \n Support: Core"
-                                          type: string
-                                          maxLength: 253
-                                          minLength: 1
-                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                                  serviceType:
-                                    description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
-                                    type: string
-                              ingress:
-                                description: The ingress based HTTP01 challenge solver will solve challenges by creating or modifying Ingress resources in order to route requests for '/.well-known/acme-challenge/XYZ' to 'challenge solver' pods that are provisioned by cert-manager for each Challenge to be completed.
-                                type: object
-                                properties:
-                                  class:
-                                    description: The ingress class to use when creating Ingress resources to solve ACME challenges that use this challenge solver. Only one of 'class' or 'name' may be specified.
-                                    type: string
-                                  ingressTemplate:
-                                    description: Optional ingress template used to configure the ACME challenge solver ingress used for HTTP01 challenges.
-                                    type: object
-                                    properties:
-                                      metadata:
-                                        description: ObjectMeta overrides for the ingress used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
-                                        type: object
-                                        properties:
-                                          annotations:
-                                            description: Annotations that should be added to the created ACME HTTP01 solver ingress.
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                          labels:
-                                            description: Labels that should be added to the created ACME HTTP01 solver ingress.
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                  name:
-                                    description: The name of the ingress resource that should have ACME challenge solving routes inserted into it in order to solve HTTP01 challenges. This is typically used in conjunction with ingress controllers like ingress-gce, which maintains a 1:1 mapping between external IPs and ingress resources.
-                                    type: string
-                                  podTemplate:
-                                    description: Optional pod template used to configure the ACME challenge solver pods used for HTTP01 challenges.
-                                    type: object
-                                    properties:
-                                      metadata:
-                                        description: ObjectMeta overrides for the pod used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
-                                        type: object
-                                        properties:
-                                          annotations:
-                                            description: Annotations that should be added to the create ACME HTTP01 solver pods.
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                          labels:
-                                            description: Labels that should be added to the created ACME HTTP01 solver pods.
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                      spec:
-                                        description: PodSpec defines overrides for the HTTP01 challenge solver pod. Only the 'priorityClassName', 'nodeSelector', 'affinity', 'serviceAccountName' and 'tolerations' fields are supported currently. All other fields will be ignored.
-                                        type: object
-                                        properties:
-                                          affinity:
-                                            description: If specified, the pod's scheduling constraints
-                                            type: object
-                                            properties:
-                                              nodeAffinity:
-                                                description: Describes node affinity scheduling rules for the pod.
-                                                type: object
-                                                properties:
-                                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
-                                                    type: array
-                                                    items:
-                                                      description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
-                                                      type: object
-                                                      required:
-                                                        - preference
-                                                        - weight
-                                                      properties:
-                                                        preference:
-                                                          description: A node selector term, associated with the corresponding weight.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: A list of node selector requirements by node's labels.
-                                                              type: array
-                                                              items:
-                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: The label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                                    type: string
-                                                                  values:
-                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchFields:
-                                                              description: A list of node selector requirements by node's fields.
-                                                              type: array
-                                                              items:
-                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: The label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                                    type: string
-                                                                  values:
-                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                        weight:
-                                                          description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
-                                                          type: integer
-                                                          format: int32
-                                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
-                                                    type: object
-                                                    required:
-                                                      - nodeSelectorTerms
-                                                    properties:
-                                                      nodeSelectorTerms:
-                                                        description: Required. A list of node selector terms. The terms are ORed.
-                                                        type: array
-                                                        items:
-                                                          description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: A list of node selector requirements by node's labels.
-                                                              type: array
-                                                              items:
-                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: The label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                                    type: string
-                                                                  values:
-                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchFields:
-                                                              description: A list of node selector requirements by node's fields.
-                                                              type: array
-                                                              items:
-                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: The label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                                    type: string
-                                                                  values:
-                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                              podAffinity:
-                                                description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
-                                                type: object
-                                                properties:
-                                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
-                                                    type: array
-                                                    items:
-                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
-                                                      type: object
-                                                      required:
-                                                        - podAffinityTerm
-                                                        - weight
-                                                      properties:
-                                                        podAffinityTerm:
-                                                          description: Required. A pod affinity term, associated with the corresponding weight.
-                                                          type: object
-                                                          required:
-                                                            - topologyKey
-                                                          properties:
-                                                            labelSelector:
-                                                              description: A label query over a set of resources, in this case pods.
-                                                              type: object
-                                                              properties:
-                                                                matchExpressions:
-                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                                  type: array
-                                                                  items:
-                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                    type: object
-                                                                    required:
-                                                                      - key
-                                                                      - operator
-                                                                    properties:
-                                                                      key:
-                                                                        description: key is the label key that the selector applies to.
-                                                                        type: string
-                                                                      operator:
-                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                        type: string
-                                                                      values:
-                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                        type: array
-                                                                        items:
-                                                                          type: string
-                                                                matchLabels:
-                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                                  type: object
-                                                                  additionalProperties:
-                                                                    type: string
-                                                            namespaceSelector:
-                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                              type: object
-                                                              properties:
-                                                                matchExpressions:
-                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                                  type: array
-                                                                  items:
-                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                    type: object
-                                                                    required:
-                                                                      - key
-                                                                      - operator
-                                                                    properties:
-                                                                      key:
-                                                                        description: key is the label key that the selector applies to.
-                                                                        type: string
-                                                                      operator:
-                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                        type: string
-                                                                      values:
-                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                        type: array
-                                                                        items:
-                                                                          type: string
-                                                                matchLabels:
-                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                                  type: object
-                                                                  additionalProperties:
-                                                                    type: string
-                                                            namespaces:
-                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                            topologyKey:
-                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                              type: string
-                                                        weight:
-                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
-                                                          type: integer
-                                                          format: int32
-                                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
-                                                    type: array
-                                                    items:
-                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
-                                                      type: object
-                                                      required:
-                                                        - topologyKey
-                                                      properties:
-                                                        labelSelector:
-                                                          description: A label query over a set of resources, in this case pods.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                              type: array
-                                                              items:
-                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: key is the label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                    type: string
-                                                                  values:
-                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchLabels:
-                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                              type: object
-                                                              additionalProperties:
-                                                                type: string
-                                                        namespaceSelector:
-                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                              type: array
-                                                              items:
-                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: key is the label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                    type: string
-                                                                  values:
-                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchLabels:
-                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                              type: object
-                                                              additionalProperties:
-                                                                type: string
-                                                        namespaces:
-                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                          type: array
-                                                          items:
-                                                            type: string
-                                                        topologyKey:
-                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                          type: string
-                                              podAntiAffinity:
-                                                description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
-                                                type: object
-                                                properties:
-                                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
-                                                    type: array
-                                                    items:
-                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
-                                                      type: object
-                                                      required:
-                                                        - podAffinityTerm
-                                                        - weight
-                                                      properties:
-                                                        podAffinityTerm:
-                                                          description: Required. A pod affinity term, associated with the corresponding weight.
-                                                          type: object
-                                                          required:
-                                                            - topologyKey
-                                                          properties:
-                                                            labelSelector:
-                                                              description: A label query over a set of resources, in this case pods.
-                                                              type: object
-                                                              properties:
-                                                                matchExpressions:
-                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                                  type: array
-                                                                  items:
-                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                    type: object
-                                                                    required:
-                                                                      - key
-                                                                      - operator
-                                                                    properties:
-                                                                      key:
-                                                                        description: key is the label key that the selector applies to.
-                                                                        type: string
-                                                                      operator:
-                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                        type: string
-                                                                      values:
-                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                        type: array
-                                                                        items:
-                                                                          type: string
-                                                                matchLabels:
-                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                                  type: object
-                                                                  additionalProperties:
-                                                                    type: string
-                                                            namespaceSelector:
-                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                              type: object
-                                                              properties:
-                                                                matchExpressions:
-                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                                  type: array
-                                                                  items:
-                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                    type: object
-                                                                    required:
-                                                                      - key
-                                                                      - operator
-                                                                    properties:
-                                                                      key:
-                                                                        description: key is the label key that the selector applies to.
-                                                                        type: string
-                                                                      operator:
-                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                        type: string
-                                                                      values:
-                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                        type: array
-                                                                        items:
-                                                                          type: string
-                                                                matchLabels:
-                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                                  type: object
-                                                                  additionalProperties:
-                                                                    type: string
-                                                            namespaces:
-                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                            topologyKey:
-                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                              type: string
-                                                        weight:
-                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
-                                                          type: integer
-                                                          format: int32
-                                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                                    description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
-                                                    type: array
-                                                    items:
-                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
-                                                      type: object
-                                                      required:
-                                                        - topologyKey
-                                                      properties:
-                                                        labelSelector:
-                                                          description: A label query over a set of resources, in this case pods.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                              type: array
-                                                              items:
-                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: key is the label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                    type: string
-                                                                  values:
-                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchLabels:
-                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                              type: object
-                                                              additionalProperties:
-                                                                type: string
-                                                        namespaceSelector:
-                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                              type: array
-                                                              items:
-                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: key is the label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                    type: string
-                                                                  values:
-                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchLabels:
-                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                              type: object
-                                                              additionalProperties:
-                                                                type: string
-                                                        namespaces:
-                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                          type: array
-                                                          items:
-                                                            type: string
-                                                        topologyKey:
-                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                          type: string
-                                          nodeSelector:
-                                            description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                          priorityClassName:
-                                            description: If specified, the pod's priorityClassName.
-                                            type: string
-                                          serviceAccountName:
-                                            description: If specified, the pod's service account
-                                            type: string
-                                          tolerations:
-                                            description: If specified, the pod's tolerations.
-                                            type: array
-                                            items:
-                                              description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
-                                              type: object
-                                              properties:
-                                                effect:
-                                                  description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
-                                                  type: string
-                                                key:
-                                                  description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
-                                                  type: string
-                                                operator:
-                                                  description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
-                                                  type: string
-                                                tolerationSeconds:
-                                                  description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
-                                                  type: integer
-                                                  format: int64
-                                                value:
-                                                  description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
-                                                  type: string
-                                  serviceType:
-                                    description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
-                                    type: string
-                          selector:
-                            description: Selector selects a set of DNSNames on the Certificate resource that should be solved using this challenge solver. If not specified, the solver will be treated as the 'default' solver with the lowest priority, i.e. if any other solver has a more specific match, it will be used instead.
-                            type: object
-                            properties:
-                              dnsNames:
-                                description: List of DNSNames that this solver will be used to solve. If specified and a match is found, a dnsNames selector will take precedence over a dnsZones selector. If multiple solvers match with the same dnsNames value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
-                                type: array
-                                items:
-                                  type: string
-                              dnsZones:
-                                description: List of DNSZones that this solver will be used to solve. The most specific DNS zone match specified here will take precedence over other DNS zone matches, so a solver specifying sys.example.com will be selected over one specifying example.com for the domain www.sys.example.com. If multiple solvers match with the same dnsZones value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
-                                type: array
-                                items:
-                                  type: string
-                              matchLabels:
-                                description: A label selector that is used to refine the set of certificate's that this challenge solver will apply to.
-                                type: object
-                                additionalProperties:
-                                  type: string
-                ca:
-                  description: CA configures this issuer to sign certificates using a signing CA keypair stored in a Secret resource. This is used to build internal PKIs that are managed by cert-manager.
-                  type: object
-                  required:
-                    - secretName
-                  properties:
-                    crlDistributionPoints:
-                      description: The CRL distribution points is an X.509 v3 certificate extension which identifies the location of the CRL from which the revocation of this certificate can be checked. If not set, certificates will be issued without distribution points set.
-                      type: array
-                      items:
-                        type: string
-                    ocspServers:
-                      description: The OCSP server list is an X.509 v3 extension that defines a list of URLs of OCSP responders. The OCSP responders can be queried for the revocation status of an issued certificate. If not set, the certificate will be issued with no OCSP servers set. For example, an OCSP server URL could be "http://ocsp.int-x3.letsencrypt.org".
-                      type: array
-                      items:
-                        type: string
-                    secretName:
-                      description: SecretName is the name of the secret used to sign Certificates issued by this Issuer.
-                      type: string
-                selfSigned:
-                  description: SelfSigned configures this issuer to 'self sign' certificates using the private key used to create the CertificateRequest object.
-                  type: object
-                  properties:
-                    crlDistributionPoints:
-                      description: The CRL distribution points is an X.509 v3 certificate extension which identifies the location of the CRL from which the revocation of this certificate can be checked. If not set certificate will be issued without CDP. Values are strings.
-                      type: array
-                      items:
-                        type: string
-                vault:
-                  description: Vault configures this issuer to sign certificates using a HashiCorp Vault PKI backend.
-                  type: object
-                  required:
-                    - auth
-                    - path
-                    - server
-                  properties:
-                    auth:
-                      description: Auth configures how cert-manager authenticates with the Vault server.
-                      type: object
-                      properties:
-                        appRole:
-                          description: AppRole authenticates with Vault using the App Role auth mechanism, with the role and secret stored in a Kubernetes Secret resource.
-                          type: object
-                          required:
-                            - path
-                            - roleId
-                            - secretRef
-                          properties:
-                            path:
-                              description: 'Path where the App Role authentication backend is mounted in Vault, e.g: "approle"'
-                              type: string
-                            roleId:
-                              description: RoleID configured in the App Role authentication backend when setting up the authentication backend in Vault.
-                              type: string
-                            secretRef:
-                              description: Reference to a key in a Secret that contains the App Role secret used to authenticate with Vault. The `key` field must be specified and denotes which entry within the Secret resource is used as the app role secret.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                        kubernetes:
-                          description: Kubernetes authenticates with Vault by passing the ServiceAccount token stored in the named Secret resource to the Vault server.
-                          type: object
-                          required:
-                            - role
-                            - secretRef
-                          properties:
-                            mountPath:
-                              description: The Vault mountPath here is the mount path to use when authenticating with Vault. For example, setting a value to `/v1/auth/foo`, will use the path `/v1/auth/foo/login` to authenticate with Vault. If unspecified, the default value "/v1/auth/kubernetes" will be used.
-                              type: string
-                            role:
-                              description: A required field containing the Vault Role to assume. A Role binds a Kubernetes ServiceAccount with a set of Vault policies.
-                              type: string
-                            secretRef:
-                              description: The required Secret field containing a Kubernetes ServiceAccount JWT used for authenticating with Vault. Use of 'ambient credentials' is not supported.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                        tokenSecretRef:
-                          description: TokenSecretRef authenticates with Vault by presenting a token.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            key:
-                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                              type: string
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                    caBundle:
-                      description: PEM-encoded CA bundle (base64-encoded) used to validate Vault server certificate. Only used if the Server URL is using HTTPS protocol. This parameter is ignored for plain HTTP protocol connection. If not set the system root certificates are used to validate the TLS connection.
-                      type: string
-                      format: byte
-                    namespace:
-                      description: 'Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows Vault environments to support Secure Multi-tenancy. e.g: "ns1" More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces'
-                      type: string
-                    path:
-                      description: 'Path is the mount path of the Vault PKI backend''s `sign` endpoint, e.g: "my_pki_mount/sign/my-role-name".'
-                      type: string
-                    server:
-                      description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
-                      type: string
-                venafi:
-                  description: Venafi configures this issuer to sign certificates using a Venafi TPP or Venafi Cloud policy zone.
-                  type: object
-                  required:
-                    - zone
-                  properties:
-                    cloud:
-                      description: Cloud specifies the Venafi cloud configuration settings. Only one of TPP or Cloud may be specified.
-                      type: object
-                      required:
-                        - apiTokenSecretRef
-                      properties:
-                        apiTokenSecretRef:
-                          description: APITokenSecretRef is a secret key selector for the Venafi Cloud API token.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            key:
-                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                              type: string
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                        url:
-                          description: URL is the base URL for Venafi Cloud. Defaults to "https://api.venafi.cloud/v1".
-                          type: string
-                    tpp:
-                      description: TPP specifies Trust Protection Platform configuration settings. Only one of TPP or Cloud may be specified.
-                      type: object
-                      required:
-                        - credentialsRef
-                        - url
-                      properties:
-                        caBundle:
-                          description: CABundle is a PEM encoded TLS certificate to use to verify connections to the TPP instance. If specified, system roots will not be used and the issuing CA for the TPP instance must be verifiable using the provided root. If not specified, the connection will be verified using the cert-manager system root certificates.
-                          type: string
-                          format: byte
-                        credentialsRef:
-                          description: CredentialsRef is a reference to a Secret containing the username and password for the TPP server. The secret must contain two keys, 'username' and 'password'.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                        url:
-                          description: 'URL is the base URL for the vedsdk endpoint of the Venafi TPP instance, for example: "https://tpp.example.com/vedsdk".'
-                          type: string
-                    zone:
-                      description: Zone is the Venafi Policy Zone to use for this issuer. All requests made to the Venafi platform will be restricted by the named zone policy. This field is required.
-                      type: string
-            status:
-              description: Status of the ClusterIssuer. This is set and managed automatically.
-              type: object
-              properties:
-                acme:
-                  description: ACME specific status options. This field should only be set if the Issuer is configured to use an ACME server to issue certificates.
-                  type: object
-                  properties:
-                    lastRegisteredEmail:
-                      description: LastRegisteredEmail is the email associated with the latest registered ACME account, in order to track changes made to registered account associated with the  Issuer
-                      type: string
-                    uri:
-                      description: URI is the unique account identifier, which can also be used to retrieve account details from the CA
-                      type: string
-                conditions:
-                  description: List of status conditions to indicate the status of a CertificateRequest. Known condition types are `Ready`.
-                  type: array
-                  items:
-                    description: IssuerCondition contains condition information for an Issuer.
-                    type: object
-                    required:
-                      - status
-                      - type
-                    properties:
-                      lastTransitionTime:
-                        description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
-                        type: string
-                        format: date-time
-                      message:
-                        description: Message is a human readable description of the details of the last transition, complementing reason.
-                        type: string
-                      observedGeneration:
-                        description: If set, this represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date with respect to the current state of the Issuer.
-                        type: integer
-                        format: int64
-                      reason:
-                        description: Reason is a brief machine readable explanation for the condition's last transition.
-                        type: string
-                      status:
-                        description: Status of the condition, one of (`True`, `False`, `Unknown`).
-                        type: string
-                        enum:
-                          - "True"
-                          - "False"
-                          - Unknown
-                      type:
-                        description: Type of the condition, known values are (`Ready`).
-                        type: string
-                  x-kubernetes-list-map-keys:
-                    - type
-                  x-kubernetes-list-type: map
-      served: true
-      storage: true
----
-# Source: cert-manager/templates/crd-templates.yaml
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: issuers.cert-manager.io
-  annotations:
-    cert-manager.io/inject-ca-from-secret: 'cert-manager/cert-manager-webhook-ca'
-  labels:
-    app: 'cert-manager'
-    app.kubernetes.io/name: 'cert-manager'
-    app.kubernetes.io/instance: 'cert-manager'
-    # Generated labels
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  group: cert-manager.io
-  names:
-    kind: Issuer
-    listKind: IssuerList
-    plural: issuers
-    singular: issuer
-    categories:
-      - cert-manager
-  scope: Namespaced
-  versions:
-    - name: v1
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - jsonPath: .status.conditions[?(@.type=="Ready")].status
-          name: Ready
-          type: string
-        - jsonPath: .status.conditions[?(@.type=="Ready")].message
-          name: Status
-          priority: 1
-          type: string
-        - jsonPath: .metadata.creationTimestamp
-          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
-          name: Age
-          type: date
-      schema:
-        openAPIV3Schema:
-          description: An Issuer represents a certificate issuing authority which can be referenced as part of `issuerRef` fields. It is scoped to a single namespace and can therefore only be referenced by resources within the same namespace.
-          type: object
-          required:
-            - spec
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: Desired state of the Issuer resource.
-              type: object
-              properties:
-                acme:
-                  description: ACME configures this issuer to communicate with a RFC8555 (ACME) server to obtain signed x509 certificates.
-                  type: object
-                  required:
-                    - privateKeySecretRef
-                    - server
-                  properties:
-                    disableAccountKeyGeneration:
-                      description: Enables or disables generating a new ACME account key. If true, the Issuer resource will *not* request a new account but will expect the account key to be supplied via an existing secret. If false, the cert-manager system will generate a new ACME account key for the Issuer. Defaults to false.
-                      type: boolean
-                    email:
-                      description: Email is the email address to be associated with the ACME account. This field is optional, but it is strongly recommended to be set. It will be used to contact you in case of issues with your account or certificates, including expiry notification emails. This field may be updated after the account is initially registered.
-                      type: string
-                    enableDurationFeature:
-                      description: Enables requesting a Not After date on certificates that matches the duration of the certificate. This is not supported by all ACME servers like Let's Encrypt. If set to true when the ACME server does not support it it will create an error on the Order. Defaults to false.
-                      type: boolean
-                    externalAccountBinding:
-                      description: ExternalAccountBinding is a reference to a CA external account of the ACME server. If set, upon registration cert-manager will attempt to associate the given external account credentials with the registered ACME account.
-                      type: object
-                      required:
-                        - keyID
-                        - keySecretRef
-                      properties:
-                        keyAlgorithm:
-                          description: 'Deprecated: keyAlgorithm field exists for historical compatibility reasons and should not be used. The algorithm is now hardcoded to HS256 in golang/x/crypto/acme.'
-                          type: string
-                          enum:
-                            - HS256
-                            - HS384
-                            - HS512
-                        keyID:
-                          description: keyID is the ID of the CA key that the External Account is bound to.
-                          type: string
-                        keySecretRef:
-                          description: keySecretRef is a Secret Key Selector referencing a data item in a Kubernetes Secret which holds the symmetric MAC key of the External Account Binding. The `key` is the index string that is paired with the key data in the Secret and should not be confused with the key data itself, or indeed with the External Account Binding keyID above. The secret key stored in the Secret **must** be un-padded, base64 URL encoded data.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            key:
-                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                              type: string
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                    preferredChain:
-                      description: 'PreferredChain is the chain to use if the ACME server outputs multiple. PreferredChain is no guarantee that this one gets delivered by the ACME endpoint. For example, for Let''s Encrypt''s DST crosssign you would use: "DST Root CA X3" or "ISRG Root X1" for the newer Let''s Encrypt root CA. This value picks the first certificate bundle in the ACME alternative chains that has a certificate with this value as its issuer''s CN'
-                      type: string
-                      maxLength: 64
-                    privateKeySecretRef:
-                      description: PrivateKey is the name of a Kubernetes Secret resource that will be used to store the automatically generated ACME account private key. Optionally, a `key` may be specified to select a specific entry within the named Secret resource. If `key` is not specified, a default of `tls.key` will be used.
-                      type: object
-                      required:
-                        - name
-                      properties:
-                        key:
-                          description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                          type: string
-                        name:
-                          description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                          type: string
-                    server:
-                      description: 'Server is the URL used to access the ACME server''s ''directory'' endpoint. For example, for Let''s Encrypt''s staging endpoint, you would use: "https://acme-staging-v02.api.letsencrypt.org/directory". Only ACME v2 endpoints (i.e. RFC 8555) are supported.'
-                      type: string
-                    skipTLSVerify:
-                      description: Enables or disables validation of the ACME server TLS certificate. If true, requests to the ACME server will not have their TLS certificate validated (i.e. insecure connections will be allowed). Only enable this option in development environments. The cert-manager system installed roots will be used to verify connections to the ACME server if this is false. Defaults to false.
-                      type: boolean
-                    solvers:
-                      description: 'Solvers is a list of challenge solvers that will be used to solve ACME challenges for the matching domains. Solver configurations must be provided in order to obtain certificates from an ACME server. For more information, see: https://cert-manager.io/docs/configuration/acme/'
-                      type: array
-                      items:
-                        description: An ACMEChallengeSolver describes how to solve ACME challenges for the issuer it is part of. A selector may be provided to use different solving strategies for different DNS names. Only one of HTTP01 or DNS01 must be provided.
-                        type: object
-                        properties:
-                          dns01:
-                            description: Configures cert-manager to attempt to complete authorizations by performing the DNS01 challenge flow.
-                            type: object
-                            properties:
-                              acmeDNS:
-                                description: Use the 'ACME DNS' (https://github.com/joohoi/acme-dns) API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - accountSecretRef
-                                  - host
-                                properties:
-                                  accountSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  host:
-                                    type: string
-                              akamai:
-                                description: Use the Akamai DNS zone management API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - accessTokenSecretRef
-                                  - clientSecretSecretRef
-                                  - clientTokenSecretRef
-                                  - serviceConsumerDomain
-                                properties:
-                                  accessTokenSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  clientSecretSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  clientTokenSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  serviceConsumerDomain:
-                                    type: string
-                              azureDNS:
-                                description: Use the Microsoft Azure DNS API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - resourceGroupName
-                                  - subscriptionID
-                                properties:
-                                  clientID:
-                                    description: if both this and ClientSecret are left unset MSI will be used
-                                    type: string
-                                  clientSecretSecretRef:
-                                    description: if both this and ClientID are left unset MSI will be used
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  environment:
-                                    description: name of the Azure environment (default AzurePublicCloud)
-                                    type: string
-                                    enum:
-                                      - AzurePublicCloud
-                                      - AzureChinaCloud
-                                      - AzureGermanCloud
-                                      - AzureUSGovernmentCloud
-                                  hostedZoneName:
-                                    description: name of the DNS zone that should be used
-                                    type: string
-                                  managedIdentity:
-                                    description: managed identity configuration, can not be used at the same time as clientID, clientSecretSecretRef or tenantID
-                                    type: object
-                                    properties:
-                                      clientID:
-                                        description: client ID of the managed identity, can not be used at the same time as resourceID
-                                        type: string
-                                      resourceID:
-                                        description: resource ID of the managed identity, can not be used at the same time as clientID
-                                        type: string
-                                  resourceGroupName:
-                                    description: resource group the DNS zone is located in
-                                    type: string
-                                  subscriptionID:
-                                    description: ID of the Azure subscription
-                                    type: string
-                                  tenantID:
-                                    description: when specifying ClientID and ClientSecret then this field is also needed
-                                    type: string
-                              cloudDNS:
-                                description: Use the Google Cloud DNS API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - project
-                                properties:
-                                  hostedZoneName:
-                                    description: HostedZoneName is an optional field that tells cert-manager in which Cloud DNS zone the challenge record has to be created. If left empty cert-manager will automatically choose a zone.
-                                    type: string
-                                  project:
-                                    type: string
-                                  serviceAccountSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                              cloudflare:
-                                description: Use the Cloudflare API to manage DNS01 challenge records.
-                                type: object
-                                properties:
-                                  apiKeySecretRef:
-                                    description: 'API key to use to authenticate with Cloudflare. Note: using an API token to authenticate is now the recommended method as it allows greater control of permissions.'
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  apiTokenSecretRef:
-                                    description: API token used to authenticate with Cloudflare.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                                  email:
-                                    description: Email of the account, only required when using API key based authentication.
-                                    type: string
-                              cnameStrategy:
-                                description: CNAMEStrategy configures how the DNS01 provider should handle CNAME records when found in DNS zones.
-                                type: string
-                                enum:
-                                  - None
-                                  - Follow
-                              digitalocean:
-                                description: Use the DigitalOcean DNS API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - tokenSecretRef
-                                properties:
-                                  tokenSecretRef:
-                                    description: A reference to a specific 'key' within a Secret resource. In some instances, `key` is a required field.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                              rfc2136:
-                                description: Use RFC2136 ("Dynamic Updates in the Domain Name System") (https://datatracker.ietf.org/doc/rfc2136/) to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - nameserver
-                                properties:
-                                  nameserver:
-                                    description: The IP address or hostname of an authoritative DNS server supporting RFC2136 in the form host:port. If the host is an IPv6 address it must be enclosed in square brackets (e.g [2001:db8::1]) ; port is optional. This field is required.
-                                    type: string
-                                  tsigAlgorithm:
-                                    description: 'The TSIG Algorithm configured in the DNS supporting RFC2136. Used only when ``tsigSecretSecretRef`` and ``tsigKeyName`` are defined. Supported values are (case-insensitive): ``HMACMD5`` (default), ``HMACSHA1``, ``HMACSHA256`` or ``HMACSHA512``.'
-                                    type: string
-                                  tsigKeyName:
-                                    description: The TSIG Key name configured in the DNS. If ``tsigSecretSecretRef`` is defined, this field is required.
-                                    type: string
-                                  tsigSecretSecretRef:
-                                    description: The name of the secret containing the TSIG value. If ``tsigKeyName`` is defined, this field is required.
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                              route53:
-                                description: Use the AWS Route53 API to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - region
-                                properties:
-                                  accessKeyID:
-                                    description: 'The AccessKeyID is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata see: https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials'
-                                    type: string
-                                  hostedZoneID:
-                                    description: If set, the provider will manage only this zone in Route53 and will not do an lookup using the route53:ListHostedZonesByName api call.
-                                    type: string
-                                  region:
-                                    description: Always set the region when using AccessKeyID and SecretAccessKey
-                                    type: string
-                                  role:
-                                    description: Role is a Role ARN which the Route53 provider will assume using either the explicit credentials AccessKeyID/SecretAccessKey or the inferred credentials from environment variables, shared credentials file or AWS Instance metadata
-                                    type: string
-                                  secretAccessKeySecretRef:
-                                    description: The SecretAccessKey is used for authentication. If not set we fall-back to using env vars, shared credentials file or AWS Instance metadata https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-credentials
-                                    type: object
-                                    required:
-                                      - name
-                                    properties:
-                                      key:
-                                        description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                        type: string
-                                      name:
-                                        description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                        type: string
-                              webhook:
-                                description: Configure an external webhook based DNS01 challenge solver to manage DNS01 challenge records.
-                                type: object
-                                required:
-                                  - groupName
-                                  - solverName
-                                properties:
-                                  config:
-                                    description: Additional configuration that should be passed to the webhook apiserver when challenges are processed. This can contain arbitrary JSON data. Secret values should not be specified in this stanza. If secret values are needed (e.g. credentials for a DNS service), you should use a SecretKeySelector to reference a Secret resource. For details on the schema of this field, consult the webhook provider implementation's documentation.
-                                    x-kubernetes-preserve-unknown-fields: true
-                                  groupName:
-                                    description: The API group name that should be used when POSTing ChallengePayload resources to the webhook apiserver. This should be the same as the GroupName specified in the webhook provider implementation.
-                                    type: string
-                                  solverName:
-                                    description: The name of the solver to use, as defined in the webhook provider implementation. This will typically be the name of the provider, e.g. 'cloudflare'.
-                                    type: string
-                          http01:
-                            description: Configures cert-manager to attempt to complete authorizations by performing the HTTP01 challenge flow. It is not possible to obtain certificates for wildcard domain names (e.g. `*.example.com`) using the HTTP01 challenge mechanism.
-                            type: object
-                            properties:
-                              gatewayHTTPRoute:
-                                description: The Gateway API is a sig-network community API that models service networking in Kubernetes (https://gateway-api.sigs.k8s.io/). The Gateway solver will create HTTPRoutes with the specified labels in the same namespace as the challenge. This solver is experimental, and fields / behaviour may change in the future.
-                                type: object
-                                properties:
-                                  labels:
-                                    description: Custom labels that will be applied to HTTPRoutes created by cert-manager while solving HTTP-01 challenges.
-                                    type: object
-                                    additionalProperties:
-                                      type: string
-                                  parentRefs:
-                                    description: 'When solving an HTTP-01 challenge, cert-manager creates an HTTPRoute. cert-manager needs to know which parentRefs should be used when creating the HTTPRoute. Usually, the parentRef references a Gateway. See: https://gateway-api.sigs.k8s.io/v1alpha2/api-types/httproute/#attaching-to-gateways'
-                                    type: array
-                                    items:
-                                      description: "ParentRef identifies an API object (usually a Gateway) that can be considered a parent of this resource (usually a route). The only kind of parent resource with \"Core\" support is Gateway. This API may be extended in the future to support additional kinds of parent resources, such as HTTPRoute. \n The API object must be valid in the cluster; the Group and Kind must be registered in the cluster for this reference to be valid. \n References to objects with invalid Group and Kind are not valid, and must be rejected by the implementation, with appropriate Conditions set on the containing object."
-                                      type: object
-                                      required:
-                                        - name
-                                      properties:
-                                        group:
-                                          description: "Group is the group of the referent. \n Support: Core"
-                                          type: string
-                                          default: gateway.networking.k8s.io
-                                          maxLength: 253
-                                          pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                                        kind:
-                                          description: "Kind is kind of the referent. \n Support: Core (Gateway) Support: Custom (Other Resources)"
-                                          type: string
-                                          default: Gateway
-                                          maxLength: 63
-                                          minLength: 1
-                                          pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
-                                        name:
-                                          description: "Name is the name of the referent. \n Support: Core"
-                                          type: string
-                                          maxLength: 253
-                                          minLength: 1
-                                        namespace:
-                                          description: "Namespace is the namespace of the referent. When unspecified (or empty string), this refers to the local namespace of the Route. \n Support: Core"
-                                          type: string
-                                          maxLength: 63
-                                          minLength: 1
-                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
-                                        sectionName:
-                                          description: "SectionName is the name of a section within the target resource. In the following resources, SectionName is interpreted as the following: \n * Gateway: Listener Name \n Implementations MAY choose to support attaching Routes to other resources. If that is the case, they MUST clearly document how SectionName is interpreted. \n When unspecified (empty string), this will reference the entire resource. For the purpose of status, an attachment is considered successful if at least one section in the parent resource accepts it. For example, Gateway listeners can restrict which Routes can attach to them by Route kind, namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from the referencing Route, the Route MUST be considered successfully attached. If no Gateway listeners accept attachment from this Route, the Route MUST be considered detached from the Gateway. \n Support: Core"
-                                          type: string
-                                          maxLength: 253
-                                          minLength: 1
-                                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                                  serviceType:
-                                    description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
-                                    type: string
-                              ingress:
-                                description: The ingress based HTTP01 challenge solver will solve challenges by creating or modifying Ingress resources in order to route requests for '/.well-known/acme-challenge/XYZ' to 'challenge solver' pods that are provisioned by cert-manager for each Challenge to be completed.
-                                type: object
-                                properties:
-                                  class:
-                                    description: The ingress class to use when creating Ingress resources to solve ACME challenges that use this challenge solver. Only one of 'class' or 'name' may be specified.
-                                    type: string
-                                  ingressTemplate:
-                                    description: Optional ingress template used to configure the ACME challenge solver ingress used for HTTP01 challenges.
-                                    type: object
-                                    properties:
-                                      metadata:
-                                        description: ObjectMeta overrides for the ingress used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
-                                        type: object
-                                        properties:
-                                          annotations:
-                                            description: Annotations that should be added to the created ACME HTTP01 solver ingress.
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                          labels:
-                                            description: Labels that should be added to the created ACME HTTP01 solver ingress.
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                  name:
-                                    description: The name of the ingress resource that should have ACME challenge solving routes inserted into it in order to solve HTTP01 challenges. This is typically used in conjunction with ingress controllers like ingress-gce, which maintains a 1:1 mapping between external IPs and ingress resources.
-                                    type: string
-                                  podTemplate:
-                                    description: Optional pod template used to configure the ACME challenge solver pods used for HTTP01 challenges.
-                                    type: object
-                                    properties:
-                                      metadata:
-                                        description: ObjectMeta overrides for the pod used to solve HTTP01 challenges. Only the 'labels' and 'annotations' fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.
-                                        type: object
-                                        properties:
-                                          annotations:
-                                            description: Annotations that should be added to the create ACME HTTP01 solver pods.
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                          labels:
-                                            description: Labels that should be added to the created ACME HTTP01 solver pods.
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                      spec:
-                                        description: PodSpec defines overrides for the HTTP01 challenge solver pod. Only the 'priorityClassName', 'nodeSelector', 'affinity', 'serviceAccountName' and 'tolerations' fields are supported currently. All other fields will be ignored.
-                                        type: object
-                                        properties:
-                                          affinity:
-                                            description: If specified, the pod's scheduling constraints
-                                            type: object
-                                            properties:
-                                              nodeAffinity:
-                                                description: Describes node affinity scheduling rules for the pod.
-                                                type: object
-                                                properties:
-                                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
-                                                    type: array
-                                                    items:
-                                                      description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
-                                                      type: object
-                                                      required:
-                                                        - preference
-                                                        - weight
-                                                      properties:
-                                                        preference:
-                                                          description: A node selector term, associated with the corresponding weight.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: A list of node selector requirements by node's labels.
-                                                              type: array
-                                                              items:
-                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: The label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                                    type: string
-                                                                  values:
-                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchFields:
-                                                              description: A list of node selector requirements by node's fields.
-                                                              type: array
-                                                              items:
-                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: The label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                                    type: string
-                                                                  values:
-                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                        weight:
-                                                          description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
-                                                          type: integer
-                                                          format: int32
-                                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
-                                                    type: object
-                                                    required:
-                                                      - nodeSelectorTerms
-                                                    properties:
-                                                      nodeSelectorTerms:
-                                                        description: Required. A list of node selector terms. The terms are ORed.
-                                                        type: array
-                                                        items:
-                                                          description: A null or empty node selector term matches no objects. The requirements of them are ANDed. The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: A list of node selector requirements by node's labels.
-                                                              type: array
-                                                              items:
-                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: The label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                                    type: string
-                                                                  values:
-                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchFields:
-                                                              description: A list of node selector requirements by node's fields.
-                                                              type: array
-                                                              items:
-                                                                description: A node selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: The label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: Represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
-                                                                    type: string
-                                                                  values:
-                                                                    description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. If the operator is Gt or Lt, the values array must have a single element, which will be interpreted as an integer. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                              podAffinity:
-                                                description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
-                                                type: object
-                                                properties:
-                                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
-                                                    type: array
-                                                    items:
-                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
-                                                      type: object
-                                                      required:
-                                                        - podAffinityTerm
-                                                        - weight
-                                                      properties:
-                                                        podAffinityTerm:
-                                                          description: Required. A pod affinity term, associated with the corresponding weight.
-                                                          type: object
-                                                          required:
-                                                            - topologyKey
-                                                          properties:
-                                                            labelSelector:
-                                                              description: A label query over a set of resources, in this case pods.
-                                                              type: object
-                                                              properties:
-                                                                matchExpressions:
-                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                                  type: array
-                                                                  items:
-                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                    type: object
-                                                                    required:
-                                                                      - key
-                                                                      - operator
-                                                                    properties:
-                                                                      key:
-                                                                        description: key is the label key that the selector applies to.
-                                                                        type: string
-                                                                      operator:
-                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                        type: string
-                                                                      values:
-                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                        type: array
-                                                                        items:
-                                                                          type: string
-                                                                matchLabels:
-                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                                  type: object
-                                                                  additionalProperties:
-                                                                    type: string
-                                                            namespaceSelector:
-                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                              type: object
-                                                              properties:
-                                                                matchExpressions:
-                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                                  type: array
-                                                                  items:
-                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                    type: object
-                                                                    required:
-                                                                      - key
-                                                                      - operator
-                                                                    properties:
-                                                                      key:
-                                                                        description: key is the label key that the selector applies to.
-                                                                        type: string
-                                                                      operator:
-                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                        type: string
-                                                                      values:
-                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                        type: array
-                                                                        items:
-                                                                          type: string
-                                                                matchLabels:
-                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                                  type: object
-                                                                  additionalProperties:
-                                                                    type: string
-                                                            namespaces:
-                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                            topologyKey:
-                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                              type: string
-                                                        weight:
-                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
-                                                          type: integer
-                                                          format: int32
-                                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                                    description: If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
-                                                    type: array
-                                                    items:
-                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
-                                                      type: object
-                                                      required:
-                                                        - topologyKey
-                                                      properties:
-                                                        labelSelector:
-                                                          description: A label query over a set of resources, in this case pods.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                              type: array
-                                                              items:
-                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: key is the label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                    type: string
-                                                                  values:
-                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchLabels:
-                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                              type: object
-                                                              additionalProperties:
-                                                                type: string
-                                                        namespaceSelector:
-                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                              type: array
-                                                              items:
-                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: key is the label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                    type: string
-                                                                  values:
-                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchLabels:
-                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                              type: object
-                                                              additionalProperties:
-                                                                type: string
-                                                        namespaces:
-                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                          type: array
-                                                          items:
-                                                            type: string
-                                                        topologyKey:
-                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                          type: string
-                                              podAntiAffinity:
-                                                description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
-                                                type: object
-                                                properties:
-                                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                                    description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
-                                                    type: array
-                                                    items:
-                                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
-                                                      type: object
-                                                      required:
-                                                        - podAffinityTerm
-                                                        - weight
-                                                      properties:
-                                                        podAffinityTerm:
-                                                          description: Required. A pod affinity term, associated with the corresponding weight.
-                                                          type: object
-                                                          required:
-                                                            - topologyKey
-                                                          properties:
-                                                            labelSelector:
-                                                              description: A label query over a set of resources, in this case pods.
-                                                              type: object
-                                                              properties:
-                                                                matchExpressions:
-                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                                  type: array
-                                                                  items:
-                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                    type: object
-                                                                    required:
-                                                                      - key
-                                                                      - operator
-                                                                    properties:
-                                                                      key:
-                                                                        description: key is the label key that the selector applies to.
-                                                                        type: string
-                                                                      operator:
-                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                        type: string
-                                                                      values:
-                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                        type: array
-                                                                        items:
-                                                                          type: string
-                                                                matchLabels:
-                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                                  type: object
-                                                                  additionalProperties:
-                                                                    type: string
-                                                            namespaceSelector:
-                                                              description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                              type: object
-                                                              properties:
-                                                                matchExpressions:
-                                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                                  type: array
-                                                                  items:
-                                                                    description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                    type: object
-                                                                    required:
-                                                                      - key
-                                                                      - operator
-                                                                    properties:
-                                                                      key:
-                                                                        description: key is the label key that the selector applies to.
-                                                                        type: string
-                                                                      operator:
-                                                                        description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                        type: string
-                                                                      values:
-                                                                        description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                        type: array
-                                                                        items:
-                                                                          type: string
-                                                                matchLabels:
-                                                                  description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                                  type: object
-                                                                  additionalProperties:
-                                                                    type: string
-                                                            namespaces:
-                                                              description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                              type: array
-                                                              items:
-                                                                type: string
-                                                            topologyKey:
-                                                              description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                              type: string
-                                                        weight:
-                                                          description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100.
-                                                          type: integer
-                                                          format: int32
-                                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                                    description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
-                                                    type: array
-                                                    items:
-                                                      description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key <topologyKey> matches that of any node on which a pod of the set of pods is running
-                                                      type: object
-                                                      required:
-                                                        - topologyKey
-                                                      properties:
-                                                        labelSelector:
-                                                          description: A label query over a set of resources, in this case pods.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                              type: array
-                                                              items:
-                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: key is the label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                    type: string
-                                                                  values:
-                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchLabels:
-                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                              type: object
-                                                              additionalProperties:
-                                                                type: string
-                                                        namespaceSelector:
-                                                          description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
-                                                          type: object
-                                                          properties:
-                                                            matchExpressions:
-                                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                                              type: array
-                                                              items:
-                                                                description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-                                                                type: object
-                                                                required:
-                                                                  - key
-                                                                  - operator
-                                                                properties:
-                                                                  key:
-                                                                    description: key is the label key that the selector applies to.
-                                                                    type: string
-                                                                  operator:
-                                                                    description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
-                                                                    type: string
-                                                                  values:
-                                                                    description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
-                                                                    type: array
-                                                                    items:
-                                                                      type: string
-                                                            matchLabels:
-                                                              description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                                              type: object
-                                                              additionalProperties:
-                                                                type: string
-                                                        namespaces:
-                                                          description: namespaces specifies a static list of namespace names that the term applies to. The term is applied to the union of the namespaces listed in this field and the ones selected by namespaceSelector. null or empty namespaces list and null namespaceSelector means "this pod's namespace"
-                                                          type: array
-                                                          items:
-                                                            type: string
-                                                        topologyKey:
-                                                          description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
-                                                          type: string
-                                          nodeSelector:
-                                            description: 'NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node''s labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
-                                            type: object
-                                            additionalProperties:
-                                              type: string
-                                          priorityClassName:
-                                            description: If specified, the pod's priorityClassName.
-                                            type: string
-                                          serviceAccountName:
-                                            description: If specified, the pod's service account
-                                            type: string
-                                          tolerations:
-                                            description: If specified, the pod's tolerations.
-                                            type: array
-                                            items:
-                                              description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
-                                              type: object
-                                              properties:
-                                                effect:
-                                                  description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
-                                                  type: string
-                                                key:
-                                                  description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
-                                                  type: string
-                                                operator:
-                                                  description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
-                                                  type: string
-                                                tolerationSeconds:
-                                                  description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
-                                                  type: integer
-                                                  format: int64
-                                                value:
-                                                  description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
-                                                  type: string
-                                  serviceType:
-                                    description: Optional service type for Kubernetes solver service. Supported values are NodePort or ClusterIP. If unset, defaults to NodePort.
-                                    type: string
-                          selector:
-                            description: Selector selects a set of DNSNames on the Certificate resource that should be solved using this challenge solver. If not specified, the solver will be treated as the 'default' solver with the lowest priority, i.e. if any other solver has a more specific match, it will be used instead.
-                            type: object
-                            properties:
-                              dnsNames:
-                                description: List of DNSNames that this solver will be used to solve. If specified and a match is found, a dnsNames selector will take precedence over a dnsZones selector. If multiple solvers match with the same dnsNames value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
-                                type: array
-                                items:
-                                  type: string
-                              dnsZones:
-                                description: List of DNSZones that this solver will be used to solve. The most specific DNS zone match specified here will take precedence over other DNS zone matches, so a solver specifying sys.example.com will be selected over one specifying example.com for the domain www.sys.example.com. If multiple solvers match with the same dnsZones value, the solver with the most matching labels in matchLabels will be selected. If neither has more matches, the solver defined earlier in the list will be selected.
-                                type: array
-                                items:
-                                  type: string
-                              matchLabels:
-                                description: A label selector that is used to refine the set of certificate's that this challenge solver will apply to.
-                                type: object
-                                additionalProperties:
-                                  type: string
-                ca:
-                  description: CA configures this issuer to sign certificates using a signing CA keypair stored in a Secret resource. This is used to build internal PKIs that are managed by cert-manager.
-                  type: object
-                  required:
-                    - secretName
-                  properties:
-                    crlDistributionPoints:
-                      description: The CRL distribution points is an X.509 v3 certificate extension which identifies the location of the CRL from which the revocation of this certificate can be checked. If not set, certificates will be issued without distribution points set.
-                      type: array
-                      items:
-                        type: string
-                    ocspServers:
-                      description: The OCSP server list is an X.509 v3 extension that defines a list of URLs of OCSP responders. The OCSP responders can be queried for the revocation status of an issued certificate. If not set, the certificate will be issued with no OCSP servers set. For example, an OCSP server URL could be "http://ocsp.int-x3.letsencrypt.org".
-                      type: array
-                      items:
-                        type: string
-                    secretName:
-                      description: SecretName is the name of the secret used to sign Certificates issued by this Issuer.
-                      type: string
-                selfSigned:
-                  description: SelfSigned configures this issuer to 'self sign' certificates using the private key used to create the CertificateRequest object.
-                  type: object
-                  properties:
-                    crlDistributionPoints:
-                      description: The CRL distribution points is an X.509 v3 certificate extension which identifies the location of the CRL from which the revocation of this certificate can be checked. If not set certificate will be issued without CDP. Values are strings.
-                      type: array
-                      items:
-                        type: string
-                vault:
-                  description: Vault configures this issuer to sign certificates using a HashiCorp Vault PKI backend.
-                  type: object
-                  required:
-                    - auth
-                    - path
-                    - server
-                  properties:
-                    auth:
-                      description: Auth configures how cert-manager authenticates with the Vault server.
-                      type: object
-                      properties:
-                        appRole:
-                          description: AppRole authenticates with Vault using the App Role auth mechanism, with the role and secret stored in a Kubernetes Secret resource.
-                          type: object
-                          required:
-                            - path
-                            - roleId
-                            - secretRef
-                          properties:
-                            path:
-                              description: 'Path where the App Role authentication backend is mounted in Vault, e.g: "approle"'
-                              type: string
-                            roleId:
-                              description: RoleID configured in the App Role authentication backend when setting up the authentication backend in Vault.
-                              type: string
-                            secretRef:
-                              description: Reference to a key in a Secret that contains the App Role secret used to authenticate with Vault. The `key` field must be specified and denotes which entry within the Secret resource is used as the app role secret.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                        kubernetes:
-                          description: Kubernetes authenticates with Vault by passing the ServiceAccount token stored in the named Secret resource to the Vault server.
-                          type: object
-                          required:
-                            - role
-                            - secretRef
-                          properties:
-                            mountPath:
-                              description: The Vault mountPath here is the mount path to use when authenticating with Vault. For example, setting a value to `/v1/auth/foo`, will use the path `/v1/auth/foo/login` to authenticate with Vault. If unspecified, the default value "/v1/auth/kubernetes" will be used.
-                              type: string
-                            role:
-                              description: A required field containing the Vault Role to assume. A Role binds a Kubernetes ServiceAccount with a set of Vault policies.
-                              type: string
-                            secretRef:
-                              description: The required Secret field containing a Kubernetes ServiceAccount JWT used for authenticating with Vault. Use of 'ambient credentials' is not supported.
-                              type: object
-                              required:
-                                - name
-                              properties:
-                                key:
-                                  description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                                  type: string
-                                name:
-                                  description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                                  type: string
-                        tokenSecretRef:
-                          description: TokenSecretRef authenticates with Vault by presenting a token.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            key:
-                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                              type: string
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                    caBundle:
-                      description: PEM-encoded CA bundle (base64-encoded) used to validate Vault server certificate. Only used if the Server URL is using HTTPS protocol. This parameter is ignored for plain HTTP protocol connection. If not set the system root certificates are used to validate the TLS connection.
-                      type: string
-                      format: byte
-                    namespace:
-                      description: 'Name of the vault namespace. Namespaces is a set of features within Vault Enterprise that allows Vault environments to support Secure Multi-tenancy. e.g: "ns1" More about namespaces can be found here https://www.vaultproject.io/docs/enterprise/namespaces'
-                      type: string
-                    path:
-                      description: 'Path is the mount path of the Vault PKI backend''s `sign` endpoint, e.g: "my_pki_mount/sign/my-role-name".'
-                      type: string
-                    server:
-                      description: 'Server is the connection address for the Vault server, e.g: "https://vault.example.com:8200".'
-                      type: string
-                venafi:
-                  description: Venafi configures this issuer to sign certificates using a Venafi TPP or Venafi Cloud policy zone.
-                  type: object
-                  required:
-                    - zone
-                  properties:
-                    cloud:
-                      description: Cloud specifies the Venafi cloud configuration settings. Only one of TPP or Cloud may be specified.
-                      type: object
-                      required:
-                        - apiTokenSecretRef
-                      properties:
-                        apiTokenSecretRef:
-                          description: APITokenSecretRef is a secret key selector for the Venafi Cloud API token.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            key:
-                              description: The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be defaulted, in others it may be required.
-                              type: string
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                        url:
-                          description: URL is the base URL for Venafi Cloud. Defaults to "https://api.venafi.cloud/v1".
-                          type: string
-                    tpp:
-                      description: TPP specifies Trust Protection Platform configuration settings. Only one of TPP or Cloud may be specified.
-                      type: object
-                      required:
-                        - credentialsRef
-                        - url
-                      properties:
-                        caBundle:
-                          description: CABundle is a PEM encoded TLS certificate to use to verify connections to the TPP instance. If specified, system roots will not be used and the issuing CA for the TPP instance must be verifiable using the provided root. If not specified, the connection will be verified using the cert-manager system root certificates.
-                          type: string
-                          format: byte
-                        credentialsRef:
-                          description: CredentialsRef is a reference to a Secret containing the username and password for the TPP server. The secret must contain two keys, 'username' and 'password'.
-                          type: object
-                          required:
-                            - name
-                          properties:
-                            name:
-                              description: 'Name of the resource being referred to. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                              type: string
-                        url:
-                          description: 'URL is the base URL for the vedsdk endpoint of the Venafi TPP instance, for example: "https://tpp.example.com/vedsdk".'
-                          type: string
-                    zone:
-                      description: Zone is the Venafi Policy Zone to use for this issuer. All requests made to the Venafi platform will be restricted by the named zone policy. This field is required.
-                      type: string
-            status:
-              description: Status of the Issuer. This is set and managed automatically.
-              type: object
-              properties:
-                acme:
-                  description: ACME specific status options. This field should only be set if the Issuer is configured to use an ACME server to issue certificates.
-                  type: object
-                  properties:
-                    lastRegisteredEmail:
-                      description: LastRegisteredEmail is the email associated with the latest registered ACME account, in order to track changes made to registered account associated with the  Issuer
-                      type: string
-                    uri:
-                      description: URI is the unique account identifier, which can also be used to retrieve account details from the CA
-                      type: string
-                conditions:
-                  description: List of status conditions to indicate the status of a CertificateRequest. Known condition types are `Ready`.
-                  type: array
-                  items:
-                    description: IssuerCondition contains condition information for an Issuer.
-                    type: object
-                    required:
-                      - status
-                      - type
-                    properties:
-                      lastTransitionTime:
-                        description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
-                        type: string
-                        format: date-time
-                      message:
-                        description: Message is a human readable description of the details of the last transition, complementing reason.
-                        type: string
-                      observedGeneration:
-                        description: If set, this represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date with respect to the current state of the Issuer.
-                        type: integer
-                        format: int64
-                      reason:
-                        description: Reason is a brief machine readable explanation for the condition's last transition.
-                        type: string
-                      status:
-                        description: Status of the condition, one of (`True`, `False`, `Unknown`).
-                        type: string
-                        enum:
-                          - "True"
-                          - "False"
-                          - Unknown
-                      type:
-                        description: Type of the condition, known values are (`Ready`).
-                        type: string
-                  x-kubernetes-list-map-keys:
-                    - type
-                  x-kubernetes-list-type: map
-      served: true
-      storage: true
----
-# Source: cert-manager/templates/crd-templates.yaml
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: orders.acme.cert-manager.io
-  annotations:
-    cert-manager.io/inject-ca-from-secret: 'cert-manager/cert-manager-webhook-ca'
-  labels:
-    app: 'cert-manager'
-    app.kubernetes.io/name: 'cert-manager'
-    app.kubernetes.io/instance: 'cert-manager'
-    # Generated labels
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  group: acme.cert-manager.io
-  names:
-    kind: Order
-    listKind: OrderList
-    plural: orders
-    singular: order
-    categories:
-      - cert-manager
-      - cert-manager-acme
-  scope: Namespaced
-  versions:
-    - name: v1
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - jsonPath: .status.state
-          name: State
-          type: string
-        - jsonPath: .spec.issuerRef.name
-          name: Issuer
-          priority: 1
-          type: string
-        - jsonPath: .status.reason
-          name: Reason
-          priority: 1
-          type: string
-        - jsonPath: .metadata.creationTimestamp
-          description: CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.
-          name: Age
-          type: date
-      schema:
-        openAPIV3Schema:
-          description: Order is a type to represent an Order with an ACME server
-          type: object
-          required:
-            - metadata
-            - spec
-          properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              type: object
-              required:
-                - issuerRef
-                - request
-              properties:
-                commonName:
-                  description: CommonName is the common name as specified on the DER encoded CSR. If specified, this value must also be present in `dnsNames` or `ipAddresses`. This field must match the corresponding field on the DER encoded CSR.
-                  type: string
-                dnsNames:
-                  description: DNSNames is a list of DNS names that should be included as part of the Order validation process. This field must match the corresponding field on the DER encoded CSR.
-                  type: array
-                  items:
-                    type: string
-                duration:
-                  description: Duration is the duration for the not after date for the requested certificate. this is set on order creation as pe the ACME spec.
-                  type: string
-                ipAddresses:
-                  description: IPAddresses is a list of IP addresses that should be included as part of the Order validation process. This field must match the corresponding field on the DER encoded CSR.
-                  type: array
-                  items:
-                    type: string
-                issuerRef:
-                  description: IssuerRef references a properly configured ACME-type Issuer which should be used to create this Order. If the Issuer does not exist, processing will be retried. If the Issuer is not an 'ACME' Issuer, an error will be returned and the Order will be marked as failed.
-                  type: object
-                  required:
-                    - name
-                  properties:
-                    group:
-                      description: Group of the resource being referred to.
-                      type: string
-                    kind:
-                      description: Kind of the resource being referred to.
-                      type: string
-                    name:
-                      description: Name of the resource being referred to.
-                      type: string
-                request:
-                  description: Certificate signing request bytes in DER encoding. This will be used when finalizing the order. This field must be set on the order.
-                  type: string
-                  format: byte
-            status:
-              type: object
-              properties:
-                authorizations:
-                  description: Authorizations contains data returned from the ACME server on what authorizations must be completed in order to validate the DNS names specified on the Order.
-                  type: array
-                  items:
-                    description: ACMEAuthorization contains data returned from the ACME server on an authorization that must be completed in order validate a DNS name on an ACME Order resource.
-                    type: object
-                    required:
-                      - url
-                    properties:
-                      challenges:
-                        description: Challenges specifies the challenge types offered by the ACME server. One of these challenge types will be selected when validating the DNS name and an appropriate Challenge resource will be created to perform the ACME challenge process.
-                        type: array
-                        items:
-                          description: Challenge specifies a challenge offered by the ACME server for an Order. An appropriate Challenge resource can be created to perform the ACME challenge process.
-                          type: object
-                          required:
-                            - token
-                            - type
-                            - url
-                          properties:
-                            token:
-                              description: Token is the token that must be presented for this challenge. This is used to compute the 'key' that must also be presented.
-                              type: string
-                            type:
-                              description: Type is the type of challenge being offered, e.g. 'http-01', 'dns-01', 'tls-sni-01', etc. This is the raw value retrieved from the ACME server. Only 'http-01' and 'dns-01' are supported by cert-manager, other values will be ignored.
-                              type: string
-                            url:
-                              description: URL is the URL of this challenge. It can be used to retrieve additional metadata about the Challenge from the ACME server.
-                              type: string
-                      identifier:
-                        description: Identifier is the DNS name to be validated as part of this authorization
-                        type: string
-                      initialState:
-                        description: InitialState is the initial state of the ACME authorization when first fetched from the ACME server. If an Authorization is already 'valid', the Order controller will not create a Challenge resource for the authorization. This will occur when working with an ACME server that enables 'authz reuse' (such as Let's Encrypt's production endpoint). If not set and 'identifier' is set, the state is assumed to be pending and a Challenge will be created.
-                        type: string
-                        enum:
-                          - valid
-                          - ready
-                          - pending
-                          - processing
-                          - invalid
-                          - expired
-                          - errored
-                      url:
-                        description: URL is the URL of the Authorization that must be completed
-                        type: string
-                      wildcard:
-                        description: Wildcard will be true if this authorization is for a wildcard DNS name. If this is true, the identifier will be the *non-wildcard* version of the DNS name. For example, if '*.example.com' is the DNS name being validated, this field will be 'true' and the 'identifier' field will be 'example.com'.
-                        type: boolean
-                certificate:
-                  description: Certificate is a copy of the PEM encoded certificate for this Order. This field will be populated after the order has been successfully finalized with the ACME server, and the order has transitioned to the 'valid' state.
-                  type: string
-                  format: byte
-                failureTime:
-                  description: FailureTime stores the time that this order failed. This is used to influence garbage collection and back-off.
-                  type: string
-                  format: date-time
-                finalizeURL:
-                  description: FinalizeURL of the Order. This is used to obtain certificates for this order once it has been completed.
-                  type: string
-                reason:
-                  description: Reason optionally provides more information about a why the order is in the current state.
-                  type: string
-                state:
-                  description: State contains the current state of this Order resource. States 'success' and 'expired' are 'final'
-                  type: string
-                  enum:
-                    - valid
-                    - ready
-                    - pending
-                    - processing
-                    - invalid
-                    - expired
-                    - errored
-                url:
-                  description: URL of the Order. This will initially be empty when the resource is first created. The Order controller will populate this field when the Order is first processed. This field will be immutable after it is initially set.
-                  type: string
-      served: true
-      storage: true
----
-# Source: cert-manager/templates/cainjector-serviceaccount.yaml
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: true
-metadata:
-  name: cert-manager-cainjector
-  namespace: "cert-manager"
-  labels:
-    app: cainjector
-    app.kubernetes.io/name: cainjector
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.8.0"
----
-# Source: cert-manager/templates/serviceaccount.yaml
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: true
-metadata:
-  name: cert-manager
-  namespace: "cert-manager"
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
----
-# Source: cert-manager/templates/webhook-serviceaccount.yaml
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: true
-metadata:
-  name: cert-manager-webhook
-  namespace: "cert-manager"
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
----
-# Source: cert-manager/templates/webhook-config.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cert-manager-webhook
-  namespace: "cert-manager"
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-data:
----
-# Source: cert-manager/templates/cainjector-rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-cainjector
-  labels:
-    app: cainjector
-    app.kubernetes.io/name: cainjector
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["get", "create", "update", "patch"]
-  - apiGroups: ["admissionregistration.k8s.io"]
-    resources: ["validatingwebhookconfigurations", "mutatingwebhookconfigurations"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: ["apiregistration.k8s.io"]
-    resources: ["apiservices"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: ["apiextensions.k8s.io"]
-    resources: ["customresourcedefinitions"]
-    verbs: ["get", "list", "watch", "update"]
----
-# Source: cert-manager/templates/rbac.yaml
-# Issuer controller role
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-controller-issuers
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["cert-manager.io"]
-    resources: ["issuers", "issuers/status"]
-    verbs: ["update", "patch"]
-  - apiGroups: ["cert-manager.io"]
-    resources: ["issuers"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list", "watch", "create", "update", "delete"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["create", "patch"]
----
-# Source: cert-manager/templates/rbac.yaml
-# ClusterIssuer controller role
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-controller-clusterissuers
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["cert-manager.io"]
-    resources: ["clusterissuers", "clusterissuers/status"]
-    verbs: ["update", "patch"]
-  - apiGroups: ["cert-manager.io"]
-    resources: ["clusterissuers"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list", "watch", "create", "update", "delete"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["create", "patch"]
----
-# Source: cert-manager/templates/rbac.yaml
-# Certificates controller role
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-controller-certificates
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates", "certificates/status", "certificaterequests", "certificaterequests/status"]
-    verbs: ["update", "patch"]
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates", "certificaterequests", "clusterissuers", "issuers"]
-    verbs: ["get", "list", "watch"]
-  # We require these rules to support users with the OwnerReferencesPermissionEnforcement
-  # admission controller enabled:
-  # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates/finalizers", "certificaterequests/finalizers"]
-    verbs: ["update"]
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["orders"]
-    verbs: ["create", "delete", "get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list", "watch", "create", "update", "delete", "patch"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["create", "patch"]
----
-# Source: cert-manager/templates/rbac.yaml
-# Orders controller role
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-controller-orders
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["orders", "orders/status"]
-    verbs: ["update", "patch"]
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["orders", "challenges"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["cert-manager.io"]
-    resources: ["clusterissuers", "issuers"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["challenges"]
-    verbs: ["create", "delete"]
-  # We require these rules to support users with the OwnerReferencesPermissionEnforcement
-  # admission controller enabled:
-  # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["orders/finalizers"]
-    verbs: ["update"]
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["create", "patch"]
----
-# Source: cert-manager/templates/rbac.yaml
-# Challenges controller role
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-controller-challenges
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  # Use to update challenge resource status
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["challenges", "challenges/status"]
-    verbs: ["update", "patch"]
-  # Used to watch challenge resources
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["challenges"]
-    verbs: ["get", "list", "watch"]
-  # Used to watch challenges, issuer and clusterissuer resources
-  - apiGroups: ["cert-manager.io"]
-    resources: ["issuers", "clusterissuers"]
-    verbs: ["get", "list", "watch"]
-  # Need to be able to retrieve ACME account private key to complete challenges
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list", "watch"]
-  # Used to create events
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["create", "patch"]
-  # HTTP01 rules
-  - apiGroups: [""]
-    resources: ["pods", "services"]
-    verbs: ["get", "list", "watch", "create", "delete"]
-  - apiGroups: ["networking.k8s.io"]
-    resources: ["ingresses"]
-    verbs: ["get", "list", "watch", "create", "delete", "update"]
-  - apiGroups: [ "gateway.networking.k8s.io" ]
-    resources: [ "httproutes" ]
-    verbs: ["get", "list", "watch", "create", "delete", "update"]
-  # We require the ability to specify a custom hostname when we are creating
-  # new ingress resources.
-  # See: https://github.com/openshift/origin/blob/21f191775636f9acadb44fa42beeb4f75b255532/pkg/route/apiserver/admission/ingress_admission.go#L84-L148
-  - apiGroups: ["route.openshift.io"]
-    resources: ["routes/custom-host"]
-    verbs: ["create"]
-  # We require these rules to support users with the OwnerReferencesPermissionEnforcement
-  # admission controller enabled:
-  # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["challenges/finalizers"]
-    verbs: ["update"]
-  # DNS01 rules (duplicated above)
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list", "watch"]
----
-# Source: cert-manager/templates/rbac.yaml
-# ingress-shim controller role
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-controller-ingress-shim
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates", "certificaterequests"]
-    verbs: ["create", "update", "delete"]
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates", "certificaterequests", "issuers", "clusterissuers"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["networking.k8s.io"]
-    resources: ["ingresses"]
-    verbs: ["get", "list", "watch"]
-  # We require these rules to support users with the OwnerReferencesPermissionEnforcement
-  # admission controller enabled:
-  # https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#ownerreferencespermissionenforcement
-  - apiGroups: ["networking.k8s.io"]
-    resources: ["ingresses/finalizers"]
-    verbs: ["update"]
-  - apiGroups: ["gateway.networking.k8s.io"]
-    resources: ["gateways", "httproutes"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["gateway.networking.k8s.io"]
-    resources: ["gateways/finalizers", "httproutes/finalizers"]
-    verbs: ["update"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["create", "patch"]
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-view
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-    rbac.authorization.k8s.io/aggregate-to-view: "true"
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-rules:
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates", "certificaterequests", "issuers"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["challenges", "orders"]
-    verbs: ["get", "list", "watch"]
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-edit
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-rules:
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates", "certificaterequests", "issuers"]
-    verbs: ["create", "delete", "deletecollection", "patch", "update"]
-  - apiGroups: ["cert-manager.io"]
-    resources: ["certificates/status"]
-    verbs: ["update"]
-  - apiGroups: ["acme.cert-manager.io"]
-    resources: ["challenges", "orders"]
-    verbs: ["create", "delete", "deletecollection", "patch", "update"]
----
-# Source: cert-manager/templates/rbac.yaml
-# Permission to approve CertificateRequests referencing cert-manager.io Issuers and ClusterIssuers
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-controller-approve:cert-manager-io
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cert-manager"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["cert-manager.io"]
-    resources: ["signers"]
-    verbs: ["approve"]
-    resourceNames: ["issuers.cert-manager.io/*", "clusterissuers.cert-manager.io/*"]
----
-# Source: cert-manager/templates/rbac.yaml
-# Permission to:
-# - Update and sign CertificatSigningeRequests referencing cert-manager.io Issuers and ClusterIssuers
-# - Perform SubjectAccessReviews to test whether users are able to reference Namespaced Issuers
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-controller-certificatesigningrequests
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cert-manager"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["certificates.k8s.io"]
-    resources: ["certificatesigningrequests"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: ["certificates.k8s.io"]
-    resources: ["certificatesigningrequests/status"]
-    verbs: ["update", "patch"]
-  - apiGroups: ["certificates.k8s.io"]
-    resources: ["signers"]
-    resourceNames: ["issuers.cert-manager.io/*", "clusterissuers.cert-manager.io/*"]
-    verbs: ["sign"]
-  - apiGroups: ["authorization.k8s.io"]
-    resources: ["subjectaccessreviews"]
-    verbs: ["create"]
----
-# Source: cert-manager/templates/webhook-rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: cert-manager-webhook:subjectaccessreviews
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-- apiGroups: ["authorization.k8s.io"]
-  resources: ["subjectaccessreviews"]
-  verbs: ["create"]
----
-# Source: cert-manager/templates/cainjector-rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-cainjector
-  labels:
-    app: cainjector
-    app.kubernetes.io/name: cainjector
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-cainjector
-subjects:
-  - name: cert-manager-cainjector
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-controller-issuers
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-controller-issuers
-subjects:
-  - name: cert-manager
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-controller-clusterissuers
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-controller-clusterissuers
-subjects:
-  - name: cert-manager
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-controller-certificates
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-controller-certificates
-subjects:
-  - name: cert-manager
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-controller-orders
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-controller-orders
-subjects:
-  - name: cert-manager
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-controller-challenges
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-controller-challenges
-subjects:
-  - name: cert-manager
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-controller-ingress-shim
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-controller-ingress-shim
-subjects:
-  - name: cert-manager
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-controller-approve:cert-manager-io
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cert-manager"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-controller-approve:cert-manager-io
-subjects:
-  - name: cert-manager
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-controller-certificatesigningrequests
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cert-manager"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-controller-certificatesigningrequests
-subjects:
-  - name: cert-manager
-    namespace: "cert-manager"
-    kind: ServiceAccount
----
-# Source: cert-manager/templates/webhook-rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: cert-manager-webhook:subjectaccessreviews
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cert-manager-webhook:subjectaccessreviews
-subjects:
-- apiGroup: ""
-  kind: ServiceAccount
-  name: cert-manager-webhook
-  namespace: cert-manager
----
-# Source: cert-manager/templates/cainjector-rbac.yaml
-# leader election rules
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: cert-manager-cainjector:leaderelection
-  namespace: kube-system
-  labels:
-    app: cainjector
-    app.kubernetes.io/name: cainjector
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  # Used for leader election by the controller
-  # cert-manager-cainjector-leader-election is used by the CertificateBased injector controller
-  #   see cmd/cainjector/start.go#L113
-  # cert-manager-cainjector-leader-election-core is used by the SecretBased injector controller
-  #   see cmd/cainjector/start.go#L137
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    resourceNames: ["cert-manager-cainjector-leader-election", "cert-manager-cainjector-leader-election-core"]
-    verbs: ["get", "update", "patch"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["create"]
----
-# Source: cert-manager/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: cert-manager:leaderelection
-  namespace: kube-system
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    resourceNames: ["cert-manager-controller"]
-    verbs: ["get", "update", "patch"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["create"]
----
-# Source: cert-manager/templates/webhook-rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: cert-manager-webhook:dynamic-serving
-  namespace: "cert-manager"
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
-rules:
-- apiGroups: [""]
-  resources: ["secrets"]
-  resourceNames:
-  - 'cert-manager-webhook-ca'
-  verbs: ["get", "list", "watch", "update"]
-# It's not possible to grant CREATE permission on a single resourceName.
-- apiGroups: [""]
-  resources: ["secrets"]
-  verbs: ["create"]
----
-# Source: cert-manager/templates/cainjector-rbac.yaml
-# grant cert-manager permission to manage the leaderelection configmap in the
-# leader election namespace
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: cert-manager-cainjector:leaderelection
-  namespace: kube-system
-  labels:
-    app: cainjector
-    app.kubernetes.io/name: cainjector
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: cert-manager-cainjector:leaderelection
-subjects:
-  - kind: ServiceAccount
-    name: cert-manager-cainjector
-    namespace: cert-manager
----
-# Source: cert-manager/templates/rbac.yaml
-# grant cert-manager permission to manage the leaderelection configmap in the
-# leader election namespace
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: cert-manager:leaderelection
-  namespace: kube-system
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: cert-manager:leaderelection
-subjects:
-  - apiGroup: ""
-    kind: ServiceAccount
-    name: cert-manager
-    namespace: cert-manager
----
-# Source: cert-manager/templates/webhook-rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: cert-manager-webhook:dynamic-serving
-  namespace: "cert-manager"
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: cert-manager-webhook:dynamic-serving
-subjects:
-- apiGroup: ""
-  kind: ServiceAccount
-  name: cert-manager-webhook
-  namespace: cert-manager
----
-# Source: cert-manager/templates/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: cert-manager
-  namespace: "cert-manager"
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  type: ClusterIP
-  ports:
-  - protocol: TCP
-    port: 9402
-    name: tcp-prometheus-servicemonitor
-    targetPort: 9402
-  selector:
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
----
-# Source: cert-manager/templates/webhook-service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: cert-manager-webhook
-  namespace: "cert-manager"
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  type: ClusterIP
-  ports:
-  - name: https
-    port: 443
-    protocol: TCP
-    targetPort: "https"
-  selector:
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
----
-# Source: cert-manager/templates/cainjector-deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: cert-manager-cainjector
-  namespace: "cert-manager"
-  labels:
-    app: cainjector
-    app.kubernetes.io/name: cainjector
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "cainjector"
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: cainjector
-      app.kubernetes.io/instance: cert-manager
-      app.kubernetes.io/component: "cainjector"
-  template:
-    metadata:
-      labels:
-        app: cainjector
-        app.kubernetes.io/name: cainjector
-        app.kubernetes.io/instance: cert-manager
-        app.kubernetes.io/component: "cainjector"
-        app.kubernetes.io/version: "v1.8.0"
-    spec:
-      serviceAccountName: cert-manager-cainjector
-      securityContext:
-        runAsNonRoot: true
-      containers:
-        - name: cert-manager
-          image: "quay.io/jetstack/cert-manager-cainjector:v1.8.0"
-          imagePullPolicy: IfNotPresent
-          args:
-          - --v=2
-          - --leader-election-namespace=kube-system
-          env:
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          securityContext:
-            allowPrivilegeEscalation: false
-      nodeSelector:
-        kubernetes.io/os: linux
----
-# Source: cert-manager/templates/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: cert-manager
-  namespace: "cert-manager"
-  labels:
-    app: cert-manager
-    app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "controller"
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: cert-manager
-      app.kubernetes.io/instance: cert-manager
-      app.kubernetes.io/component: "controller"
-  template:
-    metadata:
-      labels:
-        app: cert-manager
-        app.kubernetes.io/name: cert-manager
-        app.kubernetes.io/instance: cert-manager
-        app.kubernetes.io/component: "controller"
-        app.kubernetes.io/version: "v1.8.0"
-      annotations:
-        prometheus.io/path: "/metrics"
-        prometheus.io/scrape: 'true'
-        prometheus.io/port: '9402'
-    spec:
-      serviceAccountName: cert-manager
-      securityContext:
-
-        runAsNonRoot: true
-      containers:
-        - name: cert-manager
-          image: "quay.io/jetstack/cert-manager-controller:v1.8.0"
-          imagePullPolicy: IfNotPresent
-          args:
-          - --v=2
-          - --cluster-resource-namespace=$(POD_NAMESPACE)
-          - --leader-election-namespace=kube-system
-          ports:
-          - containerPort: 9402
-            name: http-metrics
-            protocol: TCP
-          securityContext:
-            allowPrivilegeEscalation: false
-          env:
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-      nodeSelector:
-        kubernetes.io/os: linux
----
-# Source: cert-manager/templates/webhook-deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: cert-manager-webhook
-  namespace: "cert-manager"
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: webhook
-      app.kubernetes.io/instance: cert-manager
-      app.kubernetes.io/component: "webhook"
-  template:
-    metadata:
-      labels:
-        app: webhook
-        app.kubernetes.io/name: webhook
-        app.kubernetes.io/instance: cert-manager
-        app.kubernetes.io/component: "webhook"
-        app.kubernetes.io/version: "v1.8.0"
-    spec:
-      serviceAccountName: cert-manager-webhook
-      securityContext:
-        runAsNonRoot: true
-      containers:
-        - name: cert-manager
-          image: "quay.io/jetstack/cert-manager-webhook:v1.8.0"
-          imagePullPolicy: IfNotPresent
-          args:
-          - --v=2
-          - --secure-port=10250
-          - --dynamic-serving-ca-secret-namespace=$(POD_NAMESPACE)
-          - --dynamic-serving-ca-secret-name=cert-manager-webhook-ca
-          - --dynamic-serving-dns-names=cert-manager-webhook,cert-manager-webhook.cert-manager,cert-manager-webhook.cert-manager.svc
-          ports:
-          - name: https
-            protocol: TCP
-            containerPort: 10250
-          livenessProbe:
-            httpGet:
-              path: /livez
-              port: 6080
-              scheme: HTTP
-            initialDelaySeconds: 60
-            periodSeconds: 10
-            timeoutSeconds: 1
-            successThreshold: 1
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: /healthz
-              port: 6080
-              scheme: HTTP
-            initialDelaySeconds: 5
-            periodSeconds: 5
-            timeoutSeconds: 1
-            successThreshold: 1
-            failureThreshold: 3
-          securityContext:
-            allowPrivilegeEscalation: false
-          env:
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-      nodeSelector:
-        kubernetes.io/os: linux
----
-# Source: cert-manager/templates/webhook-mutating-webhook.yaml
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  name: cert-manager-webhook
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
-  annotations:
-    cert-manager.io/inject-ca-from-secret: "cert-manager/cert-manager-webhook-ca"
-webhooks:
-  - name: webhook.cert-manager.io
-    rules:
-      - apiGroups:
-          - "cert-manager.io"
-          - "acme.cert-manager.io"
-        apiVersions:
-          - "v1"
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - "*/*"
-    admissionReviewVersions: ["v1"]
-    # This webhook only accepts v1 cert-manager resources.
-    # Equivalent matchPolicy ensures that non-v1 resource requests are sent to
-    # this webhook (after the resources have been converted to v1).
-    matchPolicy: Equivalent
-    timeoutSeconds: 10
-    failurePolicy: Fail
-    # Only include 'sideEffects' field in Kubernetes 1.12+
-    sideEffects: None
-    clientConfig:
-      service:
-        name: cert-manager-webhook
-        namespace: "cert-manager"
-        path: /mutate
----
-# Source: cert-manager/templates/webhook-validating-webhook.yaml
-apiVersion: admissionregistration.k8s.io/v1
-kind: ValidatingWebhookConfiguration
-metadata:
-  name: cert-manager-webhook
-  labels:
-    app: webhook
-    app.kubernetes.io/name: webhook
-    app.kubernetes.io/instance: cert-manager
-    app.kubernetes.io/component: "webhook"
-    app.kubernetes.io/version: "v1.8.0"
-  annotations:
-    cert-manager.io/inject-ca-from-secret: "cert-manager/cert-manager-webhook-ca"
-webhooks:
-  - name: webhook.cert-manager.io
-    namespaceSelector:
-      matchExpressions:
-      - key: "cert-manager.io/disable-validation"
-        operator: "NotIn"
-        values:
-        - "true"
-      - key: "name"
-        operator: "NotIn"
-        values:
-        - cert-manager
-    rules:
-      - apiGroups:
-          - "cert-manager.io"
-          - "acme.cert-manager.io"
-        apiVersions:
-          - "v1"
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - "*/*"
-    admissionReviewVersions: ["v1"]
-    # This webhook only accepts v1 cert-manager resources.
-    # Equivalent matchPolicy ensures that non-v1 resource requests are sent to
-    # this webhook (after the resources have been converted to v1).
-    matchPolicy: Equivalent
-    timeoutSeconds: 10
-    failurePolicy: Fail
-    sideEffects: None
-    clientConfig:
-      service:
-        name: cert-manager-webhook
-        namespace: "cert-manager"
-        path: /validate
diff --git a/kubernetes/terraform/helm/charts/frontend/values.yaml b/kubernetes/terraform/helm/charts/frontend/values.yaml
new file mode 100644
index 000000000..bffb8a2c1
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/frontend/values.yaml
@@ -0,0 +1,4 @@
+image:
+  repository_path: deathangel908/pychat-frontend
+  pullPolicy: Always # change to IfNotPresent for minikube
+  tag: "latest"
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 163b8c7cb..0ed677686 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -61,15 +61,20 @@ resource "helm_release" "backend" {
 resource "helm_release" "certmanager-definition" {
   name = "cert-manager-definition"
   chart = "jetstack/cert-manager"
+  version = "1.12.0"
   namespace = "cert-manager"
-  version = "1.8.0"
+  set {
+    name = "installCRDs"
+    value = true
+  }
+  depends_on = [helm_release.global]
 }
 
-resource "time_sleep" "wait_certmanager" {
-  create_duration = "3s"
-
-  depends_on = [helm_release.certmanager-definition]
-}
+#resource "time_sleep" "wait_certmanager" {
+#  create_duration = "3s"
+#
+#  depends_on = [helm_release.certmanager-definition]
+#}
 
 resource "helm_release" certmanager {
   name  = "certmanager"
@@ -86,7 +91,7 @@ resource "helm_release" certmanager {
     name  = "cloud_flare_api_token"
     value = var.cloud_flare_api_token
   }
-  depends_on = [helm_release.global, time_sleep.wait_certmanager]
+  depends_on = [helm_release.global, helm_release.certmanager-definition]
 }
 
 resource "helm_release" "backup" {

From 0a7becb65a9c5e2d962fa1b8412d8ca4d8726025 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 27 May 2023 20:48:36 +0300
Subject: [PATCH 182/221] Terraform works w/o tls probably

---
 README.md                                     |  6 ++-
 .../helm/charts/backend/templates/secret.yaml |  2 +-
 .../terraform/helm/charts/backend/values.yaml |  2 +-
 .../certmanager/templates/certificate.yaml    |  4 +-
 .../helm/charts/certmanager/values.yaml       |  2 +-
 .../charts/ingress/templates/ingress.yaml     |  8 ++--
 .../terraform/helm/charts/ingress/values.yaml |  2 +-
 .../helm/charts/self-signed/Chart.yaml        |  6 +++
 .../charts/self-signed/templates/secret.yaml  |  9 +++++
 .../helm/charts/self-signed/values.yaml       |  2 +
 kubernetes/terraform/helm/main.tf             | 39 +++++++++++++------
 kubernetes/terraform/helm/variables.tf        |  4 +-
 kubernetes/terraform/main.tf                  | 16 ++------
 kubernetes/terraform/variables.tf             | 22 +++++++++++
 14 files changed, 88 insertions(+), 36 deletions(-)
 create mode 100644 kubernetes/terraform/helm/charts/self-signed/Chart.yaml
 create mode 100644 kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
 create mode 100644 kubernetes/terraform/helm/charts/self-signed/values.yaml

diff --git a/README.md b/README.md
index b3f519b6f..679e09d2f 100644
--- a/README.md
+++ b/README.md
@@ -524,7 +524,11 @@ http ALL=(ALL) NOPASSWD: RESTART_TORNADO
 1. Go cloudflare and copy ZoneID and API token 
  - Copy zoneID: Go to https://dash.cloudflare.com/ - create a new site (or use existing one) grab an API Zone ID and place it into `kubernetes/terraform.tfvars`
  - Copy API token: go to https://dash.cloudflare.com/profile/api-tokens and create a new api token and place it into `kubernetes/terraform.tfvars`\
- 
+
+If github is not defined backup is not gonna be used
+if cloudflare_api_token is not defined, certmanager is not gonna be used, turn server will not work, postfix will not send emails. Site is gonna be under local certificate
+Uplon linode cluster creation .kubeconfig will be generated in kubernetes/terraform/helm directory. After it all operations with helm will be using this conf. If this file is deleted helm will compain about missing kubernetes config
+
 1. Apply terraform:
  - `cd kubernetes/terraform; terraform apply`
  
diff --git a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
index da43e1930..0bacf211d 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
@@ -9,7 +9,7 @@ stringData:
   MYSQL_USER: "{{ .Values.mysql_database_name }}"
   EMAIL_HOST_USER: ""
   EMAIL_HOST_PASSWORD: ""
-  SERVER_EMAIL: "root@{{ .Values.domain }}"
+  SERVER_EMAIL: "root@{{ .Values.domain_name }}"
   SECRET_KEY: "{{ .Values.SECRET_KEY }}"
   RECAPTCHA_PRIVATE_KEY: "{{ .Values.RECAPTCHA_PRIVATE_KEY }}"
   RECAPTCHA_PUBLIC_KEY: "{{ .Values.RECAPTCHA_PUBLIC_KEY }}"
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
index 3650583ed..7811fdb5d 100644
--- a/kubernetes/terraform/helm/charts/backend/values.yaml
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -8,7 +8,7 @@ mysql:
   mysql_database_name: $mysql_database_name
   mysql_user: $mysql_user
   mysql_password: $mysql_password
-domain: $domain
+domain_name: $domain_name
 DEFAULT_PROFILE_ID: "${DEFAULT_PROFILE_ID}"
 FIREBASE_API_KEY: $FIREBASE_API_KEY
 GIPHY_API_KEY: $GIPHY_API_KEY
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
index 1b9dee8fa..5b691d64f 100644
--- a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
@@ -11,5 +11,5 @@ spec:
   duration: 2160h # 90d
   renewBefore: 720h # 30d before SSL will expire, renew it
   dnsNames:
-    - "{{ .Values.domain }}"
-    - "static.{{ .Values.domain }}"
+    - "{{ .Values.domain_name }}"
+    - "static.{{ .Values.domain_name }}"
diff --git a/kubernetes/terraform/helm/charts/certmanager/values.yaml b/kubernetes/terraform/helm/charts/certmanager/values.yaml
index 5567d0c4f..53bb4893d 100644
--- a/kubernetes/terraform/helm/charts/certmanager/values.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/values.yaml
@@ -1,3 +1,3 @@
 email: $email
 cloud_flare_api_token: $cloud_flare_api_token
-domain: $domain
+domain_name: $domain_name
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
index ea864c8ad..d2603f42e 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
@@ -10,8 +10,8 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-    - "{{ .Values.domain }}"
-    - "static.{{ .Values.domain }}"
+    - "{{ .Values.domain_name }}"
+    - "static.{{ .Values.domain_name }}"
     secretName: pychat-tls
   defaultBackend:
     service:
@@ -19,7 +19,7 @@ spec:
       port:
         number: 80
   rules:
-  - host: "static.{{ .Values.domain }}"
+  - host: "static.{{ .Values.domain_name }}"
     http:
       paths:
       - path: /
@@ -29,7 +29,7 @@ spec:
             name: frontend-service
             port:
               number: 80
-  - host: "{{ .Values.domain }}"
+  - host: "{{ .Values.domain_name }}"
     http:
       paths:
       - path: /api
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
index 9dc1e0593..d61b2a50e 100644
--- a/kubernetes/terraform/helm/charts/ingress/values.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -1,4 +1,4 @@
 udp_port_range_start: 49152
 udp_port_range_end: 49252
 external_ip: $external_ip
-domain: $domain
+domain_name: $domain_name
diff --git a/kubernetes/terraform/helm/charts/self-signed/Chart.yaml b/kubernetes/terraform/helm/charts/self-signed/Chart.yaml
new file mode 100644
index 000000000..9facc4f8b
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/self-signed/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: self signed certificate
+description: if cert-manager is not used, we can use self-signed certificate
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml b/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
new file mode 100644
index 000000000..79588563d
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: self-signed-certificate
+  namespace: pychat-tls
+data:
+  tls.crt: "{{ .Value.tls_crt }} "
+  tls.key: "{{ .Value.tls_key }}"
diff --git a/kubernetes/terraform/helm/charts/self-signed/values.yaml b/kubernetes/terraform/helm/charts/self-signed/values.yaml
new file mode 100644
index 000000000..4ad7e7c38
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/self-signed/values.yaml
@@ -0,0 +1,2 @@
+tls_crt: $tls_crt
+tls_key: $tls_key
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 0ed677686..a9f416095 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -9,8 +9,8 @@ resource "helm_release" "backend" {
   depends_on = [helm_release.global, helm_release.mariadb, helm_release.redis]
 
   set {
-    name  = "domain"
-    value = var.domain
+    name  = "domain_name"
+    value = var.domain_name
   }
   set {
     name  = "mysql_database_name"
@@ -76,12 +76,12 @@ resource "helm_release" "certmanager-definition" {
 #  depends_on = [helm_release.certmanager-definition]
 #}
 
-resource "helm_release" certmanager {
+resource "helm_release" "certmanager" {
   name  = "certmanager"
   chart = "${path.module}/charts/certmanager"
   set {
-    name  = "domain"
-    value = var.domain
+    name  = "domain_name"
+    value = var.domain_name
   }
   set {
     name  = "email"
@@ -94,7 +94,22 @@ resource "helm_release" certmanager {
   depends_on = [helm_release.global, helm_release.certmanager-definition]
 }
 
+resource "helm_release" "self-signed" {
+  count = var.cloud_flare_api_token == "" ? 1 : 0
+  name  = "self-signed"
+  chart = "${path.module}/charts/self-signed"
+  set {
+    name  = "tls_crt"
+    value = var.tls_crt
+  }
+  set {
+     name  = "tls_key"
+    value = var.tls_key
+  }
+}
+
 resource "helm_release" "backup" {
+  count = var.github == ""? 1 : 0
   name       = "backup"
   chart      = "${path.module}/charts/backup"
   depends_on = [helm_release.mariadb, helm_release.backend] // because of pvc-photo
@@ -116,8 +131,8 @@ resource "helm_release" "backup" {
     value = var.github
   }
   set {
-    name  = "domain"
-    value = var.domain
+    name  = "domain_name"
+    value = var.domain_name
   }
   set {
     name  = "mysql_database_name"
@@ -136,7 +151,7 @@ resource "helm_release" "backup" {
 resource "helm_release" "coturn" {
   name       = "coturn"
   chart      = "${path.module}/charts/coturn"
-  depends_on = [helm_release.global, helm_release.certmanager]
+  depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
 }
 
 resource "helm_release" "frontend" {
@@ -149,15 +164,15 @@ resource "helm_release" "ingress" {
   name  = "ingress"
   chart = "${path.module}/charts/ingress"
   set {
-    name  = "domain"
-    value = var.domain
+    name  = "domain_name"
+    value = var.domain_name
 
   }
   set {
     name  = "external_ip"
     value = var.ip_address
   }
-  depends_on = [helm_release.global, helm_release.certmanager]
+  depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
 }
 
 resource "helm_release" "mariadb" {
@@ -181,7 +196,7 @@ resource "helm_release" "mariadb" {
 resource "helm_release" "postfix" {
   name       = "postfix"
   chart      = "${path.module}/charts/postfix"
-  depends_on = [helm_release.global, helm_release.certmanager]
+  depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
 }
 
 resource "helm_release" "redis" {
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index a37cc8bb3..02430c473 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,4 +1,4 @@
-variable "domain" {}
+variable "domain_name" {}
 variable "email" {}
 variable "github" {}
 variable "id_rsa" {}
@@ -13,6 +13,8 @@ variable "GIPHY_API_KEY" {}
 variable "FIREBASE_API_KEY" {}
 variable "DEFAULT_PROFILE_ID" {}
 variable "kubeconfig" {}
+variable "tls_crt" {}
+variable "tls_key" {}
 variable "cloud_flare_api_token" {}
 variable "mysql_password" {
   default = "pypass"
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index e4e8f6e2a..a5e32d595 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -1,20 +1,10 @@
-variable "linode_token" {}
-variable "cloud_flare_zone_id" {}
-variable "cloud_flare_api_token" {}
-variable "domain_name" {}
-variable "email" {}
-variable "github" {}
-variable "id_rsa" {}
-variable "id_rsa_pub" {}
-variable "ip_address" {}
-variable "cloud_flare_api_token" {}
-
 module "linode" {
   source                  = "./linode"
   linode_token = var.linode_token
 }
 
 module "cloudflare" {
+  count = var.cloud_flare_api_token == "" ? 0 : 1
   source                  = "./cloudflare"
   cloud_flare_api_token = var.cloud_flare_api_token
   cloud_flare_zone_id = var.cloud_flare_zone_id
@@ -25,7 +15,7 @@ module "cloudflare" {
 module "helm" {
   source = "./helm"
   kubeconfig = module.linode.kubeconfig
-  domain = var.domain_name
+  domain_name = var.domain_name
   ip_address = module.linode.ip_address
   cloud_flare_api_token = var.cloud_flare_api_token
   email = var.email
@@ -39,5 +29,7 @@ module "helm" {
   FACEBOOK_ACCESS_TOKEN = var.FACEBOOK_ACCESS_TOKEN
   GIPHY_API_KEY = var.GIPHY_API_KEY
   FIREBASE_API_KEY = var.FIREBASE_API_KEY
+  tls_crt = var.tls_crt
+  tls_key = var.tls_key
   DEFAULT_PROFILE_ID = var.DEFAULT_PROFILE_ID
 }
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 4938b7c4a..35d97e17a 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -22,3 +22,25 @@ variable "FIREBASE_API_KEY" {
 variable "DEFAULT_PROFILE_ID" {
   default = "1"
 }
+
+variable "linode_token" {}
+variable "cloud_flare_zone_id" {}
+variable "cloud_flare_api_token" {
+  default = ""
+}
+variable "domain_name" {}
+variable "email" {}
+variable "github" {
+  default = ""
+}
+variable "id_rsa" {}
+variable "id_rsa_pub" {}
+variable "ip_address" {}
+
+variable "tls_crt" {
+  default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+}
+
+variable "tls_key" {
+  default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
+}

From b20b3f3835d7b9011bc4ee351df5b6c991a86e11 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sat, 27 May 2023 22:35:28 +0300
Subject: [PATCH 183/221] Terraform seems to work

---
 README.md                                | 140 +++++------------------
 kubernetes/terraform/.gitignore          |   1 -
 kubernetes/terraform/.terraform.lock.hcl |   7 +-
 kubernetes/terraform/helm/main.tf        |   6 -
 kubernetes/terraform/main.tf             |   3 +-
 kubernetes/terraform/variables.tf        |   1 -
 6 files changed, 33 insertions(+), 125 deletions(-)

diff --git a/README.md b/README.md
index 679e09d2f..0cb9de9c9 100644
--- a/README.md
+++ b/README.md
@@ -514,125 +514,41 @@ http ALL=(ALL) NOPASSWD: RESTART_TORNADO
 
 
 # Terraform
- I'm hosting pychat with:
+Terraform will allow you to automatically create pychat infrastructure for:
  - Cloudflare as CDN and DNS (free of charge)
- - Linode as Kubernetes provider (10$ per month of total for 1 instance of 2GB ram and 1vCPU)
+ - Linode as Kubernetes provider. It has the cheapest prices  (10$ per month is gonna be enough, that will use 1 node of 2GB ram and 1vCPU) along all providers with 500MB/s SSD, 99.99% SLA, 10Gb/s in and 2Gb/s out networks.
  - Letsencrypt as SSL certificate (free of charge)
- - Domain address (you have to decide on your own )
-
+ - Domain address (10$ per year)
  
 1. Go cloudflare and copy ZoneID and API token 
  - Copy zoneID: Go to https://dash.cloudflare.com/ - create a new site (or use existing one) grab an API Zone ID and place it into `kubernetes/terraform.tfvars`
  - Copy API token: go to https://dash.cloudflare.com/profile/api-tokens and create a new api token and place it into `kubernetes/terraform.tfvars`\
 
-If github is not defined backup is not gonna be used
-if cloudflare_api_token is not defined, certmanager is not gonna be used, turn server will not work, postfix will not send emails. Site is gonna be under local certificate
-Uplon linode cluster creation .kubeconfig will be generated in kubernetes/terraform/helm directory. After it all operations with helm will be using this conf. If this file is deleted helm will compain about missing kubernetes config
-
-1. Apply terraform:
- - `cd kubernetes/terraform; terraform apply`
- 
-# Kubernetes example with [linode](https://www.linode.com/).
-
-Minimal requirements: 
- - kubernetes cluster
- - own a domain, that's required for webrtc video.
- - 
- 0. Go through all files in ./kubernetes directory: 
-  - postfix/main.cf
-  - frontend-old-pychat.org.json
-  - nginx-old-pychat.org.conf
-  - turnserver.conf
-  - and other and replace domain pychat.org to yours.
- 1. Go to your provider dashboard, kubernetes -> create cluster, if it's not created yet.
- 2. After provisioning has finished, download `kubectl-config.yaml` from the linode dashboard and place it either at `~/.kube/config` or do export KUBECONFIG=/file/path . Verify that you can access the cluster with `kubectl get nodes`.
- 3. Create namespace pychat. `kubectl apply -f kubernetes/namespace.yaml`
- 4. Install nginx controller:
-  I have to come up with using custom yaml file for ingress instead of helm, since I need a few tweaks like tcp/udp port mapping, and purging redundant webhooks and etc.
-  You have 2 options, use standard way, with LoadBalancer provided by your k8s provider, which it will aditionally bill you (gcp 20$/m, linode 10$/m). Or inject some hacks which will expose ingress ip to public host.
-  4.1. Provider's load balancer
- - `kubectl apply -f ./kubernetes/ingress-controller-legacy-provider-load-balancer.yaml`
- - Check that you see load-banancer on your admin dashboard now.
- - Specify load-balancer ip address in your DNS provider.
-  4.2. Custom load balancer. This method assumes that you have ingress on some of your nodes. I only checked that it worked with a k8s cluster with a single node.
- - Edit `kubernetes/ingress-controller.yaml` and replace `externalIPs` to the one that your k8s node has.
- - `kubectl apply -f ./kubernetes/ingress-controller.yaml`
- - Specify your k8s node IP address in your dns provider.
-  5. If you don't have ssl certificate, lets use letsencrypt and certmanager to generate it for us.
- 
- 5.1. Install cert-manager
- - `kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.8.0/cert-manager.yaml`
- - `helm repo add jetstack https://charts.jetstack.io`
- - `helm repo update`
- - `helm template cert-manager jetstack/cert-manager --namespace cert-manager --version v1.8.0| kubectl apply -f -`
- 
- 5.2. Generate cloudflare token
- - In clodflare dashboard: Profile → API Tokens → Create Token.  https://dash.cloudflare.com/profile/api-tokens Permissions: Zone — DNS — Edit, Zone — Zone — Read; Zone Resources: Include — All Zones
- - put token into `kubernetes/cf-secret-yaml`. (mine is at mine private repo)
-```yaml
- apiVersion: v1
-kind: Secret
-metadata:
-  name: cloudflare-api-token-secret
-  namespace: pychat
-type: Opaque
-stringData:
-  api-token: cf-api-token
-```
- - `kubectl apply -f kubernetes/cf-secret.yaml`
- - `kubectl apply -f kubernetes/cert-manager.yaml`
- 
- 5.3. Verify certificate
- - Check that it's created `kubectl get secret pychat-tls -o yaml -n pychat`
- - save it to file: `echo base64certfrom-tls.cert |base64 -d > lol.cert`
- - Should give your domain `openssl x509 -in ./lol.cert  -noout -text`
- 6. Edit backend secret and deploy it: `kubernetes/backend-secret.yaml` (mine is at mine private repo). Check chat/settings_example.py to understand how to fill values:
-```
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: backend-secret
-  namespace: pychat
-stringData:
-  MYSQL_ROOT_PASSWORD: pypass
-  MYSQL_PASSWORD: pypass
-  MYSQL_USER: pychat
-  EMAIL_PORT: '25'
-  EMAIL_HOST: 'postfix-service'
-  EMAIL_HOST_USER: ''
-  EMAIL_HOST_PASSWORD: ''
-  SECRET_KEY: '***'
-  RECAPTCHA_PRIVATE_KEY: '***'
-  RECAPTCHA_PUBLIC_KEY: '****'
-  GOOGLE_OAUTH_2_CLIENT_ID: '****'
-  FACEBOOK_ACCESS_TOKEN: '****'
-  GIPHY_API_KEY: '****'
-  FIREBASE_API_KEY: '****'
-  DEFAULT_PROFILE_ID: '**'
-  SERVER_EMAIL: 'root@pychat.org'
-```
-deploy it with `kubectl apply -f kubernetes/backend-secret.yaml`. (Tip for myself For local minikube it's better to use pychat_data)
- 8. Build images and upload it to docker registry. Mine registries contain pychat.org domain:
-  - `docker build -f ./kubernetes/DockerfileOldFrontend -t deathangel908/pychat-frontend .`; `docker push deathangel908/pychat-frontend`
-  - `docker build -f ./kubernetes/DockerfileOldBackend -t deathangel908/pychat-backend .`; `docker push deathangel908/pychat-backend`
-  - `docker build -f ./kubernetes/DockerfilePostfix -t deathangel908/pychat-postfix .` ; `docker push deathangel908/pychat-postfix`
-  - `docker build -f ./kubernetes/DockerfilePostfix -t deathangel908/pychat-coturn .` ; `docker push deathangel908/pychat-coturn`
- 9. Setup kubernetes env:
-  - `kubectl apply -f kubernetes/pv-photo.yaml`
-  - `kubectl apply -f kubernetes/pv-redis.yaml`
-  - `kubectl apply -f kubernetes/pv-mariadb.yaml`
-  - `kubectl apply -f kubernetes/config-map.yaml`
-  - `kubectl apply -f kubernetes/mariadb.yaml`
-  - `kubectl apply -f kubernetes/redis.yaml`
-  - `kubectl apply -f kubernetes/migrate-backend.yaml`
-  - `kubectl apply -f kubernetes/backend.yaml`
-  - `kubectl apply -f kubernetes/frontend.yaml`
-  - `kubectl apply -f kubernetes/ingress.yaml`
-  - `kubectl apply -f kubernetes/postfix.yaml`
-  - `kubectl apply -f kubernetes/coturn.yaml`
-
- 10. For postfix (email server) do not forget to add spf record to cloudflare. Create new TXT record on cloudflare with name/alias `@` (for root domain) and value `v=spf1 ip4:34.243.61.237` where 34:243:61:237 is your NODE's ip in kube with postfix instance. Do not confuse it with ingres/nginx instance
+1. Backups:
+ Backups are done using private git repository. It includes sql dump + photo directory
+ - Create a private repo (e.g. github)
+ - Specify `github="git@github.com:username/backup_repo.git"` in `terraform.tfvars`
+ - Generate a new keypair with `ssh-keygen -t rsa -b 4096 -C "kube backup" -f  /tmp/sshkey/id_rsa -N ""` 
+ - Put public key to your git server (for Github it's Settings (on dashboard) -> Deploy Keys -> Add deploy key)
+ - Put `id_rsa_pub="ssh-rsa aa..."` to  `terraform.tfvars`
+ - Put `id_rsa= <<-EOT -----BEGIN OPENSSH PRIVATE KEY-----... -----END OPENSSH PRIVATE KEY----- EOT` to to  `terraform.tfvars`
+ k8s wil have a cronjob backend-backup which will run each hour.
+2. Self sign certificate: 
+ If you don't own a domain and planning to use ip + self signed certificate, this will result:
+- certmanager will not deploy be used
+- turn server will not work,
+- postfix will not send emails, including registration and password reset
+- Site is gonna be under self-signed certificate and will prompt errors.
+This is still possible
+
+Upon linode cluster creation .kubeconfig will be generated in kubernetes/terraform/helm directory. After it all operations with helm will be using this conf. If this file is deleted helm will compain about missing kubernetes config
+
+1. If you already own a k8s cluster.
+All helm charts are located in kubernetes/terraform/helm, we will apply terraform from this directory to exclude linode and cloudlfare resource creation
+ - cd kubernetes/terraform/helm
+ -  create `terraform.tf` in this directory and put all required content in it.
+ - `terraform init`
+ - `terraform apply`
 
 
 # Troubleshooting
diff --git a/kubernetes/terraform/.gitignore b/kubernetes/terraform/.gitignore
index 40ab1b851..de08a2314 100644
--- a/kubernetes/terraform/.gitignore
+++ b/kubernetes/terraform/.gitignore
@@ -1,7 +1,6 @@
 .terraform
 terraform.tfvars
 terraform.tfstate
-.terraform.lock.hcl
 terraform.tfstate.backup
 .terraform.tfstate.lock.info
 helm/.kubeconfig
diff --git a/kubernetes/terraform/.terraform.lock.hcl b/kubernetes/terraform/.terraform.lock.hcl
index 8477fbe4f..f0c431ff1 100644
--- a/kubernetes/terraform/.terraform.lock.hcl
+++ b/kubernetes/terraform/.terraform.lock.hcl
@@ -3,7 +3,7 @@
 
 provider "registry.terraform.io/cloudflare/cloudflare" {
   version     = "3.35.0"
-  constraints = "~> 3.0"
+  constraints = "3.35.0"
   hashes = [
     "h1:SFvdgX5bTGhOTMhywgjSOWlkET2el7STxdUSzxjz2pc=",
     "zh:13aabc00fee823422831bcc870227650cc765fc4c9622074d24d6d62a4ac0e37",
@@ -26,7 +26,7 @@ provider "registry.terraform.io/cloudflare/cloudflare" {
 
 provider "registry.terraform.io/hashicorp/helm" {
   version     = "2.9.0"
-  constraints = ">= 1.3.2"
+  constraints = "2.9.0"
   hashes = [
     "h1:D5BLFN82WndhQZQleXE5rO0hUDnlyqb60XeUJKDhuo4=",
     "zh:1471cb45908b426104687c962007b2980cfde294fa3530fabc4798ce9fb6c20c",
@@ -64,7 +64,8 @@ provider "registry.terraform.io/hashicorp/local" {
 }
 
 provider "registry.terraform.io/linode/linode" {
-  version = "2.2.0"
+  version     = "2.2.0"
+  constraints = "2.2.0"
   hashes = [
     "h1:YG2urGW0CqbGwwayR+j1e25CEpVgm6D2wkIqg6zXxHw=",
     "zh:0768aa158caa098c36627e012714a25610c2e8c15e828e18d2fc94557d8abdfa",
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index a9f416095..4d4971551 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -70,12 +70,6 @@ resource "helm_release" "certmanager-definition" {
   depends_on = [helm_release.global]
 }
 
-#resource "time_sleep" "wait_certmanager" {
-#  create_duration = "3s"
-#
-#  depends_on = [helm_release.certmanager-definition]
-#}
-
 resource "helm_release" "certmanager" {
   name  = "certmanager"
   chart = "${path.module}/charts/certmanager"
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index a5e32d595..4e4d74c5d 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -4,8 +4,7 @@ module "linode" {
 }
 
 module "cloudflare" {
-  count = var.cloud_flare_api_token == "" ? 0 : 1
-  source                  = "./cloudflare"
+  source  = "./cloudflare"
   cloud_flare_api_token = var.cloud_flare_api_token
   cloud_flare_zone_id = var.cloud_flare_zone_id
   domain_name = var.domain_name
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 35d97e17a..7be89f245 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -35,7 +35,6 @@ variable "github" {
 }
 variable "id_rsa" {}
 variable "id_rsa_pub" {}
-variable "ip_address" {}
 
 variable "tls_crt" {
   default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"

From 679f7dbc8194cd2aba39850505e88fc4b19497f5 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 00:37:41 +0300
Subject: [PATCH 184/221] Added docker registry

---
 kubernetes/terraform/cloudflare/main.tf       |  9 +++
 .../helm/charts/docker-registry/Chart.yaml    |  6 ++
 .../charts/docker-registry/templates/cm.yaml  | 11 ++++
 .../docker-registry/templates/deployment.yaml | 58 +++++++++++++++++++
 .../docker-registry/templates/ingress.yaml    | 21 +++++++
 .../charts/docker-registry/templates/pv.yaml  | 11 ++++
 .../charts/docker-registry/templates/pvc.yaml | 13 +++++
 .../docker-registry/templates/secret.yaml     |  8 +++
 .../helm/charts/docker-registry/values.yaml   |  4 ++
 .../charts/self-signed/templates/secret.yaml  |  2 +-
 kubernetes/terraform/helm/main.tf             | 14 +++++
 kubernetes/terraform/helm/variables.tf        |  3 +
 kubernetes/terraform/main.tf                  |  1 +
 kubernetes/terraform/variables.tf             |  4 +-
 14 files changed, 163 insertions(+), 2 deletions(-)
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/Chart.yaml
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/templates/ingress.yaml
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/templates/pvc.yaml
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/templates/secret.yaml
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/values.yaml

diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 84ab94d3d..9a3509afc 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -16,6 +16,15 @@ resource "cloudflare_record" "static_pychat" {
   zone_id = var.cloud_flare_zone_id
 }
 
+resource "cloudflare_record" "static_pychat" {
+  name    = "registry"
+  proxied = false
+  ttl     = 1
+  type    = "A"
+  value   =  var.ip_address
+  zone_id = var.cloud_flare_zone_id
+}
+
 resource "cloudflare_record" "www_pychat" {
   name    = "www"
   proxied = false
diff --git a/kubernetes/terraform/helm/charts/docker-registry/Chart.yaml b/kubernetes/terraform/helm/charts/docker-registry/Chart.yaml
new file mode 100644
index 000000000..89fbca3fd
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: docker registry
+description: private docker registry to hold docker images
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
new file mode 100644
index 000000000..5d8e6679f
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm-registry
+  namespace: pychat
+data:
+  REGISTRY_AUTH_HTPASSWD_PATH: '/auth/htpasswd'
+  REGISTRY_HTTP_TLS_CERTIFICATE: '/etc/tls/crt.pem'
+  REGISTRY_HTTP_TLS_KEY: '/etc/tls/key.pem'
+  REGISTRY_AUTH: 'htpasswd'
+
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
new file mode 100644
index 000000000..5cf9c333d
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
@@ -0,0 +1,58 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: docker-registry-deployment
+  namespace: pychat
+  labels:
+    app: docker-registry
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: docker-registry
+  template:
+    metadata:
+      labels:
+        app: docker-registry
+    spec:
+      containers:
+      - name: docker-registry
+        imagePullPolicy: IfNotPresent
+        image: registry:2.8.2
+        ports:
+        - containerPort: 5000
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 5000
+        envFrom:
+        - secretRef:
+            name: docker-secret
+        volumeMounts:
+        - name: pychat-registry-tls
+          mountPath: "/etc/tls"
+          readOnly: true
+        - mountPath: "/var/lib/registry"
+          name: registry-data
+        - mountPath: "/auth"
+          name: registry-auth-file
+      volumes:
+        - name: registry-data
+          persistentVolumeClaim:
+            claimName: pvc-registry-data
+        - name: registry-auth-file
+          secret:
+            secretName: docker-secret
+            items:
+              - key: htpasswd
+                path: htpasswd
+        - name: pychat-registry-tls
+          secret:
+            secretName: pychat-tls
+            items:
+              - key: tls.crt
+                path: crt.pem
+              - key: tls.key
+                path: key.pem
+
+
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/ingress.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/ingress.yaml
new file mode 100644
index 000000000..57f345017
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/ingress.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    cert-manager.io/issuer: "letsencrypt-prod"
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "6000"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "6000"
+  name: ingress-docker
+  namespace: pychat
+spec:
+  ingressClassName: nginx
+  tls:
+  - hosts:
+    - "registry.{{ .Values.domain_name }}"
+    secretName: pychat-tls
+  defaultBackend:
+    service:
+      name: docker-registry-service
+      port:
+        number: 5000
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
new file mode 100644
index 000000000..d26c04d66
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-registry
+spec:
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: {{ .Values.disk_size }}
+  hostPath:
+    path: /data/registry
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/pvc.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/pvc.yaml
new file mode 100644
index 000000000..5048a1b0e
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/pvc.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-registry-data
+  namespace: pychat
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.disk_size }}
+  storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
+  volumeName: pv-registry
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/secret.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/secret.yaml
new file mode 100644
index 000000000..74a7821fe
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: docker-secret
+  namespace: pychat
+stringData:
+  htpasswd: "{{ .Values.htpasswd }}"
diff --git a/kubernetes/terraform/helm/charts/docker-registry/values.yaml b/kubernetes/terraform/helm/charts/docker-registry/values.yaml
new file mode 100644
index 000000000..6b69158f7
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/values.yaml
@@ -0,0 +1,4 @@
+domain_name: $domain_name
+disk_size: 15Gi
+htpasswd: $htpasswd
+# docker run --entrypoint htpasswd httpd:2 -Bbn testuser testpassword
diff --git a/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml b/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
index 79588563d..c8eb6e726 100644
--- a/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
@@ -3,7 +3,7 @@ kind: Secret
 type: kubernetes.io/tls
 metadata:
   name: self-signed-certificate
-  namespace: pychat-tls
+  namespace: pychat
 data:
   tls.crt: "{{ .Value.tls_crt }} "
   tls.key: "{{ .Value.tls_key }}"
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 4d4971551..73feae05b 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -102,6 +102,20 @@ resource "helm_release" "self-signed" {
   }
 }
 
+resource "helm_release" "docker-registry" {
+  count = var.htpasswd == "" ? 0 : 1
+  name  = "docker-registry"
+  chart = "${path.module}/charts/docker-registry"
+  set {
+    name  = "domain_name"
+    value = var.domain_name
+  }
+  set {
+    name  = "htpasswd"
+    value = var.htpasswd
+  }
+}
+
 resource "helm_release" "backup" {
   count = var.github == ""? 1 : 0
   name       = "backup"
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 02430c473..02754acc8 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -14,6 +14,9 @@ variable "FIREBASE_API_KEY" {}
 variable "DEFAULT_PROFILE_ID" {}
 variable "kubeconfig" {}
 variable "tls_crt" {}
+variable "htpasswd" {
+  default = ""
+}
 variable "tls_key" {}
 variable "cloud_flare_api_token" {}
 variable "mysql_password" {
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index 4e4d74c5d..79e2977b7 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -18,6 +18,7 @@ module "helm" {
   ip_address = module.linode.ip_address
   cloud_flare_api_token = var.cloud_flare_api_token
   email = var.email
+  htpasswd = var.htpasswd
   github = var.github
   id_rsa = var.id_rsa
   id_rsa_pub = var.id_rsa_pub
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 7be89f245..4133bb3fc 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -22,7 +22,9 @@ variable "FIREBASE_API_KEY" {
 variable "DEFAULT_PROFILE_ID" {
   default = "1"
 }
-
+variable "htpasswd" {
+  default = ""
+}
 variable "linode_token" {}
 variable "cloud_flare_zone_id" {}
 variable "cloud_flare_api_token" {

From 4e10e7fa8e85bfdf532a53b89344bb7652a3d7e8 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 01:05:05 +0300
Subject: [PATCH 185/221] Docker registry works w/o password

---
 kubernetes/terraform/cloudflare/main.tf       |  4 +-
 .../docker-registry/templates/deployment.yaml |  2 -
 .../docker-registry/templates/ingress.yaml    | 21 ---------
 .../docker-registry/templates/service.yaml    | 12 +++++
 .../charts/ingress/templates/ingress.yaml     | 17 ++++++-
 .../terraform/helm/charts/ingress/values.yaml |  3 +-
 kubernetes/terraform/helm/main.tf             | 19 +++++---
 kubernetes/terraform/variables.tf             | 44 +++++++++----------
 8 files changed, 65 insertions(+), 57 deletions(-)
 delete mode 100644 kubernetes/terraform/helm/charts/docker-registry/templates/ingress.yaml
 create mode 100644 kubernetes/terraform/helm/charts/docker-registry/templates/service.yaml

diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 9a3509afc..94082b985 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -12,7 +12,7 @@ resource "cloudflare_record" "static_pychat" {
   proxied = true
   ttl     = 1
   type    = "A"
-  value   =  var.ip_address
+  value   = var.ip_address
   zone_id = var.cloud_flare_zone_id
 }
 
@@ -21,7 +21,7 @@ resource "cloudflare_record" "static_pychat" {
   proxied = false
   ttl     = 1
   type    = "A"
-  value   =  var.ip_address
+  value   = var.ip_address
   zone_id = var.cloud_flare_zone_id
 }
 
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
index 5cf9c333d..725072f38 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
@@ -54,5 +54,3 @@ spec:
                 path: crt.pem
               - key: tls.key
                 path: key.pem
-
-
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/ingress.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/ingress.yaml
deleted file mode 100644
index 57f345017..000000000
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/ingress.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    cert-manager.io/issuer: "letsencrypt-prod"
-    nginx.ingress.kubernetes.io/proxy-body-size: "0"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "6000"
-    nginx.ingress.kubernetes.io/proxy-send-timeout: "6000"
-  name: ingress-docker
-  namespace: pychat
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - "registry.{{ .Values.domain_name }}"
-    secretName: pychat-tls
-  defaultBackend:
-    service:
-      name: docker-registry-service
-      port:
-        number: 5000
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/service.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/service.yaml
new file mode 100644
index 000000000..617084094
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/service.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: registry-service
+  namespace: pychat
+spec:
+  selector:
+    app: docker-registry
+  ports:
+    - protocol: TCP
+      port: 5000
+      targetPort: 5000
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
index d2603f42e..61b851708 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
@@ -3,7 +3,9 @@ kind: Ingress
 metadata:
   annotations:
     cert-manager.io/issuer: "letsencrypt-prod"
-    nginx.ingress.kubernetes.io/proxy-body-size: 75m
+    nginx.ingress.kubernetes.io/proxy-body-size: "200m"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "6000"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "6000"
   name: ingress
   namespace: pychat
 spec:
@@ -12,6 +14,7 @@ spec:
   - hosts:
     - "{{ .Values.domain_name }}"
     - "static.{{ .Values.domain_name }}"
+    - "registry.{{ .Values.domain_name }}"
     secretName: pychat-tls
   defaultBackend:
     service:
@@ -53,3 +56,15 @@ spec:
             name: frontend-service
             port:
               number: 80
+{{ if ne .Values.htpasswd "" }}
+  - host: "registry.{{ .Values.domain_name }}"
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: registry-service
+            port:
+              number: 5000
+{{ end }}
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
index d61b2a50e..38fa2da43 100644
--- a/kubernetes/terraform/helm/charts/ingress/values.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -1,4 +1,5 @@
 udp_port_range_start: 49152
-udp_port_range_end: 49252
+udp_port_range_end: 49352
 external_ip: $external_ip
 domain_name: $domain_name
+htpasswd: $htpasswd
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 73feae05b..7fbf02ae1 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -59,12 +59,12 @@ resource "helm_release" "backend" {
 }
 
 resource "helm_release" "certmanager-definition" {
-  name = "cert-manager-definition"
-  chart = "jetstack/cert-manager"
-  version = "1.12.0"
+  name      = "cert-manager-definition"
+  chart     = "jetstack/cert-manager"
+  version   = "1.12.0"
   namespace = "cert-manager"
   set {
-    name = "installCRDs"
+    name  = "installCRDs"
     value = true
   }
   depends_on = [helm_release.global]
@@ -97,9 +97,10 @@ resource "helm_release" "self-signed" {
     value = var.tls_crt
   }
   set {
-     name  = "tls_key"
+    name  = "tls_key"
     value = var.tls_key
   }
+  depends_on = [helm_release.global]
 }
 
 resource "helm_release" "docker-registry" {
@@ -114,10 +115,11 @@ resource "helm_release" "docker-registry" {
     name  = "htpasswd"
     value = var.htpasswd
   }
+  depends_on = [helm_release.global]
 }
 
 resource "helm_release" "backup" {
-  count = var.github == ""? 1 : 0
+  count      = var.github == ""? 1 : 0
   name       = "backup"
   chart      = "${path.module}/charts/backup"
   depends_on = [helm_release.mariadb, helm_release.backend] // because of pvc-photo
@@ -174,7 +176,10 @@ resource "helm_release" "ingress" {
   set {
     name  = "domain_name"
     value = var.domain_name
-
+  }
+  set {
+    name  = "htpasswd"
+    value = var.htpasswd
   }
   set {
     name  = "external_ip"
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 4133bb3fc..72825eb46 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -1,3 +1,24 @@
+variable "cloud_flare_api_token" {
+  default = ""
+}
+variable "linode_token" {}
+variable "cloud_flare_zone_id" {}
+variable "id_rsa" {}
+variable "id_rsa_pub" {}
+variable "domain_name" {}
+variable "email" {}
+variable "github" {
+  default = ""
+}
+variable "htpasswd" {
+  default = "testuser:$2y$05$cr2mYZkI8asxGO6fZ9FGFO4le/80hkiwQc.X/PRuWhXO2u53U7PDG"
+}
+variable "tls_crt" {
+  default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+}
+variable "tls_key" {
+  default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
+}
 variable "SECRET_KEY" {
   default = "GEvcy2yoMOu6OaJj0ZIt"
 }
@@ -22,26 +43,3 @@ variable "FIREBASE_API_KEY" {
 variable "DEFAULT_PROFILE_ID" {
   default = "1"
 }
-variable "htpasswd" {
-  default = ""
-}
-variable "linode_token" {}
-variable "cloud_flare_zone_id" {}
-variable "cloud_flare_api_token" {
-  default = ""
-}
-variable "domain_name" {}
-variable "email" {}
-variable "github" {
-  default = ""
-}
-variable "id_rsa" {}
-variable "id_rsa_pub" {}
-
-variable "tls_crt" {
-  default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
-}
-
-variable "tls_key" {
-  default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
-}

From 50276c4d67763c2831367151c37a030787f914d8 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 04:39:27 +0300
Subject: [PATCH 186/221] Docker coturn and postfix are stateless now

---
 .dockerignore                                 |  7 ++--
 kubernetes/DockerfileCoturn                   | 10 ------
 kubernetes/DockerfilePostfix                  | 11 -------
 kubernetes/{ => docker}/DockerfileBackend     |  2 +-
 kubernetes/{ => docker}/DockerfileBackup      |  2 +-
 kubernetes/{ => docker}/DockerfileFrontend    |  9 +++--
 .../{ => docker}/DockerfileMinikubeFrontend   |  2 +-
 kubernetes/{ => docker}/DockerfileOldBackend  |  2 +-
 kubernetes/{ => docker}/DockerfileOldFrontend |  4 +--
 kubernetes/{ => docker}/backup.sh             |  0
 .../{ => docker}/frontend-minikube.json       |  0
 .../{ => docker}/frontend-old-pychat.org.json |  0
 kubernetes/{ => docker}/frontend.json         |  0
 .../{ => docker}/nginx-old-pychat.org.conf    |  0
 kubernetes/{ => docker}/nginx.conf            |  0
 kubernetes/docker/postfix/Dockerfile          | 12 +++++++
 kubernetes/docker/postfix/entrypoint.bash     |  5 +++
 kubernetes/{ => docker}/postfix/main.cf       |  4 +--
 kubernetes/{ => docker}/postfix/master.cf     |  0
 kubernetes/docker/turnserver/Dockerfile       | 10 ++++++
 kubernetes/docker/turnserver/entrypoint.bash  |  8 +++++
 .../{ => docker/turnserver}/turnserver.conf   | 10 +++---
 kubernetes/terraform/.terraform.lock.hcl      | 22 +++++++++++++
 kubernetes/terraform/cloudflare/main.tf       |  2 +-
 .../terraform/helm/charts/coturn/Chart.yaml   |  2 +-
 .../helm/charts/coturn/templates/cm.yaml      | 11 +++++++
 .../charts/coturn/templates/deployment.yaml   |  7 ++--
 .../terraform/helm/charts/coturn/values.yaml  | 11 +++++--
 .../charts/docker-registry/templates/cm.yaml  |  3 +-
 .../docker-registry/templates/deployment.yaml | 16 ++-------
 .../helm/charts/docker-registry/values.yaml   |  1 -
 .../terraform/helm/charts/ingress/values.yaml |  4 +--
 .../helm/charts/postfix/templates/cm.yaml     |  7 ++++
 .../charts/postfix/templates/deployment.yaml  |  3 ++
 .../terraform/helm/charts/postfix/values.yaml |  1 +
 kubernetes/terraform/helm/main.tf             | 33 +++++++++++++++++++
 kubernetes/terraform/helm/variables.tf        | 12 +++++++
 kubernetes/terraform/variables.tf             |  3 +-
 38 files changed, 172 insertions(+), 64 deletions(-)
 delete mode 100644 kubernetes/DockerfileCoturn
 delete mode 100644 kubernetes/DockerfilePostfix
 rename kubernetes/{ => docker}/DockerfileBackend (91%)
 rename kubernetes/{ => docker}/DockerfileBackup (63%)
 rename kubernetes/{ => docker}/DockerfileFrontend (74%)
 rename kubernetes/{ => docker}/DockerfileMinikubeFrontend (92%)
 rename kubernetes/{ => docker}/DockerfileOldBackend (89%)
 rename kubernetes/{ => docker}/DockerfileOldFrontend (84%)
 rename kubernetes/{ => docker}/backup.sh (100%)
 rename kubernetes/{ => docker}/frontend-minikube.json (100%)
 rename kubernetes/{ => docker}/frontend-old-pychat.org.json (100%)
 rename kubernetes/{ => docker}/frontend.json (100%)
 rename kubernetes/{ => docker}/nginx-old-pychat.org.conf (100%)
 rename kubernetes/{ => docker}/nginx.conf (100%)
 create mode 100644 kubernetes/docker/postfix/Dockerfile
 create mode 100644 kubernetes/docker/postfix/entrypoint.bash
 rename kubernetes/{ => docker}/postfix/main.cf (96%)
 rename kubernetes/{ => docker}/postfix/master.cf (100%)
 create mode 100644 kubernetes/docker/turnserver/Dockerfile
 create mode 100644 kubernetes/docker/turnserver/entrypoint.bash
 rename kubernetes/{ => docker/turnserver}/turnserver.conf (53%)
 create mode 100644 kubernetes/terraform/helm/charts/coturn/templates/cm.yaml
 create mode 100644 kubernetes/terraform/helm/charts/postfix/templates/cm.yaml

diff --git a/.dockerignore b/.dockerignore
index a4ccc2076..f9470ec05 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -20,9 +20,10 @@ frontend/build/production.json
 !frontend/tsconfig.node.json
 !docker/populate
 !docker/tornado
-!kubernetes/frontend-old-pychat.org.json
-!kubernetes/nginx-old-pychat.org.conf
-!kubernetes/frontend-minikube.json
+!kubernetes/docker/frontend-old-pychat.org.json
+!kubernetes/docker/nginx-old-pychat.org.conf
+!kubernetes/docker/frontend-minikube.json
+!kubernetes/docker/docker/postfix/postfix_replacer.bash
 !docker/nginx.conf
 !docker/nginx
 !docker/pychat.org/certificate.crt
diff --git a/kubernetes/DockerfileCoturn b/kubernetes/DockerfileCoturn
deleted file mode 100644
index 2374dc0b1..000000000
--- a/kubernetes/DockerfileCoturn
+++ /dev/null
@@ -1,10 +0,0 @@
-# docker build -f ./kubernetes/DockerfileCoturn -t deathangel908/pychat-coturn .
-# docker push deathangel908/pychat-coturn
-
-FROM alpine:3.17.3
-RUN apk update && \
-    apk add --no-cache coturn
-
-COPY ./kubernetes/turnserver.conf /etc/coturn/turnserver.conf
-
-CMD ["/usr/bin/turnserver"]
diff --git a/kubernetes/DockerfilePostfix b/kubernetes/DockerfilePostfix
deleted file mode 100644
index 0de2db553..000000000
--- a/kubernetes/DockerfilePostfix
+++ /dev/null
@@ -1,11 +0,0 @@
-# docker build -f ./kubernetes/DockerfilePostfix -t deathangel908/pychat-postfix .
-# docker push deathangel908/pychat-postfix
-
-FROM alpine:3.17.3
-RUN apk update && \
-    apk add --no-cache postfix policyd-spf-fs
-
-COPY ./kubernetes/postfix/main.cf /etc/postfix/main.cf
-COPY ./kubernetes/postfix/master.cf /etc/postfix/master.cf
-RUN /usr/bin/newaliases
-CMD ["/usr/sbin/postfix", "start-fg"]
diff --git a/kubernetes/DockerfileBackend b/kubernetes/docker/DockerfileBackend
similarity index 91%
rename from kubernetes/DockerfileBackend
rename to kubernetes/docker/DockerfileBackend
index c0fdef46d..19374106e 100644
--- a/kubernetes/DockerfileBackend
+++ b/kubernetes/docker/DockerfileBackend
@@ -1,5 +1,5 @@
 # cd <root>
-# docker build -f ./kubernetes/DockerfileBackend -t deathangel908/pychat-backend .
+# docker build -f ./kubernetes/docker/DockerfileBackend -t deathangel908/pychat-backend .
 # https://stackoverflow.com/a/49478889/3872976
 # minikube tunnel service/backend-service
 # chrome http://192.168.49.2:30002/
diff --git a/kubernetes/DockerfileBackup b/kubernetes/docker/DockerfileBackup
similarity index 63%
rename from kubernetes/DockerfileBackup
rename to kubernetes/docker/DockerfileBackup
index 4b36dd09c..e2173346d 100644
--- a/kubernetes/DockerfileBackup
+++ b/kubernetes/docker/DockerfileBackup
@@ -1,4 +1,4 @@
-# docker build -f ./kubernetes/DockerfileBackup -t deathangel908/pychat-backup .
+# docker build -f ./kubernetes/docker/DockerfileBackup -t deathangel908/pychat-backup .
 # docker push deathangel908/pychat-backup
 
 FROM alpine:3.15
diff --git a/kubernetes/DockerfileFrontend b/kubernetes/docker/DockerfileFrontend
similarity index 74%
rename from kubernetes/DockerfileFrontend
rename to kubernetes/docker/DockerfileFrontend
index a208fd807..1632477a4 100644
--- a/kubernetes/DockerfileFrontend
+++ b/kubernetes/docker/DockerfileFrontend
@@ -1,5 +1,5 @@
 # cd <root>
-# docker build -f ./kubernetes/DockerfileFrontend -t deathangel908/pychat-frontend .
+# docker build -f ./kubernetes/docker/DockerfileFrontend -t deathangel908/pychat-frontend .
 # https://stackoverflow.com/a/49478889/3872976
 # minikube tunnel service/backend-service
 FROM node:16.15-alpine3.15 as builder
@@ -15,7 +15,12 @@ COPY ./frontend/tsconfig.node.json ./frontend/tsconfig.json ./
 COPY ./frontend/src ./src/
 COPY ./frontend/build ./build/
 COPY ./common/src /usr/src/common/src
-COPY ./kubernetes/frontend.json ./build/production.json
+COPY ./kubernetes/docker/frontend.json ./build/production.json
+
+ARG PYCHAT_GIT_HASH
+ENV PYCHAT_GIT_HASH=${PYCHAT_GIT_HASH}
+RUN echo $PYCHAT_GIT_HASH
+RUN yarn build
 
 RUN yarn build
 
diff --git a/kubernetes/DockerfileMinikubeFrontend b/kubernetes/docker/DockerfileMinikubeFrontend
similarity index 92%
rename from kubernetes/DockerfileMinikubeFrontend
rename to kubernetes/docker/DockerfileMinikubeFrontend
index 2fcfef967..13693b305 100644
--- a/kubernetes/DockerfileMinikubeFrontend
+++ b/kubernetes/docker/DockerfileMinikubeFrontend
@@ -14,7 +14,7 @@ RUN yarn install --frozen-lockfile
 COPY ./frontend/tsconfig.node.json ./frontend/tsconfig.json ./
 COPY ./frontend/src ./src/
 COPY ./frontend/build ./build/
-COPY ./kubernetes/frontend-minikube.json ./build/production.json
+COPY ./kubernetes/docker/frontend-minikube.json ./build/production.json
 
 ARG PYCHAT_GIT_HASH
 ENV PYCHAT_GIT_HASH=${PYCHAT_GIT_HASH}
diff --git a/kubernetes/DockerfileOldBackend b/kubernetes/docker/DockerfileOldBackend
similarity index 89%
rename from kubernetes/DockerfileOldBackend
rename to kubernetes/docker/DockerfileOldBackend
index 86614d0d7..c0da0e3c1 100644
--- a/kubernetes/DockerfileOldBackend
+++ b/kubernetes/docker/DockerfileOldBackend
@@ -1,4 +1,4 @@
-# docker build -f ./kubernetes/DockerfileOldBackend -t deathangel908/pychat-backend .
+# docker build -f ./kubernetes/docker/DockerfileOldBackend -t deathangel908/pychat-backend .
 # docker push deathangel908/pychat-backend
 FROM alpine:3.15
 
diff --git a/kubernetes/DockerfileOldFrontend b/kubernetes/docker/DockerfileOldFrontend
similarity index 84%
rename from kubernetes/DockerfileOldFrontend
rename to kubernetes/docker/DockerfileOldFrontend
index 3c4505549..a15cfe8e8 100644
--- a/kubernetes/DockerfileOldFrontend
+++ b/kubernetes/docker/DockerfileOldFrontend
@@ -1,5 +1,5 @@
 # cd <root>
-# docker build --build-arg PYCHAT_GIT_HASH=`git rev-parse --short=10 HEAD`  -f ./kubernetes/DockerfileOldFrontend -t deathangel908/pychat-frontend .
+# docker build --build-arg PYCHAT_GIT_HASH=`git rev-parse --short=10 HEAD`  -f ./kubernetes/docker/DockerfileOldFrontend -t deathangel908/pychat-frontend .
 # docker push deathangel908/pychat-frontend
 # https://stackoverflow.com/a/49478889/3872976
 # minikube tunnel service/backend-service
@@ -15,7 +15,7 @@ RUN yarn install --frozen-lockfile
 COPY ./frontend/tsconfig.node.json ./frontend/tsconfig.json ./
 COPY ./frontend/src ./src/
 COPY ./frontend/build ./build/
-COPY ./kubernetes/frontend-old-pychat.org.json ./build/production.json
+COPY ./kubernetes/docker/frontend-old-pychat.org.json ./build/production.json
 
 ARG PYCHAT_GIT_HASH
 ENV PYCHAT_GIT_HASH=${PYCHAT_GIT_HASH}
diff --git a/kubernetes/backup.sh b/kubernetes/docker/backup.sh
similarity index 100%
rename from kubernetes/backup.sh
rename to kubernetes/docker/backup.sh
diff --git a/kubernetes/frontend-minikube.json b/kubernetes/docker/frontend-minikube.json
similarity index 100%
rename from kubernetes/frontend-minikube.json
rename to kubernetes/docker/frontend-minikube.json
diff --git a/kubernetes/frontend-old-pychat.org.json b/kubernetes/docker/frontend-old-pychat.org.json
similarity index 100%
rename from kubernetes/frontend-old-pychat.org.json
rename to kubernetes/docker/frontend-old-pychat.org.json
diff --git a/kubernetes/frontend.json b/kubernetes/docker/frontend.json
similarity index 100%
rename from kubernetes/frontend.json
rename to kubernetes/docker/frontend.json
diff --git a/kubernetes/nginx-old-pychat.org.conf b/kubernetes/docker/nginx-old-pychat.org.conf
similarity index 100%
rename from kubernetes/nginx-old-pychat.org.conf
rename to kubernetes/docker/nginx-old-pychat.org.conf
diff --git a/kubernetes/nginx.conf b/kubernetes/docker/nginx.conf
similarity index 100%
rename from kubernetes/nginx.conf
rename to kubernetes/docker/nginx.conf
diff --git a/kubernetes/docker/postfix/Dockerfile b/kubernetes/docker/postfix/Dockerfile
new file mode 100644
index 000000000..9be80ddbb
--- /dev/null
+++ b/kubernetes/docker/postfix/Dockerfile
@@ -0,0 +1,12 @@
+# docker build -f ./kubernetes/docker/postfix/Dockerfile -t deathangel908/pychat-postfix .
+# docker push deathangel908/pychat-postfix
+
+FROM alpine:3.17.3
+RUN apk update && \
+    apk add --no-cache postfix policyd-spf-fs bash
+
+COPY ./kubernetes/docker/postfix/entrypoint.bash /bin
+COPY ./kubernetes/docker/postfix/main.cf /etc/postfix/main.cf
+COPY ./kubernetes/docker/postfix/master.cf /etc/postfix/master.cf
+
+CMD ["/bin/bash", "/bin/entrypoint.bash"]
diff --git a/kubernetes/docker/postfix/entrypoint.bash b/kubernetes/docker/postfix/entrypoint.bash
new file mode 100644
index 000000000..2297e3bb7
--- /dev/null
+++ b/kubernetes/docker/postfix/entrypoint.bash
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sed -i "s|DOMAIN_NAME|$DOMAIN_NAME|g" /etc/postfix/main.cf && \
+/usr/bin/newaliases && \
+/usr/sbin/postfix start-fg
diff --git a/kubernetes/postfix/main.cf b/kubernetes/docker/postfix/main.cf
similarity index 96%
rename from kubernetes/postfix/main.cf
rename to kubernetes/docker/postfix/main.cf
index 0c10b00a2..c67c1198d 100644
--- a/kubernetes/postfix/main.cf
+++ b/kubernetes/docker/postfix/main.cf
@@ -5,8 +5,8 @@ daemon_directory = /usr/libexec/postfix
 data_directory = /var/lib/postfix
 mail_spool_directory = /var/spool/mail
 mail_owner = postfix
-myhostname = pychat.org
-mydomain = pychat.org
+myhostname = DOMAIN_NAME
+mydomain = DOMAIN_NAME
 maillog_file = /dev/stdout
 myorigin = $mydomain
 inet_interfaces = all
diff --git a/kubernetes/postfix/master.cf b/kubernetes/docker/postfix/master.cf
similarity index 100%
rename from kubernetes/postfix/master.cf
rename to kubernetes/docker/postfix/master.cf
diff --git a/kubernetes/docker/turnserver/Dockerfile b/kubernetes/docker/turnserver/Dockerfile
new file mode 100644
index 000000000..20af93620
--- /dev/null
+++ b/kubernetes/docker/turnserver/Dockerfile
@@ -0,0 +1,10 @@
+# docker build -f ./kubernetes/docker/turnserver/Dockerfile -t deathangel908/pychat-coturn .
+# docker push deathangel908/pychat-coturn
+
+FROM alpine:3.17.3
+RUN apk update && \
+    apk add --no-cache coturn bash
+
+COPY ./kubernetes/docker/turnserver/turnserver.conf /etc/coturn/turnserver.conf
+COPY ./kubernetes/docker/turnserver/entrypoint.bash /bin
+CMD ["/bin/bash", "/bin/entrypoint.bash"]
diff --git a/kubernetes/docker/turnserver/entrypoint.bash b/kubernetes/docker/turnserver/entrypoint.bash
new file mode 100644
index 000000000..96b644463
--- /dev/null
+++ b/kubernetes/docker/turnserver/entrypoint.bash
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+sed -i "s|MIN_PORT|$MIN_PORT|g" /etc/coturn/turnserver.conf && \
+sed -i "s|MAX_PORT|$MAX_PORT|g" /etc/coturn/turnserver.conf && \
+sed -i "s|DOMAIN_NAME|$DOMAIN_NAME|g" /etc/coturn/turnserver.conf && \
+sed -i "s|USERNAME|$USERNAME|g" /etc/coturn/turnserver.conf && \
+sed -i "s|PASSWORD|$PASSWORD|g" /etc/coturn/turnserver.conf && \
+/usr/bin/turnserver
diff --git a/kubernetes/turnserver.conf b/kubernetes/docker/turnserver/turnserver.conf
similarity index 53%
rename from kubernetes/turnserver.conf
rename to kubernetes/docker/turnserver/turnserver.conf
index fbb7309ef..bdcd1cdf9 100644
--- a/kubernetes/turnserver.conf
+++ b/kubernetes/docker/turnserver/turnserver.conf
@@ -1,8 +1,8 @@
-user=pychat:pypass
-realm=pychat.org
-server-name=pychat.org
-min-port=49152
-max-port=49352
+user=USERNAME:PASSWORD
+realm=DOMAIN_NAME
+server-name=DOMAIN_NAME
+min-port=MIN_PORT
+max-port=MAX_PORT
 listening-port=3478
 tls-listening-port=5349
 listening-ip=0.0.0.0
diff --git a/kubernetes/terraform/.terraform.lock.hcl b/kubernetes/terraform/.terraform.lock.hcl
index f0c431ff1..b155dfb13 100644
--- a/kubernetes/terraform/.terraform.lock.hcl
+++ b/kubernetes/terraform/.terraform.lock.hcl
@@ -63,6 +63,28 @@ provider "registry.terraform.io/hashicorp/local" {
   ]
 }
 
+provider "registry.terraform.io/kreuzwerker/docker" {
+  version     = "3.0.2"
+  constraints = "3.0.2"
+  hashes = [
+    "h1:cT2ccWOtlfKYBUE60/v2/4Q6Stk1KYTNnhxSck+VPlU=",
+    "zh:15b0a2b2b563d8d40f62f83057d91acb02cd0096f207488d8b4298a59203d64f",
+    "zh:23d919de139f7cd5ebfd2ff1b94e6d9913f0977fcfc2ca02e1573be53e269f95",
+    "zh:38081b3fe317c7e9555b2aaad325ad3fa516a886d2dfa8605ae6a809c1072138",
+    "zh:4a9c5065b178082f79ad8160243369c185214d874ff5048556d48d3edd03c4da",
+    "zh:5438ef6afe057945f28bce43d76c4401254073de01a774760169ac1058830ac2",
+    "zh:60b7fadc287166e5c9873dfe53a7976d98244979e0ab66428ea0dea1ebf33e06",
+    "zh:61c5ec1cb94e4c4a4fb1e4a24576d5f39a955f09afb17dab982de62b70a9bdd1",
+    "zh:a38fe9016ace5f911ab00c88e64b156ebbbbfb72a51a44da3c13d442cd214710",
+    "zh:c2c4d2b1fd9ebb291c57f524b3bf9d0994ff3e815c0cd9c9bcb87166dc687005",
+    "zh:d567bb8ce483ab2cf0602e07eae57027a1a53994aba470fa76095912a505533d",
+    "zh:e83bf05ab6a19dd8c43547ce9a8a511f8c331a124d11ac64687c764ab9d5a792",
+    "zh:e90c934b5cd65516fbcc454c89a150bfa726e7cf1fe749790c7480bbeb19d387",
+    "zh:f05f167d2eaf913045d8e7b88c13757e3cf595dd5cd333057fdafc7c4b7fed62",
+    "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
+  ]
+}
+
 provider "registry.terraform.io/linode/linode" {
   version     = "2.2.0"
   constraints = "2.2.0"
diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 94082b985..13c542dfe 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -16,7 +16,7 @@ resource "cloudflare_record" "static_pychat" {
   zone_id = var.cloud_flare_zone_id
 }
 
-resource "cloudflare_record" "static_pychat" {
+resource "cloudflare_record" "registry_pychat" {
   name    = "registry"
   proxied = false
   ttl     = 1
diff --git a/kubernetes/terraform/helm/charts/coturn/Chart.yaml b/kubernetes/terraform/helm/charts/coturn/Chart.yaml
index 78e8a2f64..9a130fb4f 100644
--- a/kubernetes/terraform/helm/charts/coturn/Chart.yaml
+++ b/kubernetes/terraform/helm/charts/coturn/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: mariadb
+name: coturn
 description: coturn sip server
 type: application
 version: 0.1.0
diff --git a/kubernetes/terraform/helm/charts/coturn/templates/cm.yaml b/kubernetes/terraform/helm/charts/coturn/templates/cm.yaml
new file mode 100644
index 000000000..9fdcc2319
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/coturn/templates/cm.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm-coturn
+  namespace: pychat
+data:
+  DOMAIN_NAME: {{ .Values.domain_name }}
+  USERNAME: {{ .Values.username }}
+  PASSWORD: {{ .Values.password }}
+  MIN_PORT: "{{ .Values.udp_port_range_start }}"
+  MAX_PORT: "{{ .Values.udp_port_range_end }}"
diff --git a/kubernetes/terraform/helm/charts/coturn/templates/deployment.yaml b/kubernetes/terraform/helm/charts/coturn/templates/deployment.yaml
index 07cb28655..b9b7c350a 100644
--- a/kubernetes/terraform/helm/charts/coturn/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/coturn/templates/deployment.yaml
@@ -26,8 +26,11 @@ spec:
                 path: key.pem
       containers:
         - name: coturn
-          imagePullPolicy: Always
-          image: deathangel908/pychat-coturn
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
+          envFrom:
+          - configMapRef:
+              name: cm-coturn
           volumeMounts:
           - name: pychat-coturn-tls
             mountPath: "/etc/tls"
diff --git a/kubernetes/terraform/helm/charts/coturn/values.yaml b/kubernetes/terraform/helm/charts/coturn/values.yaml
index c6996a599..5e6069479 100644
--- a/kubernetes/terraform/helm/charts/coturn/values.yaml
+++ b/kubernetes/terraform/helm/charts/coturn/values.yaml
@@ -1,2 +1,9 @@
-udp_port_range_start: 49152
-udp_port_range_end: 49252
+udp_port_range_start: $udp_port_range_start
+udp_port_range_end: $udp_port_range_end
+password: $password
+username: $username
+domain_name: $domain_name
+image:
+  repository_path: deathangel908/pychat-coturn
+  pullPolicy: Always # change to IfNotPresent for minikube
+  tag: "latest"
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
index 5d8e6679f..7693e1bd1 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
@@ -5,7 +5,6 @@ metadata:
   namespace: pychat
 data:
   REGISTRY_AUTH_HTPASSWD_PATH: '/auth/htpasswd'
-  REGISTRY_HTTP_TLS_CERTIFICATE: '/etc/tls/crt.pem'
-  REGISTRY_HTTP_TLS_KEY: '/etc/tls/key.pem'
   REGISTRY_AUTH: 'htpasswd'
+  REGISTRY_AUTH_HTPASSWD_REALM: "registry.{{ .Values.domain_name }}"
 
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
index 725072f38..50ea12244 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/deployment.yaml
@@ -26,15 +26,13 @@ spec:
             path: /
             port: 5000
         envFrom:
-        - secretRef:
-            name: docker-secret
+        - configMapRef:
+            name: cm-registry
         volumeMounts:
-        - name: pychat-registry-tls
-          mountPath: "/etc/tls"
-          readOnly: true
         - mountPath: "/var/lib/registry"
           name: registry-data
         - mountPath: "/auth"
+          readOnly: true
           name: registry-auth-file
       volumes:
         - name: registry-data
@@ -46,11 +44,3 @@ spec:
             items:
               - key: htpasswd
                 path: htpasswd
-        - name: pychat-registry-tls
-          secret:
-            secretName: pychat-tls
-            items:
-              - key: tls.crt
-                path: crt.pem
-              - key: tls.key
-                path: key.pem
diff --git a/kubernetes/terraform/helm/charts/docker-registry/values.yaml b/kubernetes/terraform/helm/charts/docker-registry/values.yaml
index 6b69158f7..bde882877 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/values.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/values.yaml
@@ -1,4 +1,3 @@
 domain_name: $domain_name
 disk_size: 15Gi
 htpasswd: $htpasswd
-# docker run --entrypoint htpasswd httpd:2 -Bbn testuser testpassword
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
index 38fa2da43..f14c1d565 100644
--- a/kubernetes/terraform/helm/charts/ingress/values.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -1,5 +1,5 @@
-udp_port_range_start: 49152
-udp_port_range_end: 49352
+udp_port_range_start: $udp_port_range_start
+udp_port_range_end: $udp_port_range_end
 external_ip: $external_ip
 domain_name: $domain_name
 htpasswd: $htpasswd
diff --git a/kubernetes/terraform/helm/charts/postfix/templates/cm.yaml b/kubernetes/terraform/helm/charts/postfix/templates/cm.yaml
new file mode 100644
index 000000000..58a747ee5
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/postfix/templates/cm.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm-postfix
+  namespace: pychat
+data:
+  DOMAIN_NAME: {{ .Values.domain_name }}
diff --git a/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml b/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
index 037a51e0e..683889aeb 100644
--- a/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
@@ -28,6 +28,9 @@ spec:
         - name: postfix
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
+          envFrom:
+          - configMapRef:
+              name: cm-postfix
           volumeMounts:
           - name: pychat-postfix-tls
             mountPath: "/etc/tls"
diff --git a/kubernetes/terraform/helm/charts/postfix/values.yaml b/kubernetes/terraform/helm/charts/postfix/values.yaml
index ba19bb924..d1c51e4fe 100644
--- a/kubernetes/terraform/helm/charts/postfix/values.yaml
+++ b/kubernetes/terraform/helm/charts/postfix/values.yaml
@@ -2,3 +2,4 @@ image:
   repository_path: deathangel908/pychat-postfix
   pullPolicy: Always # change to IfNotPresent for minikube
   tag: "latest"
+domain_name: $domain_name
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 7fbf02ae1..685ff8c80 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -162,6 +162,27 @@ resource "helm_release" "coturn" {
   name       = "coturn"
   chart      = "${path.module}/charts/coturn"
   depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
+
+  set {
+    name  = "domain_name"
+    value = var.domain_name
+  }
+  set {
+    name  = "username"
+    value = var.coturn_username
+  }
+  set {
+    name  = "password"
+    value = var.coturn_password
+  }
+  set {
+    name  = "udp_port_range_start"
+    value = var.udp_port_range_start
+  }
+  set {
+    name  = "udp_port_range_end"
+    value = var.udp_port_range_end
+  }
 }
 
 resource "helm_release" "frontend" {
@@ -185,6 +206,14 @@ resource "helm_release" "ingress" {
     name  = "external_ip"
     value = var.ip_address
   }
+  set {
+    name  = "udp_port_range_start"
+    value = var.udp_port_range_start
+  }
+  set {
+    name  = "udp_port_range_end"
+    value = var.udp_port_range_end
+  }
   depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
 }
 
@@ -210,6 +239,10 @@ resource "helm_release" "postfix" {
   name       = "postfix"
   chart      = "${path.module}/charts/postfix"
   depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
+  set {
+    name  = "domain_name"
+    value = var.domain_name
+  }
 }
 
 resource "helm_release" "redis" {
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 02754acc8..92f8a48ce 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -14,6 +14,18 @@ variable "FIREBASE_API_KEY" {}
 variable "DEFAULT_PROFILE_ID" {}
 variable "kubeconfig" {}
 variable "tls_crt" {}
+variable "udp_port_range_start" {
+  default = 49152
+}
+variable "udp_port_range_end" {
+  default = 49352
+}
+variable "coturn_username" {
+  default = "pychat"
+}
+variable "coturn_password" {
+  default = "pypass"
+}
 variable "htpasswd" {
   default = ""
 }
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 72825eb46..2051ad6c3 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -10,8 +10,9 @@ variable "email" {}
 variable "github" {
   default = ""
 }
+# docker run --entrypoint htpasswd httpd:2 -Bbn testuser testpassword
 variable "htpasswd" {
-  default = "testuser:$2y$05$cr2mYZkI8asxGO6fZ9FGFO4le/80hkiwQc.X/PRuWhXO2u53U7PDG"
+  default = "testuser:$2y$05$nHOggdxwwugO8mBP8XNE5O0dHoZvfG3ZPliSSH0dIbTEe9n1cbzSa"
 }
 variable "tls_crt" {
   default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"

From e77b871d0dc65570fe1b7f0cb3fc1fc0b481ceff Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 04:48:04 +0300
Subject: [PATCH 187/221] Fixed docker images

---
 .dockerignore                                          |  8 ++++----
 kubernetes/docker/DockerfileBackup                     |  9 ---------
 .../{DockerfileOldBackend => backend/Dockerfile}       |  3 ++-
 .../DockerfileNewBackend}                              |  2 +-
 kubernetes/docker/backup/Dockerfile                    | 10 ++++++++++
 kubernetes/docker/{ => backup}/backup.sh               |  2 +-
 .../{DockerfileOldFrontend => frontend/Dockerfile}     |  8 +++-----
 .../docker/{ => frontend}/DockerfileMinikubeFrontend   |  4 ++--
 .../DockerfileNewFrontend}                             |  7 +++----
 .../docker/{ => frontend}/frontend-minikube.json       |  0
 .../{frontend.json => frontend/frontend-new.json}      |  0
 .../docker/{ => frontend}/frontend-old-pychat.org.json |  0
 .../docker/{ => frontend}/nginx-old-pychat.org.conf    |  0
 kubernetes/docker/{ => frontend}/nginx.conf            |  0
 kubernetes/docker/postfix/Dockerfile                   |  1 +
 kubernetes/docker/turnserver/Dockerfile                |  1 +
 16 files changed, 28 insertions(+), 27 deletions(-)
 delete mode 100644 kubernetes/docker/DockerfileBackup
 rename kubernetes/docker/{DockerfileOldBackend => backend/Dockerfile} (88%)
 rename kubernetes/docker/{DockerfileBackend => backend/DockerfileNewBackend} (90%)
 create mode 100644 kubernetes/docker/backup/Dockerfile
 rename kubernetes/docker/{ => backup}/backup.sh (94%)
 rename kubernetes/docker/{DockerfileOldFrontend => frontend/Dockerfile} (69%)
 rename kubernetes/docker/{ => frontend}/DockerfileMinikubeFrontend (81%)
 rename kubernetes/docker/{DockerfileFrontend => frontend/DockerfileNewFrontend} (72%)
 rename kubernetes/docker/{ => frontend}/frontend-minikube.json (100%)
 rename kubernetes/docker/{frontend.json => frontend/frontend-new.json} (100%)
 rename kubernetes/docker/{ => frontend}/frontend-old-pychat.org.json (100%)
 rename kubernetes/docker/{ => frontend}/nginx-old-pychat.org.conf (100%)
 rename kubernetes/docker/{ => frontend}/nginx.conf (100%)

diff --git a/.dockerignore b/.dockerignore
index f9470ec05..ce5415a2a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,7 +7,7 @@
 !newback/tsconfig.build.json
 !newback/tsconfig.json
 !newback/src
-!backup.sh
+!kubernetes/docker/backup/backup.sh
 !common/src
 !kubernetes
 !frontend/src
@@ -20,9 +20,9 @@ frontend/build/production.json
 !frontend/tsconfig.node.json
 !docker/populate
 !docker/tornado
-!kubernetes/docker/frontend-old-pychat.org.json
-!kubernetes/docker/nginx-old-pychat.org.conf
-!kubernetes/docker/frontend-minikube.json
+!kubernetes/docker/frontend/frontend-old-pychat.org.json
+!kubernetes/docker/frontend/nginx-old-pychat.org.conf
+!kubernetes/docker/frontend/frontend-minikube.json
 !kubernetes/docker/docker/postfix/postfix_replacer.bash
 !docker/nginx.conf
 !docker/nginx
diff --git a/kubernetes/docker/DockerfileBackup b/kubernetes/docker/DockerfileBackup
deleted file mode 100644
index e2173346d..000000000
--- a/kubernetes/docker/DockerfileBackup
+++ /dev/null
@@ -1,9 +0,0 @@
-# docker build -f ./kubernetes/docker/DockerfileBackup -t deathangel908/pychat-backup .
-# docker push deathangel908/pychat-backup
-
-FROM alpine:3.15
-
-WORKDIR /src
-
-RUN apk --update add bash git openssh-client mysql-client
-COPY ./backup.sh /src/
diff --git a/kubernetes/docker/DockerfileOldBackend b/kubernetes/docker/backend/Dockerfile
similarity index 88%
rename from kubernetes/docker/DockerfileOldBackend
rename to kubernetes/docker/backend/Dockerfile
index c0da0e3c1..e176dd18b 100644
--- a/kubernetes/docker/DockerfileOldBackend
+++ b/kubernetes/docker/backend/Dockerfile
@@ -1,4 +1,5 @@
-# docker build -f ./kubernetes/docker/DockerfileOldBackend -t deathangel908/pychat-backend .
+# cd <root>
+# docker build -f ./kubernetes/docker/backend/Dockerfile -t deathangel908/pychat-backend .
 # docker push deathangel908/pychat-backend
 FROM alpine:3.15
 
diff --git a/kubernetes/docker/DockerfileBackend b/kubernetes/docker/backend/DockerfileNewBackend
similarity index 90%
rename from kubernetes/docker/DockerfileBackend
rename to kubernetes/docker/backend/DockerfileNewBackend
index 19374106e..ca8767514 100644
--- a/kubernetes/docker/DockerfileBackend
+++ b/kubernetes/docker/backend/DockerfileNewBackend
@@ -1,5 +1,5 @@
 # cd <root>
-# docker build -f ./kubernetes/docker/DockerfileBackend -t deathangel908/pychat-backend .
+# docker build -f ./kubernetes/docker/backend/DockerfileNewBackend -t deathangel908/pychat-backend .
 # https://stackoverflow.com/a/49478889/3872976
 # minikube tunnel service/backend-service
 # chrome http://192.168.49.2:30002/
diff --git a/kubernetes/docker/backup/Dockerfile b/kubernetes/docker/backup/Dockerfile
new file mode 100644
index 000000000..60ac11273
--- /dev/null
+++ b/kubernetes/docker/backup/Dockerfile
@@ -0,0 +1,10 @@
+# cd <root>
+# docker build -f ./kubernetes/docker/backup/Dockerfile -t deathangel908/pychat-backup .
+# docker push deathangel908/pychat-backup
+
+FROM alpine:3.15
+
+WORKDIR /src
+
+RUN apk --update add bash git openssh-client mysql-client
+COPY ./kubernetes/docker/backup/backup.sh /src/
diff --git a/kubernetes/docker/backup.sh b/kubernetes/docker/backup/backup.sh
similarity index 94%
rename from kubernetes/docker/backup.sh
rename to kubernetes/docker/backup/backup.sh
index 0aca6ccdc..40960b88d 100644
--- a/kubernetes/docker/backup.sh
+++ b/kubernetes/docker/backup/backup.sh
@@ -8,7 +8,7 @@ commitNoFail() {
   fi
 }
 
-git config --global user.email "deathangel908@gmail.com"
+git config --global user.email "backup@pychat.org"
 git config --global user.name "cronjob"
 mkdir ~/.ssh -p
 cp /src/ssh/id_rsa ~/.ssh/id_rsa
diff --git a/kubernetes/docker/DockerfileOldFrontend b/kubernetes/docker/frontend/Dockerfile
similarity index 69%
rename from kubernetes/docker/DockerfileOldFrontend
rename to kubernetes/docker/frontend/Dockerfile
index a15cfe8e8..93ac07324 100644
--- a/kubernetes/docker/DockerfileOldFrontend
+++ b/kubernetes/docker/frontend/Dockerfile
@@ -1,8 +1,6 @@
 # cd <root>
-# docker build --build-arg PYCHAT_GIT_HASH=`git rev-parse --short=10 HEAD`  -f ./kubernetes/docker/DockerfileOldFrontend -t deathangel908/pychat-frontend .
+# docker build --build-arg PYCHAT_GIT_HASH=`git rev-parse --short=10 HEAD`  -f ./kubernetes/docker/frontend/Dockerfile -t deathangel908/pychat-frontend .
 # docker push deathangel908/pychat-frontend
-# https://stackoverflow.com/a/49478889/3872976
-# minikube tunnel service/backend-service
 FROM node:16.15-alpine3.15 as builder
 
 WORKDIR /usr/src/frontend
@@ -15,7 +13,7 @@ RUN yarn install --frozen-lockfile
 COPY ./frontend/tsconfig.node.json ./frontend/tsconfig.json ./
 COPY ./frontend/src ./src/
 COPY ./frontend/build ./build/
-COPY ./kubernetes/docker/frontend-old-pychat.org.json ./build/production.json
+COPY ./kubernetes/docker/frontend/frontend-old-pychat.org.json ./build/production.json
 
 ARG PYCHAT_GIT_HASH
 ENV PYCHAT_GIT_HASH=${PYCHAT_GIT_HASH}
@@ -26,5 +24,5 @@ RUN yarn build
 FROM nginx:1.21.6-alpine
 
 COPY --from=builder /usr/src/frontend/dist /srv/http/dist
-COPY kubernetes/nginx-old-pychat.org.conf /etc/nginx/conf.d/pychat.conf
+COPY ./kubernetes/docker/frontend/nginx-old-pychat.org.conf /etc/nginx/conf.d/pychat.conf
 RUN rm /etc/nginx/conf.d/default.conf
diff --git a/kubernetes/docker/DockerfileMinikubeFrontend b/kubernetes/docker/frontend/DockerfileMinikubeFrontend
similarity index 81%
rename from kubernetes/docker/DockerfileMinikubeFrontend
rename to kubernetes/docker/frontend/DockerfileMinikubeFrontend
index 13693b305..1fe257129 100644
--- a/kubernetes/docker/DockerfileMinikubeFrontend
+++ b/kubernetes/docker/frontend/DockerfileMinikubeFrontend
@@ -1,5 +1,5 @@
 # cd <root>
-# docker build --build-arg PYCHAT_GIT_HASH=`git rev-parse --short=10 HEAD`  -f ./kubernetes/DockerfileMinikubeFrontend -t deathangel908/pychat-frontend .
+# docker build --build-arg PYCHAT_GIT_HASH=`git rev-parse --short=10 HEAD`  -f ./kubernetes/docker/frontend/DockerfileMinikubeFrontend -t deathangel908/pychat-frontend .
 # https://stackoverflow.com/a/49478889/3872976
 # minikube tunnel service/backend-service
 FROM node:16.15-alpine3.15 as builder
@@ -25,5 +25,5 @@ RUN yarn build
 FROM nginx:1.21.6-alpine
 
 COPY --from=builder /usr/src/frontend/dist /srv/http/dist
-COPY kubernetes/nginx-old-pychat.org.conf /etc/nginx/conf.d/pychat.conf
+COPY ./kubernetes/docker/frontend/nginx-old-pychat.org.conf /etc/nginx/conf.d/pychat.conf
 RUN rm /etc/nginx/conf.d/default.conf
diff --git a/kubernetes/docker/DockerfileFrontend b/kubernetes/docker/frontend/DockerfileNewFrontend
similarity index 72%
rename from kubernetes/docker/DockerfileFrontend
rename to kubernetes/docker/frontend/DockerfileNewFrontend
index 1632477a4..7e216fd9f 100644
--- a/kubernetes/docker/DockerfileFrontend
+++ b/kubernetes/docker/frontend/DockerfileNewFrontend
@@ -1,7 +1,6 @@
 # cd <root>
-# docker build -f ./kubernetes/docker/DockerfileFrontend -t deathangel908/pychat-frontend .
-# https://stackoverflow.com/a/49478889/3872976
-# minikube tunnel service/backend-service
+# docker build --build-arg PYCHAT_GIT_HASH=`git rev-parse --short=10 HEAD`  -f ./kubernetes/docker/frontend/DockerfileNewFrontend -t deathangel908/pychat-frontend .
+# docker push deathangel908/pychat-frontend
 FROM node:16.15-alpine3.15 as builder
 
 WORKDIR /usr/src/frontend
@@ -28,5 +27,5 @@ RUN yarn build
 FROM nginx:1.21.6-alpine
 
 COPY --from=builder /usr/src/frontend/dist /srv/http/dist
-COPY kubernetes/nginx.conf /etc/nginx/conf.d/pychat.conf
+COPY ./kubernetes/docker/frontend/nginx.conf /etc/nginx/conf.d/pychat.conf
 RUN rm /etc/nginx/conf.d/default.conf
diff --git a/kubernetes/docker/frontend-minikube.json b/kubernetes/docker/frontend/frontend-minikube.json
similarity index 100%
rename from kubernetes/docker/frontend-minikube.json
rename to kubernetes/docker/frontend/frontend-minikube.json
diff --git a/kubernetes/docker/frontend.json b/kubernetes/docker/frontend/frontend-new.json
similarity index 100%
rename from kubernetes/docker/frontend.json
rename to kubernetes/docker/frontend/frontend-new.json
diff --git a/kubernetes/docker/frontend-old-pychat.org.json b/kubernetes/docker/frontend/frontend-old-pychat.org.json
similarity index 100%
rename from kubernetes/docker/frontend-old-pychat.org.json
rename to kubernetes/docker/frontend/frontend-old-pychat.org.json
diff --git a/kubernetes/docker/nginx-old-pychat.org.conf b/kubernetes/docker/frontend/nginx-old-pychat.org.conf
similarity index 100%
rename from kubernetes/docker/nginx-old-pychat.org.conf
rename to kubernetes/docker/frontend/nginx-old-pychat.org.conf
diff --git a/kubernetes/docker/nginx.conf b/kubernetes/docker/frontend/nginx.conf
similarity index 100%
rename from kubernetes/docker/nginx.conf
rename to kubernetes/docker/frontend/nginx.conf
diff --git a/kubernetes/docker/postfix/Dockerfile b/kubernetes/docker/postfix/Dockerfile
index 9be80ddbb..1ca6decc7 100644
--- a/kubernetes/docker/postfix/Dockerfile
+++ b/kubernetes/docker/postfix/Dockerfile
@@ -1,3 +1,4 @@
+# cd <root>
 # docker build -f ./kubernetes/docker/postfix/Dockerfile -t deathangel908/pychat-postfix .
 # docker push deathangel908/pychat-postfix
 
diff --git a/kubernetes/docker/turnserver/Dockerfile b/kubernetes/docker/turnserver/Dockerfile
index 20af93620..eb1599a00 100644
--- a/kubernetes/docker/turnserver/Dockerfile
+++ b/kubernetes/docker/turnserver/Dockerfile
@@ -1,3 +1,4 @@
+# cd <root>
 # docker build -f ./kubernetes/docker/turnserver/Dockerfile -t deathangel908/pychat-coturn .
 # docker push deathangel908/pychat-coturn
 

From f85717e603a9f1b4db9c5fad7447e335ed5a91b3 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 04:51:34 +0300
Subject: [PATCH 188/221] Fixed docker build backend

---
 .dockerignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index ce5415a2a..21c4a717b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -15,6 +15,10 @@
 !frontend/build
 frontend/build/production.json
 !frontend/package.json
+!backend/requirements.txt
+!backend/chat
+!backend/templates
+!backend/manage.py
 !frontend/yarn.lock
 !frontend/tsconfig.json
 !frontend/tsconfig.node.json

From 31b3fded4b7ba36167f53e96afb4bc83edc8b58b Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 05:15:30 +0300
Subject: [PATCH 189/221] Fixed README.md for terraform

---
 README.md | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 0cb9de9c9..7a6c452bf 100644
--- a/README.md
+++ b/README.md
@@ -519,39 +519,52 @@ Terraform will allow you to automatically create pychat infrastructure for:
  - Linode as Kubernetes provider. It has the cheapest prices  (10$ per month is gonna be enough, that will use 1 node of 2GB ram and 1vCPU) along all providers with 500MB/s SSD, 99.99% SLA, 10Gb/s in and 2Gb/s out networks.
  - Letsencrypt as SSL certificate (free of charge)
  - Domain address (10$ per year)
+You will have to create a few accounts and setup a few variables in ./kubernetes/terraform/terraform.tfvars below
  
-1. Go cloudflare and copy ZoneID and API token 
- - Copy zoneID: Go to https://dash.cloudflare.com/ - create a new site (or use existing one) grab an API Zone ID and place it into `kubernetes/terraform.tfvars`
- - Copy API token: go to https://dash.cloudflare.com/profile/api-tokens and create a new api token and place it into `kubernetes/terraform.tfvars`\
+### Cloudflare 
+ - Sign in to [Cloudflare](https://www.cloudflare.com/) and copy ZoneID and API token 
+ - Copy zoneID: Go to https://dash.cloudflare.com/ - create a new site (or use existing one) grab an API Zone ID and place it into `kubernetes/terraform.tfvars` with key `cloud_flare_zone_id`
+ - Copy API token: go to https://dash.cloudflare.com/profile/api-tokens and create a new api token and place it into `kubernetes/terraform.tfvars` with key `cloud_flare_api_token`
 
-1. Backups:
- Backups are done using private git repository. It includes sql dump + photo directory
+### Linode
+ Sign in to [Linode](http://linode.com/), go to Profile -> Api tokens -> Create A Personal Access Token -> Select Kubernetes & Linodes -> Create Token. Put that token to`kubernetes/terraform.tfvars` with key `linode_token`
+
+### Backups:
+Backups are done using private git repository. It includes sql dump + photo directory
  - Create a private repo (e.g. github)
- - Specify `github="git@github.com:username/backup_repo.git"` in `terraform.tfvars`
+ - Place repo url e.g. `git@github.com:username/backup_repo.git` to `terraform.tfvars` with key `github`
  - Generate a new keypair with `ssh-keygen -t rsa -b 4096 -C "kube backup" -f  /tmp/sshkey/id_rsa -N ""` 
  - Put public key to your git server (for Github it's Settings (on dashboard) -> Deploy Keys -> Add deploy key)
- - Put `id_rsa_pub="ssh-rsa aa..."` to  `terraform.tfvars`
- - Put `id_rsa= <<-EOT -----BEGIN OPENSSH PRIVATE KEY-----... -----END OPENSSH PRIVATE KEY----- EOT` to to  `terraform.tfvars`
- k8s wil have a cronjob backend-backup which will run each hour.
-2. Self sign certificate: 
- If you don't own a domain and planning to use ip + self signed certificate, this will result:
+ - Put ssh public key `ssh-rsa aa...` to  `terraform.tfvars` with key `id_rsa_pub`
+ - Put private key `-----BEGIN OPENSSH PRIVATE KEY-----... -----END OPENSSH PRIVATE KEY--` to `terraform.tfvars` with key `id_rsa`. You can use [this](https://stackoverflow.com/a/66646420/3872976) lifehack for multiline variable
+k8s wil have a cronjob backend-backup which will run each hour.
+
+### Other keys
+Other keys are required to be specified in `terraform.tfvars`
+ - put `domain_name`
+### Self sign certificate (Optional):
+Skip this if you did cloudflare step.
+If you don't own a domain (and planning to use ip + self signed certificate, this will result:
 - certmanager will not deploy be used
 - turn server will not work,
 - postfix will not send emails, including registration and password reset
 - Site is gonna be under self-signed certificate and will prompt errors.
 This is still possible
-
 Upon linode cluster creation .kubeconfig will be generated in kubernetes/terraform/helm directory. After it all operations with helm will be using this conf. If this file is deleted helm will compain about missing kubernetes config
 
-1. If you already own a k8s cluster.
+### If you already own a k8s cluster.
 All helm charts are located in kubernetes/terraform/helm, we will apply terraform from this directory to exclude linode and cloudlfare resource creation
  - cd kubernetes/terraform/helm
- -  create `terraform.tf` in this directory and put all required content in it.
+ - create `terraform.tf` in this directory and put all required content in it.
  - `terraform init`
  - `terraform apply`
 
+### Other variables in terraform.tfvars
+ - domain_name - your host origin domain name. It's gonna be used in turnserver postfix static nginx, cloudflare and other configuration
+ - email - It's gonna be used in cf issuer and a few other places
+ - Other variables that's gonna be proxied as env variables for python backend. Check backend/chat/settings.example for docs. Those includes but not limited to DEFAULT_PROFILE_ID SECRET_KEY RECAPTCHA_PRIVATE_KEY RECAPTCHA_PUBLIC_KEY GOOGLE_OAUTH_2_CLIENT_ID FACEBOOK_ACCESS_TOKEN GIPHY_API_KEY FIREBASE_API_KEY 
 
-# Troubleshooting
+### Troubleshooting
 1. How to icrease maximum upload file:
  - Change nginx configuration  ``   client_max_body_size 75M;`
  - In addition to above, if you're using k8s + ingress, change `ingress.yaml` nginx.ingress.kubernetes.io/proxy-body-size: 75m 

From fec24b70392a427f62aa7ea8cd66439fbea653be Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 05:26:39 +0300
Subject: [PATCH 190/221] Finished docs

---
 README.md | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7a6c452bf..13aeec321 100644
--- a/README.md
+++ b/README.md
@@ -552,6 +552,12 @@ If you don't own a domain (and planning to use ip + self signed certificate, thi
 This is still possible
 Upon linode cluster creation .kubeconfig will be generated in kubernetes/terraform/helm directory. After it all operations with helm will be using this conf. If this file is deleted helm will compain about missing kubernetes config
 
+
+### Other variables in terraform.tfvars
+ - domain_name - your host origin domain name. It's gonna be used in turnserver postfix static nginx, cloudflare and other configuration
+ - email - It's gonna be used in cf issuer and a few other places
+ - Other variables that's gonna be proxied as env variables for python backend. Check backend/chat/settings.example for docs. Those includes but not limited to DEFAULT_PROFILE_ID SECRET_KEY RECAPTCHA_PRIVATE_KEY RECAPTCHA_PUBLIC_KEY GOOGLE_OAUTH_2_CLIENT_ID FACEBOOK_ACCESS_TOKEN GIPHY_API_KEY FIREBASE_API_KEY 
+
 ### If you already own a k8s cluster.
 All helm charts are located in kubernetes/terraform/helm, we will apply terraform from this directory to exclude linode and cloudlfare resource creation
  - cd kubernetes/terraform/helm
@@ -559,11 +565,30 @@ All helm charts are located in kubernetes/terraform/helm, we will apply terrafor
  - `terraform init`
  - `terraform apply`
 
-### Other variables in terraform.tfvars
- - domain_name - your host origin domain name. It's gonna be used in turnserver postfix static nginx, cloudflare and other configuration
- - email - It's gonna be used in cf issuer and a few other places
- - Other variables that's gonna be proxied as env variables for python backend. Check backend/chat/settings.example for docs. Those includes but not limited to DEFAULT_PROFILE_ID SECRET_KEY RECAPTCHA_PRIVATE_KEY RECAPTCHA_PUBLIC_KEY GOOGLE_OAUTH_2_CLIENT_ID FACEBOOK_ACCESS_TOKEN GIPHY_API_KEY FIREBASE_API_KEY 
+### Frontend
 
+Frontend can't be built during runtime, thus you will need to built it yourself. Also you need to have accesss to some docker registry, you can use dockerhub as it's free  of charge. This repo also can host private docker registry built from kubernetes/terraform/helm/charts/docker-registry so you won't have to create one.\
+Replace values in `/kubernetes/docker/frontend/frontend-old-pychat.org.json` in and run from project root directory.
+```bash
+docker build --build-arg PYCHAT_GIT_HASH=`git rev-parse --short=10 HEAD`  -f ./kubernetes/docker/frontend/Dockerfile -t deathangel908/pychat-frontend .
+docker push deathangel908/pychat-frontend
+```
+Note that tag `deathangel908/pychat-frontend` should be one pointing to your registry
+Replace value in `repository_path` in `./kubernetes/terraform/helm/charts/frontend/values.yaml` to one pointing to you registry
+In case you use private registry from this terraform image use:
+ - generate user-password with: `docker run --entrypoint htpasswd httpd:2 -Bbn testuser testpassword`
+ - put output  to `terraform.tfvars` with key `htpasswd`
+ - Fully apply terraform configuration. Most services could be down
+ - Login to your private registry with `docker login --username=testuser --password=testpassword registry.pychat.org`
+ - And do push like above `docker push deathangel908/pychat-frontend` with your tag
+ - If you kill frontend pod now, it should repull from your repo
+
+### Apply Terrraform
+Apply terraform configuration with:
+ - `terraform init`
+ - `terraform plan`
+ - `terraform apply`
+ 
 ### Troubleshooting
 1. How to icrease maximum upload file:
  - Change nginx configuration  ``   client_max_body_size 75M;`

From c4628cec1ffc96eb27a919ad1ac51007718a1b84 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 14:38:28 +0300
Subject: [PATCH 191/221] Formatted

---
 download_content.sh                           |  7 ++--
 .../helm/charts/backend/templates/cm.yaml     | 12 +++----
 .../helm/charts/backend/templates/init.yaml   |  2 +-
 .../charts/docker-registry/templates/cm.yaml  |  4 +--
 .../helm/charts/mariadb/templates/cm.yaml     |  2 +-
 .../helm/charts/redis/templates/pv.yaml       |  2 +-
 .../helm/charts/redis/templates/pvc.yaml      |  2 +-
 .../terraform/helm/charts/redis/values.yaml   |  3 +-
 kubernetes/terraform/helm/main.tf             | 32 +++++++++----------
 kubernetes/terraform/helm/variables.tf        | 12 ++++---
 kubernetes/terraform/linode/main.tf           | 21 ++++++++----
 kubernetes/terraform/linode/variables.tf      |  9 +++---
 kubernetes/terraform/main.tf                  |  1 +
 kubernetes/terraform/variables.tf             | 28 ++++++++--------
 14 files changed, 75 insertions(+), 62 deletions(-)

diff --git a/download_content.sh b/download_content.sh
index 3b46560d4..2c24bd010 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -519,8 +519,11 @@ generate_secret_key() {
     fi
     echo "" >> $BE_DIRECTORY/chat/settings.py
     echo -n "SECRET_KEY = '" >> $BE_DIRECTORY/chat/settings.py
-    LC_ALL=C LC_CTYPE=C tr -dc 'A-Za-z0-9!@#$%^&*(\-\_\=\+)' </dev/urandom | head -c 50 >> $BE_DIRECTORY/chat/settings.py
-    echo "'" >> $BE_DIRECTORY/chat/settings.py
+    LC_ALL=C
+    LC_CTYPE=C
+    SECRET_KEY=$(tr -dc 'A-Za-z0-9!@#$%^&*(\-\_\=\+)' </dev/urandom | head -c 50)
+    echo $SECRET_KEY
+    echo  -ne "$SECRET_KEY'"  >> $BE_DIRECTORY/chat/settings.py
 }
 
 if [ "$1" = "post_fontello_conf" ]; then
diff --git a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
index f412f8515..da02003d6 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
@@ -4,13 +4,13 @@ metadata:
   name: cm-backend
   namespace: pychat
 data:
-  MYSQL_PORT: '3306'
+  MYSQL_PORT: "3306"
   MYSQL_DATABASE: {{ .Values.mysql_database_name }}
   MYSQL_HOST: mariadb-service
   REDIS_HOST: redis-service
-  REDIS_PORT: '6379'
-  APPLICATION_PORT: '8888'
-  REDIS_PUBSUB: 'true'
-  EMAIL_PORT: '25'
-  EMAIL_HOST: 'postfix-service'
+  REDIS_PORT: "6379"
+  APPLICATION_PORT: "8888"
+  REDIS_PUBSUB: "true"
+  EMAIL_PORT: "25"
+  EMAIL_HOST: "postfix-service"
   DEFAULT_PROFILE_ID: "{{ .Values.DEFAULT_PROFILE_ID }}"
diff --git a/kubernetes/terraform/helm/charts/backend/templates/init.yaml b/kubernetes/terraform/helm/charts/backend/templates/init.yaml
index 1f9160aa4..c9828988c 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/init.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/init.yaml
@@ -10,7 +10,7 @@ spec:
       - name: migrate-backend
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
-        command: ['/bin/bash', '/usr/src/backend/download_content.sh', "create_django_tables"]
+        command: ["/bin/bash", "/usr/src/backend/download_content.sh", "create_django_tables"]
         env:
         - name: BE_DIRECTORY
           value: /usr/src/backend
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
index 7693e1bd1..a69f6674f 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cm-registry
   namespace: pychat
 data:
-  REGISTRY_AUTH_HTPASSWD_PATH: '/auth/htpasswd'
-  REGISTRY_AUTH: 'htpasswd'
+  REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd"
+  REGISTRY_AUTH: "htpasswd"
   REGISTRY_AUTH_HTPASSWD_REALM: "registry.{{ .Values.domain_name }}"
 
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
index 5d4ea0109..1464f47f8 100644
--- a/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cm-mariadb
   namespace: pychat
 data:
-  MYSQL_PORT: '3306'
+  MYSQL_PORT: "3306"
   MYSQL_DATABASE: {{ .Values.mysql_database_name }}
   MYSQL_CHARSET: utf8mb4
   MYSQL_COLLATION: utf8mb4_general_ci
diff --git a/kubernetes/terraform/helm/charts/redis/templates/pv.yaml b/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
index b76efbcd8..0fef3d714 100644
--- a/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
@@ -6,6 +6,6 @@ spec:
   accessModes:
     - ReadWriteOnce
   capacity:
-    storage: 1Gi
+    storage: {{ .Values.disk_size }}
   hostPath:
     path: /data/redis
diff --git a/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml b/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
index da57acf6b..440e9b0e1 100644
--- a/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
+++ b/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
@@ -8,6 +8,6 @@ spec:
      - ReadWriteOnce
    resources:
      requests:
-       storage: 1Gi
+       storage: {{ .Values.disk_size }}
    storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
    volumeName: pv-redis
diff --git a/kubernetes/terraform/helm/charts/redis/values.yaml b/kubernetes/terraform/helm/charts/redis/values.yaml
index 5c9b01f81..edc5b3769 100644
--- a/kubernetes/terraform/helm/charts/redis/values.yaml
+++ b/kubernetes/terraform/helm/charts/redis/values.yaml
@@ -1,2 +1 @@
-disk_size: "5Gi"
-mysql_version: "10.6.7"
+disk_size: "256Mi"
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 685ff8c80..ee31b6568 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -16,19 +16,19 @@ resource "helm_release" "backend" {
     name  = "mysql_database_name"
     value = var.mysql_database_name
   }
-  set {
+  set_sensitive {
     name  = "mysql_user"
     value = var.mysql_user
   }
-  set {
+  set_sensitive {
     name  = "mysql_password"
     value = var.mysql_password
   }
-  set {
+  set_sensitive {
     name  = "SECRET_KEY"
     value = var.SECRET_KEY
   }
-  set {
+  set_sensitive {
     name  = "RECAPTCHA_PRIVATE_KEY"
     value = var.RECAPTCHA_PRIVATE_KEY
   }
@@ -36,19 +36,19 @@ resource "helm_release" "backend" {
     name  = "RECAPTCHA_PUBLIC_KEY"
     value = var.RECAPTCHA_PUBLIC_KEY
   }
-  set {
+  set_sensitive {
     name  = "GOOGLE_OAUTH_2_CLIENT_ID"
     value = var.GOOGLE_OAUTH_2_CLIENT_ID
   }
-  set {
+  set_sensitive {
     name  = "FACEBOOK_ACCESS_TOKEN"
     value = var.FACEBOOK_ACCESS_TOKEN
   }
-  set {
+  set_sensitive {
     name  = "GIPHY_API_KEY"
     value = var.GIPHY_API_KEY
   }
-  set {
+  set_sensitive {
     name  = "FIREBASE_API_KEY"
     value = var.FIREBASE_API_KEY
   }
@@ -81,7 +81,7 @@ resource "helm_release" "certmanager" {
     name  = "email"
     value = var.email
   }
-  set {
+  set_sensitive {
     name  = "cloud_flare_api_token"
     value = var.cloud_flare_api_token
   }
@@ -89,14 +89,14 @@ resource "helm_release" "certmanager" {
 }
 
 resource "helm_release" "self-signed" {
-  count = var.cloud_flare_api_token == "" ? 1 : 0
+  count = var.cloud_flare_api_token == null ? 1 : 0
   name  = "self-signed"
   chart = "${path.module}/charts/self-signed"
-  set {
+  set_sensitive {
     name  = "tls_crt"
     value = var.tls_crt
   }
-  set {
+  set_sensitive {
     name  = "tls_key"
     value = var.tls_key
   }
@@ -104,14 +104,14 @@ resource "helm_release" "self-signed" {
 }
 
 resource "helm_release" "docker-registry" {
-  count = var.htpasswd == "" ? 0 : 1
+  count = var.htpasswd == null ? 0 : 1
   name  = "docker-registry"
   chart = "${path.module}/charts/docker-registry"
   set {
     name  = "domain_name"
     value = var.domain_name
   }
-  set {
+  set_sensitive {
     name  = "htpasswd"
     value = var.htpasswd
   }
@@ -119,7 +119,7 @@ resource "helm_release" "docker-registry" {
 }
 
 resource "helm_release" "backup" {
-  count      = var.github == ""? 1 : 0
+  count      = var.github == null ? 0 : 1
   name       = "backup"
   chart      = "${path.module}/charts/backup"
   depends_on = [helm_release.mariadb, helm_release.backend] // because of pvc-photo
@@ -198,7 +198,7 @@ resource "helm_release" "ingress" {
     name  = "domain_name"
     value = var.domain_name
   }
-  set {
+  set_sensitive {
     name  = "htpasswd"
     value = var.htpasswd
   }
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 92f8a48ce..ab3ad6fa2 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,3 +1,8 @@
+variable "tls_key" {}
+variable "cloud_flare_api_token" {}
+variable "kubeconfig" {}
+variable "tls_crt" {}
+
 variable "domain_name" {}
 variable "email" {}
 variable "github" {}
@@ -12,8 +17,7 @@ variable "FACEBOOK_ACCESS_TOKEN" {}
 variable "GIPHY_API_KEY" {}
 variable "FIREBASE_API_KEY" {}
 variable "DEFAULT_PROFILE_ID" {}
-variable "kubeconfig" {}
-variable "tls_crt" {}
+
 variable "udp_port_range_start" {
   default = 49152
 }
@@ -27,10 +31,8 @@ variable "coturn_password" {
   default = "pypass"
 }
 variable "htpasswd" {
-  default = ""
+  default = null
 }
-variable "tls_key" {}
-variable "cloud_flare_api_token" {}
 variable "mysql_password" {
   default = "pypass"
 }
diff --git a/kubernetes/terraform/linode/main.tf b/kubernetes/terraform/linode/main.tf
index 6707c42be..5a5c09f3d 100644
--- a/kubernetes/terraform/linode/main.tf
+++ b/kubernetes/terraform/linode/main.tf
@@ -1,13 +1,20 @@
 resource "linode_lke_cluster" "pychat" {
-    k8s_version = var.k8s_version
-    label =  var.linode_app_label
-    region = var.region
+  k8s_version = var.k8s_version
+  label       = var.linode_app_label
+  region      = var.region
 
-    pool {
-      count = 1
-      type  = var.node_type
-    }
+  pool {
+    #   https://github.com/linode/terraform-provider-linode/pull/569
+    #    tags  = ["pychat_linode"]
+    count = var.node_count
+    type  = var.node_type
+  }
 }
 
 data "linode_instances" "pychat_linode" {
+
+  #  filter {
+  #    name   = "tags"
+  #    values = ["pychat_linode"]
+  #  }
 }
diff --git a/kubernetes/terraform/linode/variables.tf b/kubernetes/terraform/linode/variables.tf
index 87bc6f5c3..3bc871e9e 100644
--- a/kubernetes/terraform/linode/variables.tf
+++ b/kubernetes/terraform/linode/variables.tf
@@ -1,15 +1,14 @@
 variable "linode_token" {}
+variable "linode_app_label" {}
+variable "node_count" {
+  default = 1
+}
 variable "node_type" {
   default = "g6-standard-1"
 }
-
 variable "k8s_version" {
   default = "1.26"
 }
 variable "region" {
   default = "eu-west"
 }
-
-variable "linode_app_label" {
-  default = "pychat_1"
-}
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index 79e2977b7..41a628cac 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -1,6 +1,7 @@
 module "linode" {
   source                  = "./linode"
   linode_token = var.linode_token
+  linode_app_label = var.linode_app_label
 }
 
 module "cloudflare" {
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 2051ad6c3..d800aedae 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -1,5 +1,5 @@
 variable "cloud_flare_api_token" {
-  default = ""
+  default = null
 }
 variable "linode_token" {}
 variable "cloud_flare_zone_id" {}
@@ -7,12 +7,14 @@ variable "id_rsa" {}
 variable "id_rsa_pub" {}
 variable "domain_name" {}
 variable "email" {}
+variable "linode_app_label" {
+  default = "pychat"
+}
 variable "github" {
-  default = ""
+  default = null
 }
-# docker run --entrypoint htpasswd httpd:2 -Bbn testuser testpassword
-variable "htpasswd" {
-  default = "testuser:$2y$05$nHOggdxwwugO8mBP8XNE5O0dHoZvfG3ZPliSSH0dIbTEe9n1cbzSa"
+variable "htpasswd" { # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
+  default = "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
 }
 variable "tls_crt" {
   default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
@@ -20,26 +22,26 @@ variable "tls_crt" {
 variable "tls_key" {
   default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
 }
-variable "SECRET_KEY" {
-  default = "GEvcy2yoMOu6OaJj0ZIt"
+variable "SECRET_KEY" { # bash download_content.sh generate_secret_key
+  default = "yC1-o_%kBSDMYsTloYHf4JxUrU&TQuQXf(-XwIPh%MeHE%T5vM"
 }
 variable "RECAPTCHA_PRIVATE_KEY" {
-  default = ""
+  default = null
 }
 variable "RECAPTCHA_PUBLIC_KEY" {
-  default = ""
+  default = null
 }
 variable "GOOGLE_OAUTH_2_CLIENT_ID" {
-  default = ""
+  default = null
 }
 variable "FACEBOOK_ACCESS_TOKEN" {
-  default = ""
+  default = null
 }
 variable "GIPHY_API_KEY" {
-  default = ""
+  default = null
 }
 variable "FIREBASE_API_KEY" {
-  default = ""
+  default = null
 }
 variable "DEFAULT_PROFILE_ID" {
   default = "1"

From 3bd4185177504835155842c2dc10b3d53039ed1e Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 14:40:06 +0300
Subject: [PATCH 192/221] Reformat code

---
 kubernetes/terraform/linode/output.tf    |  2 +-
 kubernetes/terraform/linode/providers.tf |  2 +-
 kubernetes/terraform/main.tf             | 50 ++++++++++++------------
 kubernetes/terraform/variables.tf        |  6 ++-
 4 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/kubernetes/terraform/linode/output.tf b/kubernetes/terraform/linode/output.tf
index 40826d73d..11d956396 100644
--- a/kubernetes/terraform/linode/output.tf
+++ b/kubernetes/terraform/linode/output.tf
@@ -1,5 +1,5 @@
 output "kubeconfig" {
-  value = linode_lke_cluster.pychat.kubeconfig
+  value     = linode_lke_cluster.pychat.kubeconfig
   sensitive = true
 }
 
diff --git a/kubernetes/terraform/linode/providers.tf b/kubernetes/terraform/linode/providers.tf
index b765cb806..7ee1d3ccf 100644
--- a/kubernetes/terraform/linode/providers.tf
+++ b/kubernetes/terraform/linode/providers.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     linode = {
-      source = "linode/linode"
+      source  = "linode/linode"
       version = "2.2.0"
     }
   }
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index 41a628cac..2e1b76308 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -1,36 +1,36 @@
 module "linode" {
-  source                  = "./linode"
-  linode_token = var.linode_token
+  source           = "./linode"
+  linode_token     = var.linode_token
   linode_app_label = var.linode_app_label
 }
 
 module "cloudflare" {
-  source  = "./cloudflare"
+  source                = "./cloudflare"
   cloud_flare_api_token = var.cloud_flare_api_token
-  cloud_flare_zone_id = var.cloud_flare_zone_id
-  domain_name = var.domain_name
-  ip_address = module.linode.ip_address
+  cloud_flare_zone_id   = var.cloud_flare_zone_id
+  domain_name           = var.domain_name
+  ip_address            = module.linode.ip_address
 }
 
 module "helm" {
-  source = "./helm"
-  kubeconfig = module.linode.kubeconfig
-  domain_name = var.domain_name
-  ip_address = module.linode.ip_address
-  cloud_flare_api_token = var.cloud_flare_api_token
-  email = var.email
-  htpasswd = var.htpasswd
-  github = var.github
-  id_rsa = var.id_rsa
-  id_rsa_pub = var.id_rsa_pub
-  SECRET_KEY = var.SECRET_KEY
-  RECAPTCHA_PRIVATE_KEY = var.RECAPTCHA_PRIVATE_KEY
-  RECAPTCHA_PUBLIC_KEY = var.RECAPTCHA_PUBLIC_KEY
+  source                   = "./helm"
+  kubeconfig               = module.linode.kubeconfig
+  domain_name              = var.domain_name
+  ip_address               = module.linode.ip_address
+  cloud_flare_api_token    = var.cloud_flare_api_token
+  email                    = var.email
+  htpasswd                 = var.htpasswd
+  github                   = var.github
+  id_rsa                   = var.id_rsa
+  id_rsa_pub               = var.id_rsa_pub
+  SECRET_KEY               = var.SECRET_KEY
+  RECAPTCHA_PRIVATE_KEY    = var.RECAPTCHA_PRIVATE_KEY
+  RECAPTCHA_PUBLIC_KEY     = var.RECAPTCHA_PUBLIC_KEY
   GOOGLE_OAUTH_2_CLIENT_ID = var.GOOGLE_OAUTH_2_CLIENT_ID
-  FACEBOOK_ACCESS_TOKEN = var.FACEBOOK_ACCESS_TOKEN
-  GIPHY_API_KEY = var.GIPHY_API_KEY
-  FIREBASE_API_KEY = var.FIREBASE_API_KEY
-  tls_crt = var.tls_crt
-  tls_key = var.tls_key
-  DEFAULT_PROFILE_ID = var.DEFAULT_PROFILE_ID
+  FACEBOOK_ACCESS_TOKEN    = var.FACEBOOK_ACCESS_TOKEN
+  GIPHY_API_KEY            = var.GIPHY_API_KEY
+  FIREBASE_API_KEY         = var.FIREBASE_API_KEY
+  tls_crt                  = var.tls_crt
+  tls_key                  = var.tls_key
+  DEFAULT_PROFILE_ID       = var.DEFAULT_PROFILE_ID
 }
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index d800aedae..9a0a0db08 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -13,7 +13,8 @@ variable "linode_app_label" {
 variable "github" {
   default = null
 }
-variable "htpasswd" { # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
+variable "htpasswd" {
+  # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
   default = "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
 }
 variable "tls_crt" {
@@ -22,7 +23,8 @@ variable "tls_crt" {
 variable "tls_key" {
   default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
 }
-variable "SECRET_KEY" { # bash download_content.sh generate_secret_key
+variable "SECRET_KEY" {
+  # bash download_content.sh generate_secret_key
   default = "yC1-o_%kBSDMYsTloYHf4JxUrU&TQuQXf(-XwIPh%MeHE%T5vM"
 }
 variable "RECAPTCHA_PRIVATE_KEY" {

From 31d269ef4838c572ab36284a3cbc8cbbd74132bc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 17:31:31 +0300
Subject: [PATCH 193/221] Setting up autorestoring from backups

---
 README.md                                     |  4 +-
 kubernetes/docker/backup/Dockerfile           |  3 +-
 kubernetes/docker/backup/backup.sh            | 25 +++++++--
 kubernetes/docker/backup/restore.sh           | 54 +++++++++++++++++++
 kubernetes/terraform/.terraform.lock.hcl      | 22 --------
 .../terraform/helm/charts/backend/values.yaml |  3 +-
 .../helm/charts/backup/templates/cm.yaml      |  9 ++++
 .../helm/charts/backup/templates/cronjob.yaml | 14 ++---
 .../helm/charts/backup/templates/init.yaml    | 20 +++++++
 .../helm/charts/backup/templates/secret.yaml  | 12 ++---
 .../terraform/helm/charts/backup/values.yaml  |  5 +-
 .../charts/certmanager/templates/secret.yaml  |  2 +-
 .../charts/ingress/templates/ingress.yaml     |  2 +-
 .../terraform/helm/charts/photo/Chart.yaml    |  6 +++
 .../template}/pv-photo.yaml                   |  4 +-
 .../template}/pvc-photo.yaml                  |  2 +-
 .../terraform/helm/charts/photo/values.yaml   |  1 +
 kubernetes/terraform/helm/main.tf             | 21 ++++++--
 kubernetes/terraform/linode/main.tf           |  7 ++-
 19 files changed, 157 insertions(+), 59 deletions(-)
 create mode 100644 kubernetes/docker/backup/restore.sh
 create mode 100644 kubernetes/terraform/helm/charts/backup/templates/cm.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backup/templates/init.yaml
 create mode 100644 kubernetes/terraform/helm/charts/photo/Chart.yaml
 rename kubernetes/terraform/helm/charts/{backend/templates => photo/template}/pv-photo.yaml (61%)
 rename kubernetes/terraform/helm/charts/{backend/templates => photo/template}/pvc-photo.yaml (86%)
 create mode 100644 kubernetes/terraform/helm/charts/photo/values.yaml

diff --git a/README.md b/README.md
index 13aeec321..70ceceb03 100644
--- a/README.md
+++ b/README.md
@@ -531,8 +531,8 @@ You will have to create a few accounts and setup a few variables in ./kubernetes
 
 ### Backups:
 Backups are done using private git repository. It includes sql dump + photo directory
- - Create a private repo (e.g. github)
- - Place repo url e.g. `git@github.com:username/backup_repo.git` to `terraform.tfvars` with key `github`
+ - Create a private repo. 
+ - Place repo url e.g. `git@github.com:username/backup_repo.git` to `terraform.tfvars` with key `github`. Url should be in ssh format not in https. Authorization will be done by ssh key-pair
  - Generate a new keypair with `ssh-keygen -t rsa -b 4096 -C "kube backup" -f  /tmp/sshkey/id_rsa -N ""` 
  - Put public key to your git server (for Github it's Settings (on dashboard) -> Deploy Keys -> Add deploy key)
  - Put ssh public key `ssh-rsa aa...` to  `terraform.tfvars` with key `id_rsa_pub`
diff --git a/kubernetes/docker/backup/Dockerfile b/kubernetes/docker/backup/Dockerfile
index 60ac11273..40821a527 100644
--- a/kubernetes/docker/backup/Dockerfile
+++ b/kubernetes/docker/backup/Dockerfile
@@ -7,4 +7,5 @@ FROM alpine:3.15
 WORKDIR /src
 
 RUN apk --update add bash git openssh-client mysql-client
-COPY ./kubernetes/docker/backup/backup.sh /src/
+COPY ./kubernetes/docker/backup/backup.sh /bin/
+COPY ./kubernetes/docker/backup/restore.sh /bin/
diff --git a/kubernetes/docker/backup/backup.sh b/kubernetes/docker/backup/backup.sh
index 40960b88d..12939ca06 100644
--- a/kubernetes/docker/backup/backup.sh
+++ b/kubernetes/docker/backup/backup.sh
@@ -1,5 +1,5 @@
-WORK='/src/git'
 set -x
+WORK='/src/git'
 cd "$WORK"
 
 commitNoFail() {
@@ -15,7 +15,24 @@ cp /src/ssh/id_rsa ~/.ssh/id_rsa
 cp /src/ssh/id_rsa.pub ~/.ssh/id_rsa.pub
 chmod 600 ~/.ssh/id_rsa
 chmod 600 ~/.ssh/id_rsa.pub
-ssh-keyscan github.com > ~/.ssh/known_hosts
+
+#-n      suppress printing
+#s       substitute
+#^.*     anything at the beginning
+#-       up until the @
+#\(      start capture group
+#\S*     any non-space characters
+#\)      end capture group
+#-       up until the : charaterd
+#.*$     anything at the end
+#\1      substitute 1st capture group for everything on line
+#p       print it
+
+hostname=$(echo "$GITHUB_REPO" | sed -n "s/^.*\@\(\S*\):.*$/\1/p")
+
+echo detected private repo hostname="$hostname"
+
+ssh-keyscan $hostname > ~/.ssh/known_hosts
 if [ ! -d "$WORK/.git" ]; then
   git init &&
   git remote add origin $GITHUB_REPO &&
@@ -26,11 +43,11 @@ fi
 # --comments=FALSE to avoid dump-time in dump.sql that allows empty-data commit
 git config pull.rebase false
 git pull && \
-mysqldump -u $MYSQL_USER -p$MYSQL_PASSWORD -h $MYSQL_HOST --comments=FALSE $MYSQL_DATABASE > "$WORK/backend/data.sql" && \
+mysqldump -u $MYSQL_USER -P $MYSQL_PORT -p$MYSQL_PASSWORD -h $MYSQL_HOST --comments=FALSE $MYSQL_DATABASE > "$WORK/data.sql" && \
 cd "$WORK/backend/photos" && \
 find . -size +25000k  > .gitignore && \
 cd "$WORK" && \
-git add -A && \
+git add . && \
 commitNoFail && \
 git push || exit 1
 
diff --git a/kubernetes/docker/backup/restore.sh b/kubernetes/docker/backup/restore.sh
new file mode 100644
index 000000000..d9bc90cf9
--- /dev/null
+++ b/kubernetes/docker/backup/restore.sh
@@ -0,0 +1,54 @@
+WORK='/src/git'
+set -x
+cd "$WORK"
+
+
+git config --global user.email "backup@pychat.org"
+git config --global user.name "cronjob"
+mkdir ~/.ssh -p
+cp /src/ssh/id_rsa ~/.ssh/id_rsa
+cp /src/ssh/id_rsa.pub ~/.ssh/id_rsa.pub
+chmod 600 ~/.ssh/id_rsa
+chmod 600 ~/.ssh/id_rsa.pub
+
+#-n      suppress printing
+#s       substitute
+#^.*     anything at the beginning
+#-       up until the @
+#\(      start capture group
+#\S*     any non-space characters
+#\)      end capture group
+#-       up until the : charaterd
+#.*$     anything at the end
+#\1      substitute 1st capture group for everything on line
+#p       print it
+
+hostname=$(echo "$GITHUB_REPO" | sed -n "s/^.*\@\(\S*\):.*$/\1/p")
+
+echo detected private repo hostname="$hostname"
+
+ssh-keyscan $hostname > ~/.ssh/known_hosts
+if [ ! -d "$WORK/.git" ]; then
+  git init &&
+  git remote add origin $GITHUB_REPO &&
+  git fetch &&
+  git checkout master -f &&
+  git branch --set-upstream-to origin/master || exit 1
+fi
+
+git config pull.rebase false
+git pull || exit 2
+
+tables=$(mysql --user=$MYSQL_USER -P $MYSQL_PORT -p$MYSQL_PASSWORD -h $MYSQL_HOST $MYSQL_DATABASE -sse "show tables;")
+if [ -f "$WORK/data.sql" ]; then
+  if [ -z "$tables" ]; then
+    echo "Database is empty, restoring it"
+    mysql --user=$MYSQL_USER -P $MYSQL_PORT -p$MYSQL_PASSWORD -h $MYSQL_HOST $MYSQL_DATABASE < "$WORK/data.sql" || exit 3
+  else
+    echo "Database tables exist, no restore is required: $tables"
+  fi
+else
+  echo "Sql $WORK/data.sql file doesnt exist"
+fi
+
+
diff --git a/kubernetes/terraform/.terraform.lock.hcl b/kubernetes/terraform/.terraform.lock.hcl
index b155dfb13..f0c431ff1 100644
--- a/kubernetes/terraform/.terraform.lock.hcl
+++ b/kubernetes/terraform/.terraform.lock.hcl
@@ -63,28 +63,6 @@ provider "registry.terraform.io/hashicorp/local" {
   ]
 }
 
-provider "registry.terraform.io/kreuzwerker/docker" {
-  version     = "3.0.2"
-  constraints = "3.0.2"
-  hashes = [
-    "h1:cT2ccWOtlfKYBUE60/v2/4Q6Stk1KYTNnhxSck+VPlU=",
-    "zh:15b0a2b2b563d8d40f62f83057d91acb02cd0096f207488d8b4298a59203d64f",
-    "zh:23d919de139f7cd5ebfd2ff1b94e6d9913f0977fcfc2ca02e1573be53e269f95",
-    "zh:38081b3fe317c7e9555b2aaad325ad3fa516a886d2dfa8605ae6a809c1072138",
-    "zh:4a9c5065b178082f79ad8160243369c185214d874ff5048556d48d3edd03c4da",
-    "zh:5438ef6afe057945f28bce43d76c4401254073de01a774760169ac1058830ac2",
-    "zh:60b7fadc287166e5c9873dfe53a7976d98244979e0ab66428ea0dea1ebf33e06",
-    "zh:61c5ec1cb94e4c4a4fb1e4a24576d5f39a955f09afb17dab982de62b70a9bdd1",
-    "zh:a38fe9016ace5f911ab00c88e64b156ebbbbfb72a51a44da3c13d442cd214710",
-    "zh:c2c4d2b1fd9ebb291c57f524b3bf9d0994ff3e815c0cd9c9bcb87166dc687005",
-    "zh:d567bb8ce483ab2cf0602e07eae57027a1a53994aba470fa76095912a505533d",
-    "zh:e83bf05ab6a19dd8c43547ce9a8a511f8c331a124d11ac64687c764ab9d5a792",
-    "zh:e90c934b5cd65516fbcc454c89a150bfa726e7cf1fe749790c7480bbeb19d387",
-    "zh:f05f167d2eaf913045d8e7b88c13757e3cf595dd5cd333057fdafc7c4b7fed62",
-    "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
-  ]
-}
-
 provider "registry.terraform.io/linode/linode" {
   version     = "2.2.0"
   constraints = "2.2.0"
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
index 7811fdb5d..0e24917bd 100644
--- a/kubernetes/terraform/helm/charts/backend/values.yaml
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -2,13 +2,12 @@ image:
   repository_path: deathangel908/pychat-backend
   pullPolicy: Always # change to IfNotPresent for minikube
   tag: "latest"
-disk:
-  photo_size: "15Gi"
 mysql:
   mysql_database_name: $mysql_database_name
   mysql_user: $mysql_user
   mysql_password: $mysql_password
 domain_name: $domain_name
+github: $github
 DEFAULT_PROFILE_ID: "${DEFAULT_PROFILE_ID}"
 FIREBASE_API_KEY: $FIREBASE_API_KEY
 GIPHY_API_KEY: $GIPHY_API_KEY
diff --git a/kubernetes/terraform/helm/charts/backup/templates/cm.yaml b/kubernetes/terraform/helm/charts/backup/templates/cm.yaml
new file mode 100644
index 000000000..1019d6a2f
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backup/templates/cm.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm-backup
+  namespace: pychat
+data:
+  MYSQL_PORT: "3306"
+  MYSQL_HOST: mariadb-service
+  MYSQL_DATABASE: "{{ .Values.mysql_database_name }}"
diff --git a/kubernetes/terraform/helm/charts/backup/templates/cronjob.yaml b/kubernetes/terraform/helm/charts/backup/templates/cronjob.yaml
index 228798074..060eeae3e 100644
--- a/kubernetes/terraform/helm/charts/backup/templates/cronjob.yaml
+++ b/kubernetes/terraform/helm/charts/backup/templates/cronjob.yaml
@@ -16,17 +16,11 @@ spec:
           - name: backend-backup
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
-            env:
-              - name: GITHUB_REPO
-                valueFrom:
-                  secretKeyRef:
-                    key: GITHUB_REPO
-                    name: git-secret
             envFrom:
             - secretRef:
-                name: backend-secret
+                name: secret-backup
             - configMapRef:
-                name: config-map
+                name: cm-backup
             volumeMounts:
               - mountPath: "/src/git/backend/photos"
                 name: photo
@@ -40,7 +34,7 @@ spec:
                 subPath: id_rsa.pub
             command:
             - /bin/bash
-            - /src/backup.sh
+            - /bin/backup.sh
           restartPolicy: OnFailure
           volumes:
             - name: photo
@@ -51,4 +45,4 @@ spec:
                 claimName: pvc-backup
             - name: git-ssh-key
               secret:
-                secretName: git-secret
+                secretName: secret-backup
diff --git a/kubernetes/terraform/helm/charts/backup/templates/init.yaml b/kubernetes/terraform/helm/charts/backup/templates/init.yaml
new file mode 100644
index 000000000..4bf0461a3
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backup/templates/init.yaml
@@ -0,0 +1,20 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: migrate-backend-job
+  namespace: pychat
+spec:
+  template:
+    spec:
+      containers:
+      - name: restore-backup
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
+        command: ["/bin/bash", "/bin/restore.sh"]
+        envFrom:
+        - secretRef:
+            name: secret-backup
+        - configMapRef:
+            name: cm-backup
+      restartPolicy: Never
+  backoffLimit: 4
diff --git a/kubernetes/terraform/helm/charts/backup/templates/secret.yaml b/kubernetes/terraform/helm/charts/backup/templates/secret.yaml
index 848fa33d0..39b53f6bb 100644
--- a/kubernetes/terraform/helm/charts/backup/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/backup/templates/secret.yaml
@@ -2,11 +2,11 @@ apiVersion: v1
 kind: Secret
 type: Opaque
 metadata: # ssh-keygen -t rsa -b 4096 -C "kube backup" -f  /tmp/sshkey/id_rsa -N ""
-  name: git-secret
+  name: secret-backup
   namespace: pychat
 stringData:
-  GITHUB_REPO: $github
-  id_rsa: $id_rsa
-  id_rsa.pub: $id_rsa_pub
-
-
+  GITHUB_REPO: "{{ .Values.github }}"
+  id_rsa: "{{ .Values.id_rsa }}"
+  id_rsa.pub: "{{ .Values.id_rsa_pub }}"
+  MYSQL_PASSWORD: "{{ .Values.mysql_password }}"
+  MYSQL_USER: "{{ .Values.mysql_user }}"
diff --git a/kubernetes/terraform/helm/charts/backup/values.yaml b/kubernetes/terraform/helm/charts/backup/values.yaml
index 9273dd1e9..a3955a7a7 100644
--- a/kubernetes/terraform/helm/charts/backup/values.yaml
+++ b/kubernetes/terraform/helm/charts/backup/values.yaml
@@ -5,7 +5,10 @@ image:
   pullPolicy: Always # change to IfNotPresent for minikube
   tag: "latest"
 
-disk-size: 15Gi
+mysql_password: $mysql_password
+mysql_user: $mysql_user
+mysql_database_name: $mysql_database_name
+
 id_rsa: $id_rsa
 id_rsa_pub: $id_rsa_pub
 github: $github
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
index 58a4d67ba..dd536e38f 100644
--- a/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
@@ -5,4 +5,4 @@ metadata:
   namespace: pychat
 type: Opaque
 stringData:
-  api-token: {{ .Values.cloud_flare_api_token }}
+  api-token: "{{ .Values.cloud_flare_api_token }}"
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
index 61b851708..fcd52ba53 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
@@ -56,7 +56,7 @@ spec:
             name: frontend-service
             port:
               number: 80
-{{ if ne .Values.htpasswd "" }}
+{{ if .Values.htpasswd }}
   - host: "registry.{{ .Values.domain_name }}"
     http:
       paths:
diff --git a/kubernetes/terraform/helm/charts/photo/Chart.yaml b/kubernetes/terraform/helm/charts/photo/Chart.yaml
new file mode 100644
index 000000000..a08fadff1
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/photo/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: photo storage
+description: this chart is used by backend, backup and moved here for explicity management
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/kubernetes/terraform/helm/charts/backend/templates/pv-photo.yaml b/kubernetes/terraform/helm/charts/photo/template/pv-photo.yaml
similarity index 61%
rename from kubernetes/terraform/helm/charts/backend/templates/pv-photo.yaml
rename to kubernetes/terraform/helm/charts/photo/template/pv-photo.yaml
index c78a78b4f..19df40305 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/pv-photo.yaml
+++ b/kubernetes/terraform/helm/charts/photo/template/pv-photo.yaml
@@ -6,6 +6,6 @@ spec:
   accessModes:
     - ReadWriteMany
   capacity:
-    storage: {{ .Values.disk.photo_size }}
+    storage: {{ .Values.disk_size }}
   hostPath:
-    path: /data/backup/backend/photos
+    path: /data/photos
diff --git a/kubernetes/terraform/helm/charts/backend/templates/pvc-photo.yaml b/kubernetes/terraform/helm/charts/photo/template/pvc-photo.yaml
similarity index 86%
rename from kubernetes/terraform/helm/charts/backend/templates/pvc-photo.yaml
rename to kubernetes/terraform/helm/charts/photo/template/pvc-photo.yaml
index de252eaa1..9b2b42839 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/pvc-photo.yaml
+++ b/kubernetes/terraform/helm/charts/photo/template/pvc-photo.yaml
@@ -8,6 +8,6 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: {{ .Values.disk.photo_size }}
+      storage: {{ .Values.disk_size }}
   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
   volumeName: pv-photo
diff --git a/kubernetes/terraform/helm/charts/photo/values.yaml b/kubernetes/terraform/helm/charts/photo/values.yaml
new file mode 100644
index 000000000..e920f759e
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/photo/values.yaml
@@ -0,0 +1 @@
+disk-size: 15Gi
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index ee31b6568..928979dbf 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -6,7 +6,13 @@ resource "helm_release" "global" {
 resource "helm_release" "backend" {
   name       = "backend"
   chart      = "${path.module}/charts/backend"
-  depends_on = [helm_release.global, helm_release.mariadb, helm_release.redis]
+  depends_on = [
+    helm_release.global,
+    helm_release.mariadb,
+    helm_release.redis,
+    helm_release.photo,
+    helm_release.backup // backup will restore database state if it exists, so it should go first, otherwise backend will create its own
+  ]
 
   set {
     name  = "domain_name"
@@ -122,13 +128,13 @@ resource "helm_release" "backup" {
   count      = var.github == null ? 0 : 1
   name       = "backup"
   chart      = "${path.module}/charts/backup"
-  depends_on = [helm_release.mariadb, helm_release.backend] // because of pvc-photo
+  depends_on = [helm_release.mariadb, helm_release.photo]
 
   set {
     name  = "email"
     value = var.email
   }
-  set {
+  set_sensitive {
     name  = "id_rsa"
     value = var.id_rsa
   }
@@ -152,11 +158,16 @@ resource "helm_release" "backup" {
     name  = "mysql_user"
     value = var.mysql_user
   }
-  set {
+  set_sensitive {
     name  = "mysql_password"
     value = var.mysql_password
   }
 }
+resource "helm_release" "photo" {
+  name = "photo"
+  chart  = "${path.module}/charts/photo"
+    depends_on = [helm_release.global]
+}
 
 resource "helm_release" "coturn" {
   name       = "coturn"
@@ -188,7 +199,7 @@ resource "helm_release" "coturn" {
 resource "helm_release" "frontend" {
   name       = "frontend"
   chart      = "${path.module}/charts/frontend"
-  depends_on = [helm_release.global, helm_release.backend] // because of pvc-photo
+  depends_on = [helm_release.global, helm_release.photo]
 }
 
 resource "helm_release" "ingress" {
diff --git a/kubernetes/terraform/linode/main.tf b/kubernetes/terraform/linode/main.tf
index 5a5c09f3d..93292c535 100644
--- a/kubernetes/terraform/linode/main.tf
+++ b/kubernetes/terraform/linode/main.tf
@@ -4,7 +4,6 @@ resource "linode_lke_cluster" "pychat" {
   region      = var.region
 
   pool {
-    #   https://github.com/linode/terraform-provider-linode/pull/569
     #    tags  = ["pychat_linode"]
     count = var.node_count
     type  = var.node_type
@@ -12,7 +11,13 @@ resource "linode_lke_cluster" "pychat" {
 }
 
 data "linode_instances" "pychat_linode" {
+  depends_on = [linode_lke_cluster.pychat]
+  # TODO this currently gets all nodes, even those which are not relevant to current cluster.
+  # Unfortunately terraform linode_instances api, doesn't allow marking linode_lke_cluster pool by tags
+  # Even though their REST api allow it
+  # Check the PR https://github.com/linode/terraform-provider-linode/pull/569
 
+  # Linode terraform API allows setting up via via load balancer, but it additionally costs 10$/month :(
   #  filter {
   #    name   = "tags"
   #    values = ["pychat_linode"]

From 9b3380c5111ac6181769a92a3355dc0d704575e3 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 19:20:31 +0300
Subject: [PATCH 194/221] Fixed a lot of terraform errors, asd-asd variable is
 not in correct format diskSize 15Gi should be in quotes values must be passed
 as base64 to secrets All values should be qoutes in configmaps namespaces
 should be defined helm directories should be templates instead of template
 Added timeouts for testing, it can be removed

---
 README.md                                     |  4 +++-
 .../helm/charts/backend/templates/init.yaml   |  2 +-
 .../helm/charts/backend/templates/secret.yaml | 21 +++++++++--------
 .../terraform/helm/charts/backup/Chart.yaml   |  2 +-
 .../helm/charts/backup/templates/init.yaml    | 23 ++++++++++++++++++-
 .../helm/charts/backup/templates/pv.yaml      |  3 ++-
 .../helm/charts/backup/templates/pvc.yaml     |  2 +-
 .../helm/charts/backup/templates/secret.yaml  | 11 +++++----
 .../terraform/helm/charts/backup/values.yaml  |  2 +-
 .../charts/certmanager/templates/secret.yaml  |  4 ++--
 .../helm/charts/coturn/templates/cm.yaml      |  6 ++---
 .../helm/charts/docker-registry/Chart.yaml    |  2 +-
 .../charts/docker-registry/templates/pv.yaml  |  1 +
 .../docker-registry/templates/secret.yaml     |  4 ++--
 .../helm/charts/docker-registry/values.yaml   |  2 +-
 .../helm/charts/mariadb/templates/cm.yaml     |  2 +-
 .../helm/charts/mariadb/templates/pv.yaml     |  1 +
 .../helm/charts/mariadb/templates/secret.yaml |  8 +++----
 .../terraform/helm/charts/photo/Chart.yaml    |  2 +-
 .../{template => templates}/pv-photo.yaml     |  1 +
 .../{template => templates}/pvc-photo.yaml    |  0
 .../terraform/helm/charts/photo/values.yaml   |  2 +-
 .../helm/charts/postfix/templates/cm.yaml     |  2 +-
 .../helm/charts/redis/templates/pv.yaml       |  1 +
 .../helm/charts/self-signed/Chart.yaml        |  2 +-
 .../charts/self-signed/templates/secret.yaml  |  5 ++--
 kubernetes/terraform/helm/main.tf             |  7 +++++-
 kubernetes/terraform/helm/variables.tf        | 11 ++++++---
 28 files changed, 87 insertions(+), 46 deletions(-)
 rename kubernetes/terraform/helm/charts/photo/{template => templates}/pv-photo.yaml (90%)
 rename kubernetes/terraform/helm/charts/photo/{template => templates}/pvc-photo.yaml (100%)

diff --git a/README.md b/README.md
index 70ceceb03..90b5e187a 100644
--- a/README.md
+++ b/README.md
@@ -561,7 +561,9 @@ Upon linode cluster creation .kubeconfig will be generated in kubernetes/terrafo
 ### If you already own a k8s cluster.
 All helm charts are located in kubernetes/terraform/helm, we will apply terraform from this directory to exclude linode and cloudlfare resource creation
  - cd kubernetes/terraform/helm
- - create `terraform.tf` in this directory and put all required content in it.
+ - create `terraform.tfvars` in this directory and put all required content in it.
+ - `cat ~/.kube/config |base64 -w 0` and place value to `terraform.tfvars` with key `kubeconfig`
+ - Put external ip address of the k8s node you are going to deploy pychat in `terraform.tfvars` with key `ip_address`. Pychat uses NodePort, if you want to use your loadbalancer you will have to tweak ingress configuration manually.
  - `terraform init`
  - `terraform apply`
 
diff --git a/kubernetes/terraform/helm/charts/backend/templates/init.yaml b/kubernetes/terraform/helm/charts/backend/templates/init.yaml
index c9828988c..1a42a3a15 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/init.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/init.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: migrate-backend-job
+  name: create-database-job
   namespace: pychat
 spec:
   template:
diff --git a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
index 0bacf211d..3e202d906 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
@@ -5,17 +5,18 @@ metadata:
   name: backend-secret
   namespace: pychat
 stringData:
-  MYSQL_PASSWORD: "{{ .Values.mysql_password }}"
-  MYSQL_USER: "{{ .Values.mysql_database_name }}"
   EMAIL_HOST_USER: ""
   EMAIL_HOST_PASSWORD: ""
-  SERVER_EMAIL: "root@{{ .Values.domain_name }}"
-  SECRET_KEY: "{{ .Values.SECRET_KEY }}"
-  RECAPTCHA_PRIVATE_KEY: "{{ .Values.RECAPTCHA_PRIVATE_KEY }}"
-  RECAPTCHA_PUBLIC_KEY: "{{ .Values.RECAPTCHA_PUBLIC_KEY }}"
-  GOOGLE_OAUTH_2_CLIENT_ID: "{{ .Values.GOOGLE_OAUTH_2_CLIENT_ID }}"
-  FACEBOOK_ACCESS_TOKEN: "{{ .Values.FACEBOOK_ACCESS_TOKEN }}"
-  GIPHY_API_KEY: "{{ .Values.GIPHY_API_KEY }}"
-  FIREBASE_API_KEY: "{{ .Values.FIREBASE_API_KEY }}"
   DEFAULT_PROFILE_ID: "{{ .Values.DEFAULT_PROFILE_ID }}"
+  SERVER_EMAIL: "root@{{ .Values.domain_name }}"
+data:
+  SECRET_KEY: {{ .Values.SECRET_KEY | b64enc }}
+  MYSQL_PASSWORD: {{ .Values.mysql_password  | b64enc }}
+  MYSQL_USER: {{ .Values.mysql_database_name  | b64enc }}
+  RECAPTCHA_PRIVATE_KEY: {{ .Values.RECAPTCHA_PRIVATE_KEY  | b64enc }}
+  RECAPTCHA_PUBLIC_KEY: {{ .Values.RECAPTCHA_PUBLIC_KEY  | b64enc }}
+  GOOGLE_OAUTH_2_CLIENT_ID: {{ .Values.GOOGLE_OAUTH_2_CLIENT_ID  | b64enc }}
+  FACEBOOK_ACCESS_TOKEN: {{ .Values.FACEBOOK_ACCESS_TOKEN  | b64enc }}
+  GIPHY_API_KEY: {{ .Values.GIPHY_API_KEY  | b64enc }}
+  FIREBASE_API_KEY: {{ .Values.FIREBASE_API_KEY  | b64enc }}
 
diff --git a/kubernetes/terraform/helm/charts/backup/Chart.yaml b/kubernetes/terraform/helm/charts/backup/Chart.yaml
index 362640da0..8b86604c7 100644
--- a/kubernetes/terraform/helm/charts/backup/Chart.yaml
+++ b/kubernetes/terraform/helm/charts/backup/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: certmanager
+name: backup
 description: this chart automatically generates and updates ssl certificates from letsencrypt
 type: application
 version: 0.1.0
diff --git a/kubernetes/terraform/helm/charts/backup/templates/init.yaml b/kubernetes/terraform/helm/charts/backup/templates/init.yaml
index 4bf0461a3..c3710575f 100644
--- a/kubernetes/terraform/helm/charts/backup/templates/init.yaml
+++ b/kubernetes/terraform/helm/charts/backup/templates/init.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: migrate-backend-job
+  name: restore-database-job
   namespace: pychat
 spec:
   template:
@@ -16,5 +16,26 @@ spec:
             name: secret-backup
         - configMapRef:
             name: cm-backup
+        volumeMounts:
+          - mountPath: "/src/git/backend/photos"
+            name: photo
+          - mountPath: "/src/git/"
+            name: backup
+          - name: git-ssh-key
+            mountPath: /src/ssh/id_rsa
+            subPath: id_rsa
+          - name: git-ssh-key
+            mountPath: /src/ssh/id_rsa.pub
+            subPath: id_rsa.pub
       restartPolicy: Never
+      volumes:
+        - name: photo
+          persistentVolumeClaim:
+            claimName: pvc-photo
+        - name: backup
+          persistentVolumeClaim:
+            claimName: pvc-backup
+        - name: git-ssh-key
+          secret:
+            secretName: secret-backup
   backoffLimit: 4
diff --git a/kubernetes/terraform/helm/charts/backup/templates/pv.yaml b/kubernetes/terraform/helm/charts/backup/templates/pv.yaml
index e8cab2e29..8026318c2 100644
--- a/kubernetes/terraform/helm/charts/backup/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/backup/templates/pv.yaml
@@ -2,10 +2,11 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: pv-backup
+  namespace: pychat
 spec:
   accessModes:
     - ReadWriteMany
   capacity:
-    storage: {{ .Values.disk-size }}
+    storage: {{ .Values.disk_size }}
   hostPath:
     path: /data/backup
diff --git a/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml b/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
index af538556b..302341321 100644
--- a/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
+++ b/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
@@ -8,6 +8,6 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: {{ .Values.disk-size }}
+      storage: {{ .Values.disk_size }}
   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
   volumeName: pv-backup
diff --git a/kubernetes/terraform/helm/charts/backup/templates/secret.yaml b/kubernetes/terraform/helm/charts/backup/templates/secret.yaml
index 39b53f6bb..9a1c8f636 100644
--- a/kubernetes/terraform/helm/charts/backup/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/backup/templates/secret.yaml
@@ -5,8 +5,9 @@ metadata: # ssh-keygen -t rsa -b 4096 -C "kube backup" -f  /tmp/sshkey/id_rsa -N
   name: secret-backup
   namespace: pychat
 stringData:
-  GITHUB_REPO: "{{ .Values.github }}"
-  id_rsa: "{{ .Values.id_rsa }}"
-  id_rsa.pub: "{{ .Values.id_rsa_pub }}"
-  MYSQL_PASSWORD: "{{ .Values.mysql_password }}"
-  MYSQL_USER: "{{ .Values.mysql_user }}"
+data:
+  id_rsa: {{ .Values.id_rsa | b64enc }}
+  GITHUB_REPO: {{ .Values.github | b64enc }}
+  id_rsa.pub: {{ .Values.id_rsa_pub | b64enc }}
+  MYSQL_PASSWORD: {{ .Values.mysql_password | b64enc }}
+  MYSQL_USER: {{ .Values.mysql_user | b64enc }}
diff --git a/kubernetes/terraform/helm/charts/backup/values.yaml b/kubernetes/terraform/helm/charts/backup/values.yaml
index a3955a7a7..4f0d0f7a4 100644
--- a/kubernetes/terraform/helm/charts/backup/values.yaml
+++ b/kubernetes/terraform/helm/charts/backup/values.yaml
@@ -8,7 +8,7 @@ image:
 mysql_password: $mysql_password
 mysql_user: $mysql_user
 mysql_database_name: $mysql_database_name
-
+disk_size: "15Gi"
 id_rsa: $id_rsa
 id_rsa_pub: $id_rsa_pub
 github: $github
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
index dd536e38f..721b6159f 100644
--- a/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/secret.yaml
@@ -4,5 +4,5 @@ metadata:
   name: cloudflare-api-token-secret
   namespace: pychat
 type: Opaque
-stringData:
-  api-token: "{{ .Values.cloud_flare_api_token }}"
+data:
+  api-token: {{ .Values.cloud_flare_api_token | b64enc }}
diff --git a/kubernetes/terraform/helm/charts/coturn/templates/cm.yaml b/kubernetes/terraform/helm/charts/coturn/templates/cm.yaml
index 9fdcc2319..a2e671a24 100644
--- a/kubernetes/terraform/helm/charts/coturn/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/coturn/templates/cm.yaml
@@ -4,8 +4,8 @@ metadata:
   name: cm-coturn
   namespace: pychat
 data:
-  DOMAIN_NAME: {{ .Values.domain_name }}
-  USERNAME: {{ .Values.username }}
-  PASSWORD: {{ .Values.password }}
+  DOMAIN_NAME: "{{ .Values.domain_name }}"
+  USERNAME: "{{ .Values.username }}"
+  PASSWORD: "{{ .Values.password }}"
   MIN_PORT: "{{ .Values.udp_port_range_start }}"
   MAX_PORT: "{{ .Values.udp_port_range_end }}"
diff --git a/kubernetes/terraform/helm/charts/docker-registry/Chart.yaml b/kubernetes/terraform/helm/charts/docker-registry/Chart.yaml
index 89fbca3fd..a98a4693c 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/Chart.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: docker registry
+name: registry
 description: private docker registry to hold docker images
 type: application
 version: 0.1.0
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
index d26c04d66..3511d7cd9 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: pv-registry
+  namespace: pychat
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/secret.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/secret.yaml
index 74a7821fe..34c1413a2 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/secret.yaml
@@ -4,5 +4,5 @@ type: Opaque
 metadata:
   name: docker-secret
   namespace: pychat
-stringData:
-  htpasswd: "{{ .Values.htpasswd }}"
+data:
+  htpasswd: {{ .Values.htpasswd  | b64enc  }}
diff --git a/kubernetes/terraform/helm/charts/docker-registry/values.yaml b/kubernetes/terraform/helm/charts/docker-registry/values.yaml
index bde882877..4716f3ddc 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/values.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/values.yaml
@@ -1,3 +1,3 @@
 domain_name: $domain_name
-disk_size: 15Gi
+disk_size: "15Gi"
 htpasswd: $htpasswd
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
index 1464f47f8..b514bf453 100644
--- a/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/cm.yaml
@@ -5,6 +5,6 @@ metadata:
   namespace: pychat
 data:
   MYSQL_PORT: "3306"
-  MYSQL_DATABASE: {{ .Values.mysql_database_name }}
+  MYSQL_DATABASE: "{{ .Values.mysql_database_name }}"
   MYSQL_CHARSET: utf8mb4
   MYSQL_COLLATION: utf8mb4_general_ci
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
index 32192ec9f..1627aae61 100644
--- a/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: pv-mariadb
+  napespace: pychat
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/secret.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/secret.yaml
index cf0f44af0..d09f0dbaa 100644
--- a/kubernetes/terraform/helm/charts/mariadb/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/secret.yaml
@@ -4,10 +4,10 @@ type: Opaque
 metadata:
   name: mariadb-secret
   namespace: pychat
-stringData:
-  MYSQL_PASSWORD: {{ .Values.mysql_password }}
-  MYSQL_USER: {{ .Values.mysql_user }}
-  MYSQL_ROOT_PASSWORD: {{ .Values.mysql_password }}
+data:
+  MYSQL_PASSWORD: {{ .Values.mysql_password  | b64enc }}
+  MYSQL_USER: {{ .Values.mysql_user  | b64enc }}
+  MYSQL_ROOT_PASSWORD: {{ .Values.mysql_password  | b64enc }}
 
 
 
diff --git a/kubernetes/terraform/helm/charts/photo/Chart.yaml b/kubernetes/terraform/helm/charts/photo/Chart.yaml
index a08fadff1..ab76926fb 100644
--- a/kubernetes/terraform/helm/charts/photo/Chart.yaml
+++ b/kubernetes/terraform/helm/charts/photo/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: photo storage
+name: photo
 description: this chart is used by backend, backup and moved here for explicity management
 type: application
 version: 0.1.0
diff --git a/kubernetes/terraform/helm/charts/photo/template/pv-photo.yaml b/kubernetes/terraform/helm/charts/photo/templates/pv-photo.yaml
similarity index 90%
rename from kubernetes/terraform/helm/charts/photo/template/pv-photo.yaml
rename to kubernetes/terraform/helm/charts/photo/templates/pv-photo.yaml
index 19df40305..762652725 100644
--- a/kubernetes/terraform/helm/charts/photo/template/pv-photo.yaml
+++ b/kubernetes/terraform/helm/charts/photo/templates/pv-photo.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: pv-photo
+  namespace: pychat
 spec:
   accessModes:
     - ReadWriteMany
diff --git a/kubernetes/terraform/helm/charts/photo/template/pvc-photo.yaml b/kubernetes/terraform/helm/charts/photo/templates/pvc-photo.yaml
similarity index 100%
rename from kubernetes/terraform/helm/charts/photo/template/pvc-photo.yaml
rename to kubernetes/terraform/helm/charts/photo/templates/pvc-photo.yaml
diff --git a/kubernetes/terraform/helm/charts/photo/values.yaml b/kubernetes/terraform/helm/charts/photo/values.yaml
index e920f759e..9ac90cc52 100644
--- a/kubernetes/terraform/helm/charts/photo/values.yaml
+++ b/kubernetes/terraform/helm/charts/photo/values.yaml
@@ -1 +1 @@
-disk-size: 15Gi
+disk_size: "15Gi"
diff --git a/kubernetes/terraform/helm/charts/postfix/templates/cm.yaml b/kubernetes/terraform/helm/charts/postfix/templates/cm.yaml
index 58a747ee5..5136fe6ea 100644
--- a/kubernetes/terraform/helm/charts/postfix/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/postfix/templates/cm.yaml
@@ -4,4 +4,4 @@ metadata:
   name: cm-postfix
   namespace: pychat
 data:
-  DOMAIN_NAME: {{ .Values.domain_name }}
+  DOMAIN_NAME: "{{ .Values.domain_name }}"
diff --git a/kubernetes/terraform/helm/charts/redis/templates/pv.yaml b/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
index 0fef3d714..2eee07376 100644
--- a/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: pv-redis
+  namespace: pychat
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/kubernetes/terraform/helm/charts/self-signed/Chart.yaml b/kubernetes/terraform/helm/charts/self-signed/Chart.yaml
index 9facc4f8b..08b5ad46b 100644
--- a/kubernetes/terraform/helm/charts/self-signed/Chart.yaml
+++ b/kubernetes/terraform/helm/charts/self-signed/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: self signed certificate
+name: certificate
 description: if cert-manager is not used, we can use self-signed certificate
 type: application
 version: 0.1.0
diff --git a/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml b/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
index c8eb6e726..5f0d63908 100644
--- a/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
@@ -5,5 +5,6 @@ metadata:
   name: self-signed-certificate
   namespace: pychat
 data:
-  tls.crt: "{{ .Value.tls_crt }} "
-  tls.key: "{{ .Value.tls_key }}"
+  # Should be already in base64
+  tls.crt: {{ .Value.tls_crt }}
+  tls.key: {{ .Value.tls_key }}
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 928979dbf..0675d6a9f 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -62,6 +62,7 @@ resource "helm_release" "backend" {
     name  = "DEFAULT_PROFILE_ID"
     value = var.DEFAULT_PROFILE_ID
   }
+  timeout = 60
 }
 
 resource "helm_release" "certmanager-definition" {
@@ -166,7 +167,7 @@ resource "helm_release" "backup" {
 resource "helm_release" "photo" {
   name = "photo"
   chart  = "${path.module}/charts/photo"
-    depends_on = [helm_release.global]
+  depends_on = [helm_release.global]
 }
 
 resource "helm_release" "coturn" {
@@ -194,12 +195,14 @@ resource "helm_release" "coturn" {
     name  = "udp_port_range_end"
     value = var.udp_port_range_end
   }
+  timeout = 30
 }
 
 resource "helm_release" "frontend" {
   name       = "frontend"
   chart      = "${path.module}/charts/frontend"
   depends_on = [helm_release.global, helm_release.photo]
+  timeout = 30
 }
 
 resource "helm_release" "ingress" {
@@ -226,6 +229,7 @@ resource "helm_release" "ingress" {
     value = var.udp_port_range_end
   }
   depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
+  timeout = 30
 }
 
 resource "helm_release" "mariadb" {
@@ -254,6 +258,7 @@ resource "helm_release" "postfix" {
     name  = "domain_name"
     value = var.domain_name
   }
+  timeout = 30
 }
 
 resource "helm_release" "redis" {
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index ab3ad6fa2..d5959d791 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,7 +1,11 @@
-variable "tls_key" {}
 variable "cloud_flare_api_token" {}
 variable "kubeconfig" {}
-variable "tls_crt" {}
+variable "tls_crt" {
+  default = null
+}
+variable "tls_key" {
+  default = null
+}
 
 variable "domain_name" {}
 variable "email" {}
@@ -31,7 +35,8 @@ variable "coturn_password" {
   default = "pypass"
 }
 variable "htpasswd" {
-  default = null
+  # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
+  default = "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
 }
 variable "mysql_password" {
   default = "pypass"

From 9fac2a7d0dfffd7f54c45d9c09b532d321043100 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 20:15:14 +0300
Subject: [PATCH 195/221] All helm resources are working from terraform gonna
 test pychat.org prod and terraform now

---
 kubernetes/terraform/helm/main.tf      | 4 ++++
 kubernetes/terraform/helm/variables.tf | 2 +-
 kubernetes/terraform/variables.tf      | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 0675d6a9f..80eefb645 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -163,6 +163,10 @@ resource "helm_release" "backup" {
     name  = "mysql_password"
     value = var.mysql_password
   }
+  # Backup should restore the database state before backend goes up
+  timeout = 600
+  wait_for_jobs = true
+  wait = true
 }
 resource "helm_release" "photo" {
   name = "photo"
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index d5959d791..22e2fa410 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -36,7 +36,7 @@ variable "coturn_password" {
 }
 variable "htpasswd" {
   # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
-  default = "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
+  default = null
 }
 variable "mysql_password" {
   default = "pypass"
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 9a0a0db08..bb098a128 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -15,7 +15,8 @@ variable "github" {
 }
 variable "htpasswd" {
   # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
-  default = "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
+  # "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
+  default = null
 }
 variable "tls_crt" {
   default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"

From 7feb093902ef2a8a1448236bde5c9925cd4929b7 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 20:53:23 +0300
Subject: [PATCH 196/221] Increased backup timeout

---
 kubernetes/terraform/helm/main.tf | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 80eefb645..5b96cc1c1 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -164,7 +164,7 @@ resource "helm_release" "backup" {
     value = var.mysql_password
   }
   # Backup should restore the database state before backend goes up
-  timeout = 600
+  timeout = 1200
   wait_for_jobs = true
   wait = true
 }
@@ -199,14 +199,12 @@ resource "helm_release" "coturn" {
     name  = "udp_port_range_end"
     value = var.udp_port_range_end
   }
-  timeout = 30
 }
 
 resource "helm_release" "frontend" {
   name       = "frontend"
   chart      = "${path.module}/charts/frontend"
   depends_on = [helm_release.global, helm_release.photo]
-  timeout = 30
 }
 
 resource "helm_release" "ingress" {
@@ -218,7 +216,7 @@ resource "helm_release" "ingress" {
   }
   set_sensitive {
     name  = "htpasswd"
-    value = var.htpasswd
+    value = var.htpasswd == null ? "" : var.htpasswd
   }
   set {
     name  = "external_ip"
@@ -233,7 +231,6 @@ resource "helm_release" "ingress" {
     value = var.udp_port_range_end
   }
   depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
-  timeout = 30
 }
 
 resource "helm_release" "mariadb" {
@@ -262,7 +259,6 @@ resource "helm_release" "postfix" {
     name  = "domain_name"
     value = var.domain_name
   }
-  timeout = 30
 }
 
 resource "helm_release" "redis" {

From ceb9c28736223b499034992ebd98178c8c61d2cd Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Sun, 28 May 2023 22:42:22 +0300
Subject: [PATCH 197/221] Increased backup timeout

---
 kubernetes/docker/backup/backup.sh | 7 +++++++
 kubernetes/terraform/helm/main.tf  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/kubernetes/docker/backup/backup.sh b/kubernetes/docker/backup/backup.sh
index 12939ca06..04ba1e02d 100644
--- a/kubernetes/docker/backup/backup.sh
+++ b/kubernetes/docker/backup/backup.sh
@@ -2,6 +2,13 @@ set -x
 WORK='/src/git'
 cd "$WORK"
 
+
+tables=$(mysql --user=$MYSQL_USER -P $MYSQL_PORT -p$MYSQL_PASSWORD -h $MYSQL_HOST $MYSQL_DATABASE -sse "show tables;")
+if [ -z "$tables" ]; then
+    echo "Database is not created yet, nothing to backup"
+    exit 1
+fi
+
 commitNoFail() {
   if ! git diff-index --quiet HEAD; then
     git commit -m "periodic refresh at `date`" || exit 1
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 5b96cc1c1..76465d2bf 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -164,7 +164,7 @@ resource "helm_release" "backup" {
     value = var.mysql_password
   }
   # Backup should restore the database state before backend goes up
-  timeout = 1200
+  timeout = 1800 # Practically my backup was running for 20m until it finished
   wait_for_jobs = true
   wait = true
 }

From 5fdf609df7247732c5187db6dcb4c6cbba79d121 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 29 May 2023 00:42:01 +0300
Subject: [PATCH 198/221] ingress first works better

---
 kubernetes/terraform/helm/main.tf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 76465d2bf..11049163d 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -230,7 +230,9 @@ resource "helm_release" "ingress" {
     name  = "udp_port_range_end"
     value = var.udp_port_range_end
   }
-  depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
+  # TODO
+  #  depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
+  depends_on = [helm_release.global]
 }
 
 resource "helm_release" "mariadb" {

From 08942cd9ee21b9f58298097d924d604624296a4e Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 29 May 2023 01:01:22 +0300
Subject: [PATCH 199/221] Fixed registry

---
 kubernetes/terraform/cloudflare/main.tf      | 1 +
 kubernetes/terraform/cloudflare/variables.tf | 3 +++
 kubernetes/terraform/main.tf                 | 1 +
 3 files changed, 5 insertions(+)

diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 13c542dfe..1fdea9779 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -17,6 +17,7 @@ resource "cloudflare_record" "static_pychat" {
 }
 
 resource "cloudflare_record" "registry_pychat" {
+  count = var.htpasswd == null ? 0 : 1
   name    = "registry"
   proxied = false
   ttl     = 1
diff --git a/kubernetes/terraform/cloudflare/variables.tf b/kubernetes/terraform/cloudflare/variables.tf
index 53fe25eb4..5f17f638a 100644
--- a/kubernetes/terraform/cloudflare/variables.tf
+++ b/kubernetes/terraform/cloudflare/variables.tf
@@ -2,3 +2,6 @@ variable "domain_name" {}
 variable "cloud_flare_zone_id" {}
 variable "cloud_flare_api_token" {}
 variable "ip_address" {}
+variable "htpasswd" {
+  default = null
+}
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index 2e1b76308..e57bea042 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -10,6 +10,7 @@ module "cloudflare" {
   cloud_flare_zone_id   = var.cloud_flare_zone_id
   domain_name           = var.domain_name
   ip_address            = module.linode.ip_address
+  htpasswd              = var.htpasswd
 }
 
 module "helm" {

From 977e08c4892b343b63e739610303a68bd914cfaa Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 29 May 2023 01:17:21 +0300
Subject: [PATCH 200/221] asd

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 90b5e187a..e8b301f28 100644
--- a/README.md
+++ b/README.md
@@ -595,7 +595,10 @@ Apply terraform configuration with:
 1. How to icrease maximum upload file:
  - Change nginx configuration  ``   client_max_body_size 75M;`
  - In addition to above, if you're using k8s + ingress, change `ingress.yaml` nginx.ingress.kubernetes.io/proxy-body-size: 75m 
- 
+1. Certmanager fails
+ - Check the logs of the certmanager pods. 
+ - Note that letsencrypt allows you max 5 cetrificates in 160 hours. If you used all tries, use another domain or subdomain
+ - 
 # TODO
 * teleport smileys https://vuejsdevelopers.com/2020/03/16/vue-js-tutorial/#teleporting-content
 * user1 writes a message, user1 goes offline, user 2 opens a chat from 1st devices and goes offline, user 2 opens a chat from 2nd devices and responds in its thread and goes offline, user2 opens first deviecs and thread messages count = 0

From fbfedf48847ed9f5ce09afe9e392bbffabb0114a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 29 May 2023 01:30:17 +0300
Subject: [PATCH 201/221] asd

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8b301f28..fa7f6aebe 100644
--- a/README.md
+++ b/README.md
@@ -598,7 +598,10 @@ Apply terraform configuration with:
 1. Certmanager fails
  - Check the logs of the certmanager pods. 
  - Note that letsencrypt allows you max 5 cetrificates in 160 hours. If you used all tries, use another domain or subdomain
- - 
+1. Terraform apply produces errors like `Unexpected EOF`.
+ - Seems like your k8s providers API exceed limits and it cuts the k8s request. You can try it with  `terraform apply -parallelism=1`. Your cluster will deploy for a while, but it has less chance to get into this situation
+ - You can also execute `terraform apply` a few times so it finishes creating resources that it failed to inspect. Note that if you got a certificate already, I recomend you to back it up from `pychat-tls` secret in order to avoid cetrification fails describe above
+ 
 # TODO
 * teleport smileys https://vuejsdevelopers.com/2020/03/16/vue-js-tutorial/#teleporting-content
 * user1 writes a message, user1 goes offline, user 2 opens a chat from 1st devices and goes offline, user 2 opens a chat from 2nd devices and responds in its thread and goes offline, user2 opens first deviecs and thread messages count = 0

From 19fb5a44c2b7efb0ec7daddabdc58ade372a2172 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 29 May 2023 01:32:25 +0300
Subject: [PATCH 202/221] Fix domain 3rd level

---
 kubernetes/terraform/cloudflare/main.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 1fdea9779..94fc04169 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -8,7 +8,7 @@ resource "cloudflare_record" "master_pychat" {
 }
 
 resource "cloudflare_record" "static_pychat" {
-  name    = "static"
+  name    = "static.${var.domain_name}"
   proxied = true
   ttl     = 1
   type    = "A"
@@ -18,7 +18,7 @@ resource "cloudflare_record" "static_pychat" {
 
 resource "cloudflare_record" "registry_pychat" {
   count = var.htpasswd == null ? 0 : 1
-  name    = "registry"
+  name    = "registry.${var.domain_name}"
   proxied = false
   ttl     = 1
   type    = "A"

From 4f20ad2b60f157db3c06cf83e7b5743c0bd7582a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 29 May 2023 23:30:50 +0300
Subject: [PATCH 203/221] k8s pv are note namespaced

---
 README.md                                            |  7 +++++--
 download_content.sh                                  | 12 ++++++------
 .../terraform/helm/charts/backup/templates/pv.yaml   |  3 +--
 .../terraform/helm/charts/backup/templates/pvc.yaml  |  2 +-
 .../helm/charts/docker-registry/templates/pv.yaml    |  3 +--
 .../helm/charts/docker-registry/templates/pvc.yaml   |  2 +-
 .../terraform/helm/charts/mariadb/templates/pv.yaml  |  3 +--
 .../terraform/helm/charts/mariadb/templates/pvc.yaml |  2 +-
 .../photo/templates/{pv-photo.yaml => pv.yaml}       |  3 +--
 .../photo/templates/{pvc-photo.yaml => pvc.yaml}     |  2 +-
 .../terraform/helm/charts/redis/templates/pv.yaml    |  3 +--
 .../terraform/helm/charts/redis/templates/pvc.yaml   |  2 +-
 12 files changed, 21 insertions(+), 23 deletions(-)
 rename kubernetes/terraform/helm/charts/photo/templates/{pv-photo.yaml => pv.yaml} (82%)
 rename kubernetes/terraform/helm/charts/photo/templates/{pvc-photo.yaml => pvc.yaml} (90%)

diff --git a/README.md b/README.md
index fa7f6aebe..740a5b5c6 100644
--- a/README.md
+++ b/README.md
@@ -542,6 +542,7 @@ k8s wil have a cronjob backend-backup which will run each hour.
 ### Other keys
 Other keys are required to be specified in `terraform.tfvars`
  - put `domain_name`
+ 
 ### Self sign certificate (Optional):
 Skip this if you did cloudflare step.
 If you don't own a domain (and planning to use ip + self signed certificate, this will result:
@@ -552,7 +553,6 @@ If you don't own a domain (and planning to use ip + self signed certificate, thi
 This is still possible
 Upon linode cluster creation .kubeconfig will be generated in kubernetes/terraform/helm directory. After it all operations with helm will be using this conf. If this file is deleted helm will compain about missing kubernetes config
 
-
 ### Other variables in terraform.tfvars
  - domain_name - your host origin domain name. It's gonna be used in turnserver postfix static nginx, cloudflare and other configuration
  - email - It's gonna be used in cf issuer and a few other places
@@ -595,9 +595,12 @@ Apply terraform configuration with:
 1. How to icrease maximum upload file:
  - Change nginx configuration  ``   client_max_body_size 75M;`
  - In addition to above, if you're using k8s + ingress, change `ingress.yaml` nginx.ingress.kubernetes.io/proxy-body-size: 75m 
-1. Certmanager fails
+ 
+1. Certmanager fails or services that depends on SSL won't start (e.g. Postfix or Coturn)
+Certmanager should create  pychat_tls sercret in namespace pychat. It creates a private key and puts it into letsencrypt-prod secret. Then it tries to issue it against letsencrypt server. 
  - Check the logs of the certmanager pods. 
  - Note that letsencrypt allows you max 5 cetrificates in 160 hours. If you used all tries, use another domain or subdomain
+ 
 1. Terraform apply produces errors like `Unexpected EOF`.
  - Seems like your k8s providers API exceed limits and it cuts the k8s request. You can try it with  `terraform apply -parallelism=1`. Your cluster will deploy for a while, but it has less chance to get into this situation
  - You can also execute `terraform apply` a few times so it finishes creating resources that it failed to inspect. Note that if you got a certificate already, I recomend you to back it up from `pychat-tls` secret in order to avoid cetrification fails describe above
diff --git a/download_content.sh b/download_content.sh
index 2c24bd010..2b2124278 100755
--- a/download_content.sh
+++ b/download_content.sh
@@ -112,9 +112,9 @@ minikube_delete_all() {
   kubectl delete -f kubernetes/redis.yaml --wait=true
   kubectl delete -f kubernetes/secret.yaml --wait=true
   kubectl delete -f kubernetes/config-map.yaml --wait=true
-  kubectl delete -f kubernetes/pv-photo.yaml --wait=true
-  kubectl delete -f kubernetes/pv-redis.yaml --wait=true
-  kubectl delete -f kubernetes/pv-mariadb.yaml --wait=true
+  kubectl delete -f kubernetes/pv-pychat-photo.yaml --wait=true
+  kubectl delete -f kubernetes/pv-pychat-redis.yaml --wait=true
+  kubectl delete -f kubernetes/pv-pychat-mariadb.yaml --wait=true
   kubectl delete -f kubernetes/namespace.yaml --wait=true
 }
 
@@ -139,9 +139,9 @@ minikube_certificate() {
 
 minikube_all() {
   safeRunCommand kubectl apply -f kubernetes/namespace.yaml
-  safeRunCommand kubectl apply -f kubernetes/pv-photo.yaml
-  safeRunCommand kubectl apply -f kubernetes/pv-redis.yaml
-  safeRunCommand kubectl apply -f kubernetes/pv-mariadb.yaml
+  safeRunCommand kubectl apply -f kubernetes/pv-pychat-photo.yaml
+  safeRunCommand kubectl apply -f kubernetes/pv-pychat-redis.yaml
+  safeRunCommand kubectl apply -f kubernetes/pv-pychat-mariadb.yaml
   safeRunCommand kubectl apply -f kubernetes/config-map.yaml
   safeRunCommand kubectl apply -f kubernetes/backend-secret.yaml
   safeRunCommand kubectl apply -f kubernetes/mariadb.yaml
diff --git a/kubernetes/terraform/helm/charts/backup/templates/pv.yaml b/kubernetes/terraform/helm/charts/backup/templates/pv.yaml
index 8026318c2..bbedc32ee 100644
--- a/kubernetes/terraform/helm/charts/backup/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/backup/templates/pv.yaml
@@ -1,8 +1,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-backup
-  namespace: pychat
+  name: pv-pychat-backup
 spec:
   accessModes:
     - ReadWriteMany
diff --git a/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml b/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
index 302341321..ea98d7b66 100644
--- a/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
+++ b/kubernetes/terraform/helm/charts/backup/templates/pvc.yaml
@@ -10,4 +10,4 @@ spec:
     requests:
       storage: {{ .Values.disk_size }}
   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
-  volumeName: pv-backup
+  volumeName: pv-pychat-backup
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
index 3511d7cd9..6f2792871 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/pv.yaml
@@ -1,8 +1,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-registry
-  namespace: pychat
+  name: pv-pychat-registry
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/pvc.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/pvc.yaml
index 5048a1b0e..18011327a 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/pvc.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/pvc.yaml
@@ -10,4 +10,4 @@ spec:
     requests:
       storage: {{ .Values.disk_size }}
   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
-  volumeName: pv-registry
+  volumeName: pv-pychat-registry
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
index 1627aae61..1d188922e 100644
--- a/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/pv.yaml
@@ -1,8 +1,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-mariadb
-  napespace: pychat
+  name: pv-pychat-mariadb
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/kubernetes/terraform/helm/charts/mariadb/templates/pvc.yaml b/kubernetes/terraform/helm/charts/mariadb/templates/pvc.yaml
index 5fa8abeaa..0db010bbf 100644
--- a/kubernetes/terraform/helm/charts/mariadb/templates/pvc.yaml
+++ b/kubernetes/terraform/helm/charts/mariadb/templates/pvc.yaml
@@ -10,4 +10,4 @@ spec:
      requests:
        storage: {{ .Values.disk_size }}
    storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
-   volumeName: pv-mariadb
+   volumeName: pv-pychat-mariadb
diff --git a/kubernetes/terraform/helm/charts/photo/templates/pv-photo.yaml b/kubernetes/terraform/helm/charts/photo/templates/pv.yaml
similarity index 82%
rename from kubernetes/terraform/helm/charts/photo/templates/pv-photo.yaml
rename to kubernetes/terraform/helm/charts/photo/templates/pv.yaml
index 762652725..9bb73f0b3 100644
--- a/kubernetes/terraform/helm/charts/photo/templates/pv-photo.yaml
+++ b/kubernetes/terraform/helm/charts/photo/templates/pv.yaml
@@ -1,8 +1,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-photo
-  namespace: pychat
+  name: pv-pychat-photo
 spec:
   accessModes:
     - ReadWriteMany
diff --git a/kubernetes/terraform/helm/charts/photo/templates/pvc-photo.yaml b/kubernetes/terraform/helm/charts/photo/templates/pvc.yaml
similarity index 90%
rename from kubernetes/terraform/helm/charts/photo/templates/pvc-photo.yaml
rename to kubernetes/terraform/helm/charts/photo/templates/pvc.yaml
index 9b2b42839..84c54164f 100644
--- a/kubernetes/terraform/helm/charts/photo/templates/pvc-photo.yaml
+++ b/kubernetes/terraform/helm/charts/photo/templates/pvc.yaml
@@ -10,4 +10,4 @@ spec:
     requests:
       storage: {{ .Values.disk_size }}
   storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
-  volumeName: pv-photo
+  volumeName: pv-pychat-photo
diff --git a/kubernetes/terraform/helm/charts/redis/templates/pv.yaml b/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
index 2eee07376..050b08590 100644
--- a/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
+++ b/kubernetes/terraform/helm/charts/redis/templates/pv.yaml
@@ -1,8 +1,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-redis
-  namespace: pychat
+  name: pv-pychat-redis
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml b/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
index 440e9b0e1..c84fdb12e 100644
--- a/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
+++ b/kubernetes/terraform/helm/charts/redis/templates/pvc.yaml
@@ -10,4 +10,4 @@ spec:
      requests:
        storage: {{ .Values.disk_size }}
    storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
-   volumeName: pv-redis
+   volumeName: pv-pychat-redis

From 492faa1fd2fefcf2b1aa280d4e23b57896fb4f40 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 29 May 2023 23:59:43 +0300
Subject: [PATCH 204/221] Fixed gitignore

---
 kubernetes/terraform/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/terraform/.gitignore b/kubernetes/terraform/.gitignore
index de08a2314..aa209aa36 100644
--- a/kubernetes/terraform/.gitignore
+++ b/kubernetes/terraform/.gitignore
@@ -4,3 +4,4 @@ terraform.tfstate
 terraform.tfstate.backup
 .terraform.tfstate.lock.info
 helm/.kubeconfig
+helm/.terraform.lock.hcl

From b4808a8963bbdbd2ec54bd532d409e4452f8c559 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 30 May 2023 02:12:03 +0300
Subject: [PATCH 205/221] Fixed domains to variables

---
 kubernetes/terraform/cloudflare/main.tf       |  4 +--
 kubernetes/terraform/cloudflare/variables.tf  |  2 ++
 .../certmanager/templates/certificate.yaml    |  5 +++-
 .../helm/charts/certmanager/values.yaml       |  3 ++
 .../charts/docker-registry/templates/cm.yaml  |  2 +-
 .../helm/charts/docker-registry/values.yaml   |  2 +-
 .../charts/ingress/templates/ingress.yaml     |  8 +++---
 .../terraform/helm/charts/ingress/values.yaml |  2 ++
 kubernetes/terraform/helm/main.tf             | 28 ++++++++++++++++---
 kubernetes/terraform/helm/variables.tf        |  3 ++
 kubernetes/terraform/main.tf                  |  4 +++
 kubernetes/terraform/variables.tf             |  6 ++++
 12 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 94fc04169..71123606d 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -8,7 +8,7 @@ resource "cloudflare_record" "master_pychat" {
 }
 
 resource "cloudflare_record" "static_pychat" {
-  name    = "static.${var.domain_name}"
+  name    = var.static_domain_name
   proxied = true
   ttl     = 1
   type    = "A"
@@ -18,7 +18,7 @@ resource "cloudflare_record" "static_pychat" {
 
 resource "cloudflare_record" "registry_pychat" {
   count = var.htpasswd == null ? 0 : 1
-  name    = "registry.${var.domain_name}"
+  name    = var.docker_domain_name
   proxied = false
   ttl     = 1
   type    = "A"
diff --git a/kubernetes/terraform/cloudflare/variables.tf b/kubernetes/terraform/cloudflare/variables.tf
index 5f17f638a..f003dea49 100644
--- a/kubernetes/terraform/cloudflare/variables.tf
+++ b/kubernetes/terraform/cloudflare/variables.tf
@@ -1,4 +1,6 @@
 variable "domain_name" {}
+variable "static_domain_name" {}
+variable "docker_domain_name" {}
 variable "cloud_flare_zone_id" {}
 variable "cloud_flare_api_token" {}
 variable "ip_address" {}
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
index 5b691d64f..9a3c2d092 100644
--- a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
@@ -12,4 +12,7 @@ spec:
   renewBefore: 720h # 30d before SSL will expire, renew it
   dnsNames:
     - "{{ .Values.domain_name }}"
-    - "static.{{ .Values.domain_name }}"
+    - "{{ .Values.static_domain_name }}"
+{{ if .Values.htpasswd }}
+    - "{{ .Values.docker_domain_name }}"
+{{ end }}
diff --git a/kubernetes/terraform/helm/charts/certmanager/values.yaml b/kubernetes/terraform/helm/charts/certmanager/values.yaml
index 53bb4893d..00d5bdfac 100644
--- a/kubernetes/terraform/helm/charts/certmanager/values.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/values.yaml
@@ -1,3 +1,6 @@
 email: $email
 cloud_flare_api_token: $cloud_flare_api_token
 domain_name: $domain_name
+docker_domain_name: $docker_domain_name
+static_domain_name: $static_domain_name
+htpasswd: $htpasswd
diff --git a/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml b/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
index a69f6674f..8452e0fb8 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/templates/cm.yaml
@@ -6,5 +6,5 @@ metadata:
 data:
   REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd"
   REGISTRY_AUTH: "htpasswd"
-  REGISTRY_AUTH_HTPASSWD_REALM: "registry.{{ .Values.domain_name }}"
+  REGISTRY_AUTH_HTPASSWD_REALM: "{{ .Values.docker_domain_name }}"
 
diff --git a/kubernetes/terraform/helm/charts/docker-registry/values.yaml b/kubernetes/terraform/helm/charts/docker-registry/values.yaml
index 4716f3ddc..aa1eb8b19 100644
--- a/kubernetes/terraform/helm/charts/docker-registry/values.yaml
+++ b/kubernetes/terraform/helm/charts/docker-registry/values.yaml
@@ -1,3 +1,3 @@
-domain_name: $domain_name
+docker_domain_name: $domain_name
 disk_size: "15Gi"
 htpasswd: $htpasswd
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
index fcd52ba53..34a05094c 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
@@ -13,8 +13,8 @@ spec:
   tls:
   - hosts:
     - "{{ .Values.domain_name }}"
-    - "static.{{ .Values.domain_name }}"
-    - "registry.{{ .Values.domain_name }}"
+    - "{{ .Values.docker_domain_name }}"
+    - "{{ .Values.static_domain_name }}"
     secretName: pychat-tls
   defaultBackend:
     service:
@@ -22,7 +22,7 @@ spec:
       port:
         number: 80
   rules:
-  - host: "static.{{ .Values.domain_name }}"
+  - host: "{{ .Values.static_domain_name }}"
     http:
       paths:
       - path: /
@@ -57,7 +57,7 @@ spec:
             port:
               number: 80
 {{ if .Values.htpasswd }}
-  - host: "registry.{{ .Values.domain_name }}"
+  - host: "{{ .Values.docker_domain_name }}"
     http:
       paths:
       - path: /
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
index f14c1d565..22c730706 100644
--- a/kubernetes/terraform/helm/charts/ingress/values.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -2,4 +2,6 @@ udp_port_range_start: $udp_port_range_start
 udp_port_range_end: $udp_port_range_end
 external_ip: $external_ip
 domain_name: $domain_name
+static_domain_name: $static_domain_name
+docker_domain_name: $docker_domain_name
 htpasswd: $htpasswd
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 11049163d..affd8321c 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -84,6 +84,18 @@ resource "helm_release" "certmanager" {
     name  = "domain_name"
     value = var.domain_name
   }
+  set {
+    name  = "docker_domain_name"
+    value = var.docker_domain_name
+  }
+  set {
+    name  = "static_domain_name"
+    value = var.static_domain_name
+  }
+  set {
+    name  = "htpasswd"
+    value = var.htpasswd == null ? "" : var.htpasswd
+  }
   set {
     name  = "email"
     value = var.email
@@ -115,8 +127,8 @@ resource "helm_release" "docker-registry" {
   name  = "docker-registry"
   chart = "${path.module}/charts/docker-registry"
   set {
-    name  = "domain_name"
-    value = var.domain_name
+    name  = "docker_domain_name"
+    value = var.docker_domain_name
   }
   set_sensitive {
     name  = "htpasswd"
@@ -199,6 +211,7 @@ resource "helm_release" "coturn" {
     name  = "udp_port_range_end"
     value = var.udp_port_range_end
   }
+  wait = false # do not wait for certificate and block the execution
 }
 
 resource "helm_release" "frontend" {
@@ -230,8 +243,14 @@ resource "helm_release" "ingress" {
     name  = "udp_port_range_end"
     value = var.udp_port_range_end
   }
-  # TODO
-  #  depends_on = [helm_release.global, helm_release.certmanager, helm_release.self-signed]
+  set {
+    name  = "static_domain_name"
+    value = var.static_domain_name
+  }
+  set {
+    name  = "docker_domain_name"
+    value = var.docker_domain_name
+  }
   depends_on = [helm_release.global]
 }
 
@@ -261,6 +280,7 @@ resource "helm_release" "postfix" {
     name  = "domain_name"
     value = var.domain_name
   }
+  wait = false # do not wait for certificate and block the execution
 }
 
 resource "helm_release" "redis" {
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 22e2fa410..3ca2db440 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -7,6 +7,9 @@ variable "tls_key" {
   default = null
 }
 
+variable "docker_domain_name" {}
+variable "static_domain_name" {}
+
 variable "domain_name" {}
 variable "email" {}
 variable "github" {}
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index e57bea042..f029fd141 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -9,6 +9,8 @@ module "cloudflare" {
   cloud_flare_api_token = var.cloud_flare_api_token
   cloud_flare_zone_id   = var.cloud_flare_zone_id
   domain_name           = var.domain_name
+  docker_domain_name    = local.docker_domain_name
+  static_domain_name    = local.static_domain_name
   ip_address            = module.linode.ip_address
   htpasswd              = var.htpasswd
 }
@@ -17,6 +19,8 @@ module "helm" {
   source                   = "./helm"
   kubeconfig               = module.linode.kubeconfig
   domain_name              = var.domain_name
+  docker_domain_name       = local.docker_domain_name
+  static_domain_name       = local.static_domain_name
   ip_address               = module.linode.ip_address
   cloud_flare_api_token    = var.cloud_flare_api_token
   email                    = var.email
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index bb098a128..fcc845f22 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -10,6 +10,12 @@ variable "email" {}
 variable "linode_app_label" {
   default = "pychat"
 }
+
+locals {
+  docker_domain_name = "docker-registry.${var.domain_name}"
+  static_domain_name = "static.${var.domain_name}"
+}
+
 variable "github" {
   default = null
 }

From 04d41a5230d8bfa7b6b69d3e7786a83cea86fc22 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 30 May 2023 02:38:19 +0300
Subject: [PATCH 206/221] Fixing variables describption

---
 .../charts/self-signed/templates/secret.yaml  |  2 +-
 kubernetes/terraform/variables.tf             | 40 +++++++++++++------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml b/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
index 5f0d63908..df21e9b90 100644
--- a/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/self-signed/templates/secret.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls
 metadata:
-  name: self-signed-certificate
+  name: pychat-tls
   namespace: pychat
 data:
   # Should be already in base64
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index fcc845f22..831710b50 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -1,31 +1,42 @@
 variable "cloud_flare_api_token" {
   default = null
+  description = "Go to https://dash.cloudflare.com/profile/api-tokens"
+}
+variable "linode_token" {
+  description = "http://linode.com/ go to Profile -> Api tokens -> Create A Personal Access Token -> Select Kubernetes & Linodes -> Create Token."
+}
+variable "cloud_flare_zone_id" {
+  description = "Copy API Zone Id from https://dash.cloudflare.com/"
+}
+variable "id_rsa" {
+  description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
+}
+variable "id_rsa_pub" {
+  description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
+}
+variable "domain_name" {
+  description = "Main domain address for chat"
+}
+variable "email" {
+  description = "Email that's used in certmanager"
 }
-variable "linode_token" {}
-variable "cloud_flare_zone_id" {}
-variable "id_rsa" {}
-variable "id_rsa_pub" {}
-variable "domain_name" {}
-variable "email" {}
 variable "linode_app_label" {
   default = "pychat"
-}
-
-locals {
-  docker_domain_name = "docker-registry.${var.domain_name}"
-  static_domain_name = "static.${var.domain_name}"
+  description = "Linode k8s cluster name"
 }
 
 variable "github" {
   default = null
+  description = "git address for private backups. Url should be in ssh format e.g. git@github.com:username/backup_repo.git . Feel free to leave it empty if backups not used"
 }
 variable "htpasswd" {
-  # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
+  description = "If this variable is set docker registry will be created with user and pass in this value. To generate use docker run --entrypoint htpasswd httpd:2 -Bbn user password"
   # "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
   default = null
 }
 variable "tls_crt" {
   default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+  description = "Tls certificate if cloudflare "
 }
 variable "tls_key" {
   default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
@@ -55,3 +66,8 @@ variable "FIREBASE_API_KEY" {
 variable "DEFAULT_PROFILE_ID" {
   default = "1"
 }
+
+locals {
+  docker_domain_name = "docker-registry.${var.domain_name}"
+  static_domain_name = "static.${var.domain_name}"
+}

From 3832db1304db6678652baf8332fa4b01c28ea3f5 Mon Sep 17 00:00:00 2001
From: andrew <andrew.koidan@vertrical.com>
Date: Tue, 30 May 2023 03:04:26 +0300
Subject: [PATCH 207/221] Added docs

---
 README.md                              | 1 +
 kubernetes/terraform/helm/main.tf      | 3 ++-
 kubernetes/terraform/helm/variables.tf | 4 ++++
 kubernetes/terraform/main.tf           | 1 +
 kubernetes/terraform/variables.tf      | 7 ++++++-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 740a5b5c6..de688e407 100644
--- a/README.md
+++ b/README.md
@@ -551,6 +551,7 @@ If you don't own a domain (and planning to use ip + self signed certificate, thi
 - postfix will not send emails, including registration and password reset
 - Site is gonna be under self-signed certificate and will prompt errors.
 This is still possible
+- set `use_certmanager = false` in  `terraform.tfvars` 
 Upon linode cluster creation .kubeconfig will be generated in kubernetes/terraform/helm directory. After it all operations with helm will be using this conf. If this file is deleted helm will compain about missing kubernetes config
 
 ### Other variables in terraform.tfvars
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index affd8321c..587d1326f 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -78,6 +78,7 @@ resource "helm_release" "certmanager-definition" {
 }
 
 resource "helm_release" "certmanager" {
+  count = var.use_certmanager ? 1 : 0
   name  = "certmanager"
   chart = "${path.module}/charts/certmanager"
   set {
@@ -108,7 +109,7 @@ resource "helm_release" "certmanager" {
 }
 
 resource "helm_release" "self-signed" {
-  count = var.cloud_flare_api_token == null ? 1 : 0
+  count = var.use_certmanager ? 0 : 1
   name  = "self-signed"
   chart = "${path.module}/charts/self-signed"
   set_sensitive {
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 3ca2db440..6fc1d19af 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -7,6 +7,10 @@ variable "tls_key" {
   default = null
 }
 
+variable "use_certmanager" {
+  default = true
+}
+
 variable "docker_domain_name" {}
 variable "static_domain_name" {}
 
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index f029fd141..ea3dce8bd 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -28,6 +28,7 @@ module "helm" {
   github                   = var.github
   id_rsa                   = var.id_rsa
   id_rsa_pub               = var.id_rsa_pub
+  use_certmanager         = var.use_certmanager
   SECRET_KEY               = var.SECRET_KEY
   RECAPTCHA_PRIVATE_KEY    = var.RECAPTCHA_PRIVATE_KEY
   RECAPTCHA_PUBLIC_KEY     = var.RECAPTCHA_PUBLIC_KEY
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 831710b50..58d52f8a3 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -36,14 +36,19 @@ variable "htpasswd" {
 }
 variable "tls_crt" {
   default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
-  description = "Tls certificate if cloudflare "
+  description = "If use_certmanager is true this cert will be ignored, otherwise it will be used as tls certificate"
+}
+variable "use_certmanager" {
+  default = true
 }
 variable "tls_key" {
   default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
+  description = "If use_certmanager is true this cert will be ignored, otherwise it will be used as tls private key"
 }
 variable "SECRET_KEY" {
   # bash download_content.sh generate_secret_key
   default = "yC1-o_%kBSDMYsTloYHf4JxUrU&TQuQXf(-XwIPh%MeHE%T5vM"
+  description = "Django secret key for password and etc"
 }
 variable "RECAPTCHA_PRIVATE_KEY" {
   default = null

From 5a0ec65925cef879165b2dfed59779cffa81c04b Mon Sep 17 00:00:00 2001
From: andrew <andrew.koidan@vertrical.com>
Date: Tue, 30 May 2023 04:00:13 +0300
Subject: [PATCH 208/221] Fixed terraform creation form. Will only prompt for
 required values

---
 .../helm/charts/backend/templates/secret.yaml |  2 -
 .../terraform/helm/charts/backend/values.yaml |  2 -
 kubernetes/terraform/helm/main.tf             |  8 ----
 kubernetes/terraform/helm/variables.tf        | 11 +----
 kubernetes/terraform/main.tf                  |  4 +-
 kubernetes/terraform/variables.tf             | 42 +++++++++++++------
 newback/src/config/Config.d.ts                |  1 -
 newback/src/config/env/production.json        |  1 -
 8 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
index 3e202d906..1e36a9be5 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
@@ -14,9 +14,7 @@ data:
   MYSQL_PASSWORD: {{ .Values.mysql_password  | b64enc }}
   MYSQL_USER: {{ .Values.mysql_database_name  | b64enc }}
   RECAPTCHA_PRIVATE_KEY: {{ .Values.RECAPTCHA_PRIVATE_KEY  | b64enc }}
-  RECAPTCHA_PUBLIC_KEY: {{ .Values.RECAPTCHA_PUBLIC_KEY  | b64enc }}
   GOOGLE_OAUTH_2_CLIENT_ID: {{ .Values.GOOGLE_OAUTH_2_CLIENT_ID  | b64enc }}
   FACEBOOK_ACCESS_TOKEN: {{ .Values.FACEBOOK_ACCESS_TOKEN  | b64enc }}
-  GIPHY_API_KEY: {{ .Values.GIPHY_API_KEY  | b64enc }}
   FIREBASE_API_KEY: {{ .Values.FIREBASE_API_KEY  | b64enc }}
 
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
index 0e24917bd..d49f49de2 100644
--- a/kubernetes/terraform/helm/charts/backend/values.yaml
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -10,9 +10,7 @@ domain_name: $domain_name
 github: $github
 DEFAULT_PROFILE_ID: "${DEFAULT_PROFILE_ID}"
 FIREBASE_API_KEY: $FIREBASE_API_KEY
-GIPHY_API_KEY: $GIPHY_API_KEY
 FACEBOOK_ACCESS_TOKEN: $FACEBOOK_ACCESS_TOKEN
 GOOGLE_OAUTH_2_CLIENT_ID: $GOOGLE_OAUTH_2_CLIENT_ID
-RECAPTCHA_PUBLIC_KEY: $RECAPTCHA_PUBLIC_KEY
 RECAPTCHA_PRIVATE_KEY: $RECAPTCHA_PRIVATE_KEY
 SECRET_KEY: $SECRET_KEY
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 587d1326f..d0ae4e607 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -38,10 +38,6 @@ resource "helm_release" "backend" {
     name  = "RECAPTCHA_PRIVATE_KEY"
     value = var.RECAPTCHA_PRIVATE_KEY
   }
-  set {
-    name  = "RECAPTCHA_PUBLIC_KEY"
-    value = var.RECAPTCHA_PUBLIC_KEY
-  }
   set_sensitive {
     name  = "GOOGLE_OAUTH_2_CLIENT_ID"
     value = var.GOOGLE_OAUTH_2_CLIENT_ID
@@ -50,10 +46,6 @@ resource "helm_release" "backend" {
     name  = "FACEBOOK_ACCESS_TOKEN"
     value = var.FACEBOOK_ACCESS_TOKEN
   }
-  set_sensitive {
-    name  = "GIPHY_API_KEY"
-    value = var.GIPHY_API_KEY
-  }
   set_sensitive {
     name  = "FIREBASE_API_KEY"
     value = var.FIREBASE_API_KEY
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 6fc1d19af..552bfd73d 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,11 +1,7 @@
 variable "cloud_flare_api_token" {}
 variable "kubeconfig" {}
-variable "tls_crt" {
-  default = null
-}
-variable "tls_key" {
-  default = null
-}
+variable "tls_crt" {}
+variable "tls_key" {}
 
 variable "use_certmanager" {
   default = true
@@ -22,10 +18,8 @@ variable "id_rsa_pub" {}
 variable "ip_address" {}
 variable "SECRET_KEY" {}
 variable "RECAPTCHA_PRIVATE_KEY" {}
-variable "RECAPTCHA_PUBLIC_KEY" {}
 variable "GOOGLE_OAUTH_2_CLIENT_ID" {}
 variable "FACEBOOK_ACCESS_TOKEN" {}
-variable "GIPHY_API_KEY" {}
 variable "FIREBASE_API_KEY" {}
 variable "DEFAULT_PROFILE_ID" {}
 
@@ -43,7 +37,6 @@ variable "coturn_password" {
 }
 variable "htpasswd" {
   # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
-  default = null
 }
 variable "mysql_password" {
   default = "pypass"
diff --git a/kubernetes/terraform/main.tf b/kubernetes/terraform/main.tf
index ea3dce8bd..a7070c35d 100644
--- a/kubernetes/terraform/main.tf
+++ b/kubernetes/terraform/main.tf
@@ -28,13 +28,11 @@ module "helm" {
   github                   = var.github
   id_rsa                   = var.id_rsa
   id_rsa_pub               = var.id_rsa_pub
-  use_certmanager         = var.use_certmanager
+  use_certmanager          = var.use_certmanager
   SECRET_KEY               = var.SECRET_KEY
   RECAPTCHA_PRIVATE_KEY    = var.RECAPTCHA_PRIVATE_KEY
-  RECAPTCHA_PUBLIC_KEY     = var.RECAPTCHA_PUBLIC_KEY
   GOOGLE_OAUTH_2_CLIENT_ID = var.GOOGLE_OAUTH_2_CLIENT_ID
   FACEBOOK_ACCESS_TOKEN    = var.FACEBOOK_ACCESS_TOKEN
-  GIPHY_API_KEY            = var.GIPHY_API_KEY
   FIREBASE_API_KEY         = var.FIREBASE_API_KEY
   tls_crt                  = var.tls_crt
   tls_key                  = var.tls_key
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 58d52f8a3..192989c0d 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -1,18 +1,19 @@
 variable "cloud_flare_api_token" {
-  default = null
   description = "Go to https://dash.cloudflare.com/profile/api-tokens"
 }
 variable "linode_token" {
-  description = "http://linode.com/ go to Profile -> Api tokens -> Create A Personal Access Token -> Select Kubernetes & Linodes -> Create Token."
+  description = "K8s cluster provider. http://linode.com/ go to Profile -> Api tokens -> Create A Personal Access Token -> Select Kubernetes & Linodes -> Create Token."
 }
 variable "cloud_flare_zone_id" {
   description = "Copy API Zone Id from https://dash.cloudflare.com/"
 }
 variable "id_rsa" {
   description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
+  default = null
 }
 variable "id_rsa_pub" {
   description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
+  default = null
 }
 variable "domain_name" {
   description = "Main domain address for chat"
@@ -40,6 +41,7 @@ variable "tls_crt" {
 }
 variable "use_certmanager" {
   default = true
+  type = bool
 }
 variable "tls_key" {
   default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
@@ -51,25 +53,41 @@ variable "SECRET_KEY" {
   description = "Django secret key for password and etc"
 }
 variable "RECAPTCHA_PRIVATE_KEY" {
-  default = null
-}
-variable "RECAPTCHA_PUBLIC_KEY" {
-  default = null
+  description = <<EOT
+[OPTIONAL] Prevents spam with password guessing or email spoofing
+If you want recaptcha: Open https://www.google.com/recaptcha/admin#list and register new domain, type is web captcha
+If you set RECAPTCHA_PRIVATE_KEY you should set RECAPTCHA_PUBLIC_KEY in frontend/development.json and frontend/production.json
+EOT
 }
 variable "GOOGLE_OAUTH_2_CLIENT_ID" {
-  default = null
+  description = "[OPTIONAL] For Google Oauth. https://developers.google.com/identity/sign-in/web/devconsole-project select webrowser"
 }
 variable "FACEBOOK_ACCESS_TOKEN" {
-  default = null
-}
-variable "GIPHY_API_KEY" {
-  default = null
+  description = "[OPTIONAL] For FB Oauth. https://developers.facebook.com/apps/ -> click on app -> settings -> basic 'App ID|App Secret' e.g. FACEBOOK_ACCESS_TOKEN = '91237|bf86sd3'"
 }
 variable "FIREBASE_API_KEY" {
-  default = null
+  description = <<EOT
+[OPTIONAL] For Notifications
+ Pychat also supports https://developers.google.com/web/fundamentals/push-notifications/ firebase notifications, like in facebook.
+ They will fire even user doesn't have opened tab. That can be turned on/off by used in his/her profile with checkbox `Notifications`.
+ The implementation is similar like https://github.com/GoogleChrome/samples/tree/gh-pages/push-messaging-and-notifications.
+    1. Create a project on the Firebase Developer Console: https://console.firebase.google.com/
+    2. Go to Settings (the cog near the top left corner), click the Cloud Messaging Tab: https://console.firebase.google.com/u/1/project/pychat-org/settings/cloudmessaging/
+    3. Put `<Your Cloud Messaging API Key ...>` to `FIREBASE_API_KEY` below.
+    4. Create `chat/static/manifest.json` with content like https://github.com/GoogleChrome/samples/blob/gh-pages/push-messaging-and-notifications/manifest.sample.json:
+
+ {
+  "name": "Pychat Push Notifications",
+  "short_name": "PyPush",
+  "start_url": "/",
+  "display": "standalone",
+  "gcm_sender_id": "<Your Sender ID from https://console.firebase.google.com>"
+ }
+EOT
 }
 variable "DEFAULT_PROFILE_ID" {
   default = "1"
+  description = "Admin of main channel. First registered user"
 }
 
 locals {
diff --git a/newback/src/config/Config.d.ts b/newback/src/config/Config.d.ts
index b9c1119c0..d0f69ee3f 100644
--- a/newback/src/config/Config.d.ts
+++ b/newback/src/config/Config.d.ts
@@ -22,7 +22,6 @@ declare module "node-ts-config" {
     pass: string
   }
   interface Recaptcha {
-    publicKey: string
     privateKey: string
   }
   interface Auth {
diff --git a/newback/src/config/env/production.json b/newback/src/config/env/production.json
index 863161d7f..1e43da01a 100644
--- a/newback/src/config/env/production.json
+++ b/newback/src/config/env/production.json
@@ -27,7 +27,6 @@
     "issueReportLink": "@@FRONTEND_ISSUE_REPORT_LINK"
   },
   "recaptcha": {
-    "publicKey": "@@RECAPTCHA_PUBLIC_KEY",
     "privateKey": "@@RECAPTCHA_PRIVATE_KEY"
   },
   "email": {

From 8d885a8cd05e011318d9e97bee238ba1abeb4dbf Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 30 May 2023 04:24:36 +0300
Subject: [PATCH 209/221] Improved variable declaration

---
 .../terraform/helm/charts/backup/values.yaml  |  1 -
 kubernetes/terraform/helm/main.tf             |  4 ---
 kubernetes/terraform/variables.tf             | 27 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/kubernetes/terraform/helm/charts/backup/values.yaml b/kubernetes/terraform/helm/charts/backup/values.yaml
index 4f0d0f7a4..11c81c058 100644
--- a/kubernetes/terraform/helm/charts/backup/values.yaml
+++ b/kubernetes/terraform/helm/charts/backup/values.yaml
@@ -1,4 +1,3 @@
-email: $email
 pullPolicy: Always
 image:
   repository_path: deathangel908/pychat-backup
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index d0ae4e607..7de2ac060 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -136,10 +136,6 @@ resource "helm_release" "backup" {
   chart      = "${path.module}/charts/backup"
   depends_on = [helm_release.mariadb, helm_release.photo]
 
-  set {
-    name  = "email"
-    value = var.email
-  }
   set_sensitive {
     name  = "id_rsa"
     value = var.id_rsa
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 192989c0d..ab1cc5543 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -1,11 +1,23 @@
 variable "cloud_flare_api_token" {
   description = "Go to https://dash.cloudflare.com/profile/api-tokens"
+  validation {
+    condition = can(regex("^.+$", var.cloud_flare_api_token))
+    error_message = "cloud_flare_api_token is required"
+  }
 }
 variable "linode_token" {
   description = "K8s cluster provider. http://linode.com/ go to Profile -> Api tokens -> Create A Personal Access Token -> Select Kubernetes & Linodes -> Create Token."
+  validation {
+    condition = can(regex("^.+$", var.linode_token))
+    error_message = "linode_token is required"
+  }
 }
 variable "cloud_flare_zone_id" {
   description = "Copy API Zone Id from https://dash.cloudflare.com/"
+  validation {
+    condition = can(regex("^.+$", var.cloud_flare_zone_id))
+    error_message = "cloud_flare_zone_id is required"
+  }
 }
 variable "id_rsa" {
   description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
@@ -17,10 +29,15 @@ variable "id_rsa_pub" {
 }
 variable "domain_name" {
   description = "Main domain address for chat"
+  validation {
+    condition = can(regex("^.+$", var.domain_name))
+    error_message = "domain_name is required"
+  }
 }
 variable "email" {
-  description = "Email that's used in certmanager"
+  description = "Email that's used in certmanager. If use_certmanager is set to false, feel free to leave empty"
 }
+
 variable "linode_app_label" {
   default = "pychat"
   description = "Linode k8s cluster name"
@@ -29,6 +46,10 @@ variable "linode_app_label" {
 variable "github" {
   default = null
   description = "git address for private backups. Url should be in ssh format e.g. git@github.com:username/backup_repo.git . Feel free to leave it empty if backups not used"
+  validation {
+    condition = var.github == null || can(regex("^git@.*$", var.github))
+    error_message = "Should start within git@, ssh only supported"
+  }
 }
 variable "htpasswd" {
   description = "If this variable is set docker registry will be created with user and pass in this value. To generate use docker run --entrypoint htpasswd httpd:2 -Bbn user password"
@@ -88,6 +109,10 @@ EOT
 variable "DEFAULT_PROFILE_ID" {
   default = "1"
   description = "Admin of main channel. First registered user"
+  validation {
+    condition = can(regex("^\\d+$", var.DEFAULT_PROFILE_ID))
+    error_message = "Only numbers"
+  }
 }
 
 locals {

From 8fd6d238164b206b8550c4daaada52362f7ea7ec Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 30 May 2023 04:26:19 +0300
Subject: [PATCH 210/221] Fixed variables

---
 kubernetes/terraform/helm/variables.tf | 14 ++++----------
 kubernetes/terraform/variables.tf      |  3 ---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 552bfd73d..139aab0cb 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -2,14 +2,8 @@ variable "cloud_flare_api_token" {}
 variable "kubeconfig" {}
 variable "tls_crt" {}
 variable "tls_key" {}
-
-variable "use_certmanager" {
-  default = true
-}
-
 variable "docker_domain_name" {}
 variable "static_domain_name" {}
-
 variable "domain_name" {}
 variable "email" {}
 variable "github" {}
@@ -22,7 +16,10 @@ variable "GOOGLE_OAUTH_2_CLIENT_ID" {}
 variable "FACEBOOK_ACCESS_TOKEN" {}
 variable "FIREBASE_API_KEY" {}
 variable "DEFAULT_PROFILE_ID" {}
-
+variable "htpasswd" {}
+variable "use_certmanager" {
+  default = true
+}
 variable "udp_port_range_start" {
   default = 49152
 }
@@ -35,9 +32,6 @@ variable "coturn_username" {
 variable "coturn_password" {
   default = "pypass"
 }
-variable "htpasswd" {
-  # docker run --entrypoint htpasswd httpd:2 -Bbn pychat pypass
-}
 variable "mysql_password" {
   default = "pypass"
 }
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index ab1cc5543..b26736b44 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -37,12 +37,10 @@ variable "domain_name" {
 variable "email" {
   description = "Email that's used in certmanager. If use_certmanager is set to false, feel free to leave empty"
 }
-
 variable "linode_app_label" {
   default = "pychat"
   description = "Linode k8s cluster name"
 }
-
 variable "github" {
   default = null
   description = "git address for private backups. Url should be in ssh format e.g. git@github.com:username/backup_repo.git . Feel free to leave it empty if backups not used"
@@ -114,7 +112,6 @@ variable "DEFAULT_PROFILE_ID" {
     error_message = "Only numbers"
   }
 }
-
 locals {
   docker_domain_name = "docker-registry.${var.domain_name}"
   static_domain_name = "static.${var.domain_name}"

From 4ae2f576f3078ed10d306a854197e8091e91e37e Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 30 May 2023 16:45:06 +0300
Subject: [PATCH 211/221] Added postfix persistent volume

---
 .../helm/charts/postfix/templates/deployment.yaml   |  5 +++++
 .../terraform/helm/charts/postfix/templates/pv.yaml | 11 +++++++++++
 .../helm/charts/postfix/templates/pvc.yaml          | 13 +++++++++++++
 .../terraform/helm/charts/postfix/values.yaml       |  1 +
 kubernetes/terraform/helm/main.tf                   |  3 +++
 kubernetes/terraform/helm/variables.tf              | 12 +++++++++---
 kubernetes/terraform/linode/main.tf                 |  3 +++
 7 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 kubernetes/terraform/helm/charts/postfix/templates/pv.yaml
 create mode 100644 kubernetes/terraform/helm/charts/postfix/templates/pvc.yaml

diff --git a/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml b/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
index 683889aeb..a6d51a584 100644
--- a/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/postfix/templates/deployment.yaml
@@ -16,6 +16,9 @@ spec:
         app: postfix
     spec:
       volumes:
+        - name: spool
+          persistentVolumeClaim:
+            claimName: pvc-postfix
         - name: pychat-postfix-tls
           secret:
             secretName: pychat-tls
@@ -35,3 +38,5 @@ spec:
           - name: pychat-postfix-tls
             mountPath: "/etc/tls"
             readOnly: true
+          - name: spool
+            mountPath: "/var/spool/postfix"
diff --git a/kubernetes/terraform/helm/charts/postfix/templates/pv.yaml b/kubernetes/terraform/helm/charts/postfix/templates/pv.yaml
new file mode 100644
index 000000000..3a70b8412
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/postfix/templates/pv.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-pychat-postfix
+spec:
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: {{ .Values.disk_size }}
+  hostPath:
+    path: /data/mail
diff --git a/kubernetes/terraform/helm/charts/postfix/templates/pvc.yaml b/kubernetes/terraform/helm/charts/postfix/templates/pvc.yaml
new file mode 100644
index 000000000..ed597fd69
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/postfix/templates/pvc.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-postfix
+  namespace: pychat
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.disk_size }}
+  storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
+  volumeName: pv-pychat-postfix
diff --git a/kubernetes/terraform/helm/charts/postfix/values.yaml b/kubernetes/terraform/helm/charts/postfix/values.yaml
index d1c51e4fe..b54bcd359 100644
--- a/kubernetes/terraform/helm/charts/postfix/values.yaml
+++ b/kubernetes/terraform/helm/charts/postfix/values.yaml
@@ -3,3 +3,4 @@ image:
   pullPolicy: Always # change to IfNotPresent for minikube
   tag: "latest"
 domain_name: $domain_name
+disk_size: 256Mi
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 7de2ac060..f3cfa5439 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -259,6 +259,9 @@ resource "helm_release" "mariadb" {
     name  = "mysql_password"
     value = var.mysql_password
   }
+  lifecycle {
+    prevent_destroy = true // delete database manually if required in order to not lose the data
+  }
 }
 
 resource "helm_release" "postfix" {
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 139aab0cb..2537b0695 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,7 +1,11 @@
 variable "cloud_flare_api_token" {}
 variable "kubeconfig" {}
-variable "tls_crt" {}
-variable "tls_key" {}
+variable "tls_crt" {
+  default = null
+}
+variable "tls_key" {
+  default = null
+}
 variable "docker_domain_name" {}
 variable "static_domain_name" {}
 variable "domain_name" {}
@@ -16,7 +20,9 @@ variable "GOOGLE_OAUTH_2_CLIENT_ID" {}
 variable "FACEBOOK_ACCESS_TOKEN" {}
 variable "FIREBASE_API_KEY" {}
 variable "DEFAULT_PROFILE_ID" {}
-variable "htpasswd" {}
+variable "htpasswd" {
+  default = null
+}
 variable "use_certmanager" {
   default = true
 }
diff --git a/kubernetes/terraform/linode/main.tf b/kubernetes/terraform/linode/main.tf
index 93292c535..f2b81f73e 100644
--- a/kubernetes/terraform/linode/main.tf
+++ b/kubernetes/terraform/linode/main.tf
@@ -8,6 +8,9 @@ resource "linode_lke_cluster" "pychat" {
     count = var.node_count
     type  = var.node_type
   }
+  lifecycle {
+    prevent_destroy = true
+  }
 }
 
 data "linode_instances" "pychat_linode" {

From bd2eb38657a8f84bab0e5cae59eae42d6781b81a Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 30 May 2023 19:51:11 +0300
Subject: [PATCH 212/221] Fix

---
 kubernetes/terraform/helm/charts/backend/templates/cm.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
index da02003d6..fdd2da2eb 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
@@ -13,4 +13,6 @@ data:
   REDIS_PUBSUB: "true"
   EMAIL_PORT: "25"
   EMAIL_HOST: "postfix-service"
+  SERVER_EMAIL: "{{ .Values.SERVER_EMAIL }}"
   DEFAULT_PROFILE_ID: "{{ .Values.DEFAULT_PROFILE_ID }}"
+  SERVER_ADDRESS: "{{ .Values.SERVER_ADDRESS }}"

From 77f5a60da41072bef35daec157fbf857433ecbbc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 30 May 2023 20:05:36 +0300
Subject: [PATCH 213/221] Fixed coker for backend

---
 .../helm/charts/backend/templates/cm.yaml     |  1 +
 .../terraform/helm/charts/backend/values.yaml |  3 ++
 kubernetes/terraform/helm/main.tf             | 41 +++++++++++------
 kubernetes/terraform/helm/variables.tf        | 46 +++++++++++++++----
 kubernetes/terraform/variables.tf             | 12 +++++
 5 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
index fdd2da2eb..e7c17a1fa 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
@@ -16,3 +16,4 @@ data:
   SERVER_EMAIL: "{{ .Values.SERVER_EMAIL }}"
   DEFAULT_PROFILE_ID: "{{ .Values.DEFAULT_PROFILE_ID }}"
   SERVER_ADDRESS: "{{ .Values.SERVER_ADDRESS }}"
+  SHOW_COUNTRY_CODE: "{{ .Values.SHOW_COUNTRY_CODE }}"
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
index d49f49de2..e611a5af6 100644
--- a/kubernetes/terraform/helm/charts/backend/values.yaml
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -14,3 +14,6 @@ FACEBOOK_ACCESS_TOKEN: $FACEBOOK_ACCESS_TOKEN
 GOOGLE_OAUTH_2_CLIENT_ID: $GOOGLE_OAUTH_2_CLIENT_ID
 RECAPTCHA_PRIVATE_KEY: $RECAPTCHA_PRIVATE_KEY
 SECRET_KEY: $SECRET_KEY
+SERVER_ADDRESS: $SERVER_ADDRESS
+SERVER_EMAIL: $SERVER_EMAIL
+SHOW_COUNTRY_CODE: $SHOW_COUNTRY_CODE
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index f3cfa5439..58aa79725 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -22,31 +22,31 @@ resource "helm_release" "backend" {
     name  = "mysql_database_name"
     value = var.mysql_database_name
   }
-  set_sensitive {
+  set {
     name  = "mysql_user"
     value = var.mysql_user
   }
-  set_sensitive {
+  set {
     name  = "mysql_password"
     value = var.mysql_password
   }
-  set_sensitive {
+  set {
     name  = "SECRET_KEY"
     value = var.SECRET_KEY
   }
-  set_sensitive {
+  set {
     name  = "RECAPTCHA_PRIVATE_KEY"
     value = var.RECAPTCHA_PRIVATE_KEY
   }
-  set_sensitive {
+  set {
     name  = "GOOGLE_OAUTH_2_CLIENT_ID"
     value = var.GOOGLE_OAUTH_2_CLIENT_ID
   }
-  set_sensitive {
+  set {
     name  = "FACEBOOK_ACCESS_TOKEN"
     value = var.FACEBOOK_ACCESS_TOKEN
   }
-  set_sensitive {
+  set {
     name  = "FIREBASE_API_KEY"
     value = var.FIREBASE_API_KEY
   }
@@ -54,6 +54,19 @@ resource "helm_release" "backend" {
     name  = "DEFAULT_PROFILE_ID"
     value = var.DEFAULT_PROFILE_ID
   }
+  set {
+    name  = "SERVER_ADDRESS"
+    value = var.domain_name
+  }
+  set {
+    name  = "SERVER_EMAIL"
+    value = local.SERVER_EMAIL
+  }
+  set {
+    name  = "SHOW_COUNTRY_CODE"
+    value = var.SHOW_COUNTRY_CODE
+  }
+
   timeout = 60
 }
 
@@ -93,7 +106,7 @@ resource "helm_release" "certmanager" {
     name  = "email"
     value = var.email
   }
-  set_sensitive {
+  set {
     name  = "cloud_flare_api_token"
     value = var.cloud_flare_api_token
   }
@@ -104,11 +117,11 @@ resource "helm_release" "self-signed" {
   count = var.use_certmanager ? 0 : 1
   name  = "self-signed"
   chart = "${path.module}/charts/self-signed"
-  set_sensitive {
+  set {
     name  = "tls_crt"
     value = var.tls_crt
   }
-  set_sensitive {
+  set {
     name  = "tls_key"
     value = var.tls_key
   }
@@ -123,7 +136,7 @@ resource "helm_release" "docker-registry" {
     name  = "docker_domain_name"
     value = var.docker_domain_name
   }
-  set_sensitive {
+  set {
     name  = "htpasswd"
     value = var.htpasswd
   }
@@ -136,7 +149,7 @@ resource "helm_release" "backup" {
   chart      = "${path.module}/charts/backup"
   depends_on = [helm_release.mariadb, helm_release.photo]
 
-  set_sensitive {
+  set {
     name  = "id_rsa"
     value = var.id_rsa
   }
@@ -160,7 +173,7 @@ resource "helm_release" "backup" {
     name  = "mysql_user"
     value = var.mysql_user
   }
-  set_sensitive {
+  set {
     name  = "mysql_password"
     value = var.mysql_password
   }
@@ -216,7 +229,7 @@ resource "helm_release" "ingress" {
     name  = "domain_name"
     value = var.domain_name
   }
-  set_sensitive {
+  set {
     name  = "htpasswd"
     value = var.htpasswd == null ? "" : var.htpasswd
   }
diff --git a/kubernetes/terraform/helm/variables.tf b/kubernetes/terraform/helm/variables.tf
index 2537b0695..89c882ba1 100644
--- a/kubernetes/terraform/helm/variables.tf
+++ b/kubernetes/terraform/helm/variables.tf
@@ -1,7 +1,12 @@
-variable "cloud_flare_api_token" {}
-variable "kubeconfig" {}
+variable "cloud_flare_api_token" {
+  sensitive = true
+}
+variable "kubeconfig" {
+  sensitive = true
+}
 variable "tls_crt" {
-  default = null
+  default   = null
+  sensitive = true
 }
 variable "tls_key" {
   default = null
@@ -11,17 +16,30 @@ variable "static_domain_name" {}
 variable "domain_name" {}
 variable "email" {}
 variable "github" {}
-variable "id_rsa" {}
+variable "id_rsa" {
+  sensitive = true
+}
 variable "id_rsa_pub" {}
 variable "ip_address" {}
-variable "SECRET_KEY" {}
-variable "RECAPTCHA_PRIVATE_KEY" {}
-variable "GOOGLE_OAUTH_2_CLIENT_ID" {}
-variable "FACEBOOK_ACCESS_TOKEN" {}
-variable "FIREBASE_API_KEY" {}
+variable "SECRET_KEY" {
+  sensitive = true
+}
+variable "RECAPTCHA_PRIVATE_KEY" {
+  sensitive = true
+}
+variable "GOOGLE_OAUTH_2_CLIENT_ID" {
+  sensitive = true
+}
+variable "FACEBOOK_ACCESS_TOKEN" {
+  sensitive = true
+}
+variable "FIREBASE_API_KEY" {
+  sensitive = true
+}
 variable "DEFAULT_PROFILE_ID" {}
 variable "htpasswd" {
-  default = null
+  default   = null
+  sensitive = true
 }
 variable "use_certmanager" {
   default = true
@@ -47,3 +65,11 @@ variable "mysql_database_name" {
 variable "mysql_user" {
   default = "pychat"
 }
+
+variable "SHOW_COUNTRY_CODE" {
+  default = "true"
+}
+
+locals {
+  SERVER_EMAIL = "root@${var.domain_name}"
+}
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index b26736b44..eafcc3798 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -4,6 +4,7 @@ variable "cloud_flare_api_token" {
     condition = can(regex("^.+$", var.cloud_flare_api_token))
     error_message = "cloud_flare_api_token is required"
   }
+  sensitive = true
 }
 variable "linode_token" {
   description = "K8s cluster provider. http://linode.com/ go to Profile -> Api tokens -> Create A Personal Access Token -> Select Kubernetes & Linodes -> Create Token."
@@ -11,6 +12,7 @@ variable "linode_token" {
     condition = can(regex("^.+$", var.linode_token))
     error_message = "linode_token is required"
   }
+  sensitive = true
 }
 variable "cloud_flare_zone_id" {
   description = "Copy API Zone Id from https://dash.cloudflare.com/"
@@ -18,10 +20,12 @@ variable "cloud_flare_zone_id" {
     condition = can(regex("^.+$", var.cloud_flare_zone_id))
     error_message = "cloud_flare_zone_id is required"
   }
+  sensitive = true
 }
 variable "id_rsa" {
   description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
   default = null
+  sensitive = true
 }
 variable "id_rsa_pub" {
   description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
@@ -53,10 +57,12 @@ variable "htpasswd" {
   description = "If this variable is set docker registry will be created with user and pass in this value. To generate use docker run --entrypoint htpasswd httpd:2 -Bbn user password"
   # "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
   default = null
+  sensitive = true
 }
 variable "tls_crt" {
   default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
   description = "If use_certmanager is true this cert will be ignored, otherwise it will be used as tls certificate"
+  sensitive = true
 }
 variable "use_certmanager" {
   default = true
@@ -65,11 +71,13 @@ variable "use_certmanager" {
 variable "tls_key" {
   default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
   description = "If use_certmanager is true this cert will be ignored, otherwise it will be used as tls private key"
+  sensitive = true
 }
 variable "SECRET_KEY" {
   # bash download_content.sh generate_secret_key
   default = "yC1-o_%kBSDMYsTloYHf4JxUrU&TQuQXf(-XwIPh%MeHE%T5vM"
   description = "Django secret key for password and etc"
+  sensitive = true
 }
 variable "RECAPTCHA_PRIVATE_KEY" {
   description = <<EOT
@@ -77,12 +85,15 @@ variable "RECAPTCHA_PRIVATE_KEY" {
 If you want recaptcha: Open https://www.google.com/recaptcha/admin#list and register new domain, type is web captcha
 If you set RECAPTCHA_PRIVATE_KEY you should set RECAPTCHA_PUBLIC_KEY in frontend/development.json and frontend/production.json
 EOT
+  sensitive = true
 }
 variable "GOOGLE_OAUTH_2_CLIENT_ID" {
   description = "[OPTIONAL] For Google Oauth. https://developers.google.com/identity/sign-in/web/devconsole-project select webrowser"
+  sensitive = true
 }
 variable "FACEBOOK_ACCESS_TOKEN" {
   description = "[OPTIONAL] For FB Oauth. https://developers.facebook.com/apps/ -> click on app -> settings -> basic 'App ID|App Secret' e.g. FACEBOOK_ACCESS_TOKEN = '91237|bf86sd3'"
+  sensitive = true
 }
 variable "FIREBASE_API_KEY" {
   description = <<EOT
@@ -103,6 +114,7 @@ variable "FIREBASE_API_KEY" {
   "gcm_sender_id": "<Your Sender ID from https://console.firebase.google.com>"
  }
 EOT
+  sensitive = true
 }
 variable "DEFAULT_PROFILE_ID" {
   default = "1"

From 7ac9f3af245b8e9138c4e492bf455741f6cfc553 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Tue, 30 May 2023 20:10:56 +0300
Subject: [PATCH 214/221] Fixed docker for backend

---
 kubernetes/docker/backend/Dockerfile                          | 4 +++-
 .../docker/backend/settings.py                                | 0
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename backend/chat/settings_docker_pychat_org.py => kubernetes/docker/backend/settings.py (100%)

diff --git a/kubernetes/docker/backend/Dockerfile b/kubernetes/docker/backend/Dockerfile
index e176dd18b..4feb9b5f3 100644
--- a/kubernetes/docker/backend/Dockerfile
+++ b/kubernetes/docker/backend/Dockerfile
@@ -16,6 +16,8 @@ RUN apk add --no-cache --virtual .build-deps \
                 jpeg-dev \
                 bash
 COPY ./backend/requirements.txt ./
+
+# create django tables within container init
 COPY ./download_content.sh ./download_content.sh
 
 RUN pip install -r requirements.txt && ln -s ../newback/photos ./photos
@@ -23,7 +25,7 @@ RUN pip install -r requirements.txt && ln -s ../newback/photos ./photos
 COPY ./backend/chat ./chat
 COPY ./backend/templates ./templates
 COPY ./backend/manage.py ./
-COPY ./backend/chat/settings_docker_pychat_org.py ./chat/settings.py
+COPY ./kubernetes/docker/backend/settings.py ./chat/settings.py
 
 CMD ["/usr/bin/python3", "manage.py", "start_tornado"]
 
diff --git a/backend/chat/settings_docker_pychat_org.py b/kubernetes/docker/backend/settings.py
similarity index 100%
rename from backend/chat/settings_docker_pychat_org.py
rename to kubernetes/docker/backend/settings.py

From 5479f2b8b1e1280e574b3d8cd4fa3b71a91810e5 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Wed, 31 May 2023 00:42:42 +0300
Subject: [PATCH 215/221] Terraform fmt

---
 kubernetes/terraform/cloudflare/main.tf |  2 +-
 kubernetes/terraform/helm/main.tf       | 12 +++----
 kubernetes/terraform/variables.tf       | 48 ++++++++++++-------------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index 71123606d..c2d8177e1 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -17,7 +17,7 @@ resource "cloudflare_record" "static_pychat" {
 }
 
 resource "cloudflare_record" "registry_pychat" {
-  count = var.htpasswd == null ? 0 : 1
+  count   = var.htpasswd == null ? 0 : 1
   name    = var.docker_domain_name
   proxied = false
   ttl     = 1
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 58aa79725..74ffd3f39 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -4,8 +4,8 @@ resource "helm_release" "global" {
 }
 
 resource "helm_release" "backend" {
-  name       = "backend"
-  chart      = "${path.module}/charts/backend"
+  name  = "backend"
+  chart = "${path.module}/charts/backend"
   depends_on = [
     helm_release.global,
     helm_release.mariadb,
@@ -178,13 +178,13 @@ resource "helm_release" "backup" {
     value = var.mysql_password
   }
   # Backup should restore the database state before backend goes up
-  timeout = 1800 # Practically my backup was running for 20m until it finished
+  timeout       = 1800 # Practically my backup was running for 20m until it finished
   wait_for_jobs = true
-  wait = true
+  wait          = true
 }
 resource "helm_release" "photo" {
-  name = "photo"
-  chart  = "${path.module}/charts/photo"
+  name       = "photo"
+  chart      = "${path.module}/charts/photo"
   depends_on = [helm_release.global]
 }
 
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index eafcc3798..2a49c387a 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -1,7 +1,7 @@
 variable "cloud_flare_api_token" {
   description = "Go to https://dash.cloudflare.com/profile/api-tokens"
   validation {
-    condition = can(regex("^.+$", var.cloud_flare_api_token))
+    condition     = can(regex("^.+$", var.cloud_flare_api_token))
     error_message = "cloud_flare_api_token is required"
   }
   sensitive = true
@@ -9,7 +9,7 @@ variable "cloud_flare_api_token" {
 variable "linode_token" {
   description = "K8s cluster provider. http://linode.com/ go to Profile -> Api tokens -> Create A Personal Access Token -> Select Kubernetes & Linodes -> Create Token."
   validation {
-    condition = can(regex("^.+$", var.linode_token))
+    condition     = can(regex("^.+$", var.linode_token))
     error_message = "linode_token is required"
   }
   sensitive = true
@@ -17,24 +17,24 @@ variable "linode_token" {
 variable "cloud_flare_zone_id" {
   description = "Copy API Zone Id from https://dash.cloudflare.com/"
   validation {
-    condition = can(regex("^.+$", var.cloud_flare_zone_id))
+    condition     = can(regex("^.+$", var.cloud_flare_zone_id))
     error_message = "cloud_flare_zone_id is required"
   }
   sensitive = true
 }
 variable "id_rsa" {
   description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
-  default = null
-  sensitive = true
+  default     = null
+  sensitive   = true
 }
 variable "id_rsa_pub" {
   description = "This ssh keypair will be used to authenticate in private git repo to make backups. Feel free to leave it empty if backups not used"
-  default = null
+  default     = null
 }
 variable "domain_name" {
   description = "Main domain address for chat"
   validation {
-    condition = can(regex("^.+$", var.domain_name))
+    condition     = can(regex("^.+$", var.domain_name))
     error_message = "domain_name is required"
   }
 }
@@ -42,42 +42,42 @@ variable "email" {
   description = "Email that's used in certmanager. If use_certmanager is set to false, feel free to leave empty"
 }
 variable "linode_app_label" {
-  default = "pychat"
+  default     = "pychat"
   description = "Linode k8s cluster name"
 }
 variable "github" {
-  default = null
+  default     = null
   description = "git address for private backups. Url should be in ssh format e.g. git@github.com:username/backup_repo.git . Feel free to leave it empty if backups not used"
   validation {
-    condition = var.github == null || can(regex("^git@.*$", var.github))
+    condition     = var.github == null || can(regex("^git@.*$", var.github))
     error_message = "Should start within git@, ssh only supported"
   }
 }
 variable "htpasswd" {
   description = "If this variable is set docker registry will be created with user and pass in this value. To generate use docker run --entrypoint htpasswd httpd:2 -Bbn user password"
   # "pychat:$2y$05$E79PTr6mfODQGVZxr6OOwOkhcGbBUX0gd5.LlSMYIhVX4TlQZ73jm"
-  default = null
+  default   = null
   sensitive = true
 }
 variable "tls_crt" {
-  default = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+  default     = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZDekNDQXZPZ0F3SUJBZ0lKQVBVK29tczFoajJHTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB5TVRBeU1ERXhNVE14TWpaYUZ3MHpNVEF4TXpBeE1UTXhNalphTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQWlJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dJUEFEQ0NBZ29DCmdnSUJBTk1qVit3aUk5b1lFQ0krd3ZoOEhBMUxwTTM4WWFmK3k0bC91MnNiZWtLN211czhTTDJqVHlRd3UyT1kKYmgxUkJINlowVnlxV1pUWElQOXU3dEVsVWVkdmNjRzRLQjRRWExpSTk1T1hId3hlQ01ZejZtd0FQL1hsTjJVRQpwMUNLVDlTRUduK1ByTm1XQkFNejRvSmRsZFl1RkxjSVlOK1FITzg4aEZTbklvbUphc1RVNFhnZ3BOVmtxVmNuCjZrSjY4SU8yc1kzUDV2TStWZTdvSGRQcm8xbGtpbzYxQlNqNmJXdkRGQlpoRldUUktkUTBCT3hBZGIyWkIvaVkKSjluNXcwdUlkeHA5aVpPcVU5WGgzakdsU0ZOVFlZRlJCRFd0UVQ1NGV1VG5XSWxsaVpXaU5vRTQ3RHdqaHdvKwpFUGJnR0FDUFJSNmZzaDRPNEpOc0V3djZtRDgxT0dDWjZ2N0lFM3AzUUJFZGthNmo2UUd6a0VQbHBRdTZkMVF0CjVINFY4Mk5reGdrWkhsaWFMOSs1bXlGczNJMDVVZG45WUFEeXRUeUN6dnJzUU9GOXllVFhBZERTSWxIUVVyVmcKQTZGK053cjFCbU5oNGpJSDNrQ2tRMUJ4TElEblJpcTA3S0xPdTdpVHRQbmcvZ3R3ZUQ1Z09ZaEx0alBpZEEvbwpuUEJLMzJkSHlTRmRneVhHN1BPUDhzWEV5ZUdNWjFYeE9odTFSUERzTE1JTzhSY2Y3ZXlnU1NxbG94U0ZINS9vCjFHTGlRVWE1VUlyY1Y1Q2ZEQVAzUjkzbmV4cE9yaE11OERvZ0VCVFZnQVpVRG5pU0dncEJLTEdvaWZ3WVB4R2sKREUxZ3QyckF0eXdQd0Npc2s2T0s5dEJFaHNtUGs4ZVRiVm42bThBaHorMHhISVk3QWdNQkFBR2pZREJlTUM0RwpBMVVkSXdRbk1DV2hHS1FXTUJReEVqQVFCZ05WQkFNTUNXeHZZMkZzYUc5emRJSUpBUFUrb21zMWhqMkdNQWtHCkExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnVHdNQlFHQTFVZEVRUU5NQXVDQ1d4dlkyRnNhRzl6ZERBTkJna3EKaGtpRzl3MEJBUVVGQUFPQ0FnRUFWNEZyTkRaaWhCdWpIUWxNbHpGWDJ3MnNNaFFOWURFdnR1V3JwUmVUQ2p5cQoyL3M0ZHVqQnhlK1dkUW44T3p0OHF0cjRKanU2QWtDOTM4empqZW51Y253WWh3MEY1S0lkb2lrVzlMb1RGSGkvCjFFOW5KdW5TRGF2N1c1VnYwVTBOWHJrbnpyY0EvNE5tZHlUenJ4cEN4Nnlya0FzSFR2cGIraFhmbnN4UXY3a2IKa3hzOGR5SytPUmdiVjcvOTIwVUdlWk9oVFRrTnZhdFhpakpvRS9taGlBd0JuUmxkcDZhRHlzWVlNWDFXWGROWQplMXhEQlQ3b2k1UDl6NWlTSFE0cmRTOHJESkVON0VtdkF3MUhSV2F2a2UwQ0ROQ1BUOE5ndU5KOE9nczdSWlFBCk9ZeDBEcDZycmhSOU0xZzBUeTBubU9zUW1ucUE0U0Fwc3lyQ3JmZlFQWXVab3RDUmlvd05kNW1Pb2ZleXBicncKSUV1UHhpeVh2YTVjSi9XY0tQa1NtVDBqbjV5N1lYMVVoenI1UnUyODVPZS8yZ3FxTnlYNmUweEZidXo4UDl3SQoyL3lvRzV3VnVnYkN0TkNGTG1OQ0FSa3pGaHBmaEFxTmQ4Y3FnVjFQVFVBdUxGZmk5QTZVWlkwbDRUTklCbU4vClphY3RuYVF5SXZnT1FRL2ttVTNPb2M1ZGNxNGpldnI0RkFxWGxSaVNtSHJRWGtlekRyMllYUS9QckdhaG03LzgKM2NrMVoyZVdXWC8wby8yMzBMcU51QVdMeXZaWjExODg1ZHFUOUVnYlhxWWMzS3VNRGpueFVaQVFaMm5vNGdsUwpWdGR5NlRybnBLYTBMaGJEaDNENHF2OFVRTllOVlloelBaSEF6Zmo4a2c1WjNSU2V4MmI0ZWI1emdaendiczg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
   description = "If use_certmanager is true this cert will be ignored, otherwise it will be used as tls certificate"
-  sensitive = true
+  sensitive   = true
 }
 variable "use_certmanager" {
   default = true
-  type = bool
+  type    = bool
 }
 variable "tls_key" {
-  default = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
+  default     = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKS0FJQkFBS0NBZ0VBMHlOWDdDSWoyaGdRSWo3QytId2NEVXVremZ4aHAvN0xpWCs3YXh0NlFydWE2enhJCnZhTlBKREM3WTVodUhWRUVmcG5SWEtwWmxOY2cvMjd1MFNWUjUyOXh3YmdvSGhCY3VJajNrNWNmREY0SXhqUHEKYkFBLzllVTNaUVNuVUlwUDFJUWFmNCtzMlpZRUF6UGlnbDJWMWk0VXR3aGczNUFjN3p5RVZLY2lpWWxxeE5UaAplQ0NrMVdTcFZ5ZnFRbnJ3ZzdheGpjL204ejVWN3VnZDArdWpXV1NLanJVRktQcHRhOE1VRm1FVlpORXAxRFFFCjdFQjF2WmtIK0pnbjJmbkRTNGgzR24ySms2cFQxZUhlTWFWSVUxTmhnVkVFTmExQlBuaDY1T2RZaVdXSmxhSTIKZ1Rqc1BDT0hDajRROXVBWUFJOUZIcCt5SGc3Z2syd1RDL3FZUHpVNFlKbnEvc2dUZW5kQUVSMlJycVBwQWJPUQpRK1dsQzdwM1ZDM2tmaFh6WTJUR0NSa2VXSm92MzdtYklXemNqVGxSMmYxZ0FQSzFQSUxPK3V4QTRYM0o1TmNCCjBOSWlVZEJTdFdBRG9YNDNDdlVHWTJIaU1nZmVRS1JEVUhFc2dPZEdLclRzb3M2N3VKTzArZUQrQzNCNFBtQTUKaUV1Mk0rSjBEK2ljOEVyZlowZkpJVjJESmNiczg0L3l4Y1RKNFl4blZmRTZHN1ZFOE93c3dnN3hGeC90N0tCSgpLcVdqRklVZm4ralVZdUpCUnJsUWl0eFhrSjhNQS9kSDNlZDdHazZ1RXk3d09pQVFGTldBQmxRT2VKSWFDa0VvCnNhaUovQmcvRWFRTVRXQzNhc0MzTEEvQUtLeVRvNHIyMEVTR3lZK1R4NU50V2ZxYndDSFA3VEVjaGpzQ0F3RUEKQVFLQ0FnQVYyV3g1MVRhY2xTem1QbFJ5M25VUXN5bEUzNzlEWVV5eTEvTVBMSExFZ1NHUkFsWU11ZCt3d1JKRApSanp1NzdsbFdJbWY2MGtGN0JWUUdhekJHL21UMTZhUUEzeXpUOElvbnBQd1JBMUVmRjZ3RkNOSU5lWm9qZVhqCm9FMm9PZ2YwMkE3ZDhJSlVxZitVVFVROWRXM1NFa2EyZ2psMEtUZTFVaS9uaXJ3Nk8ydy9Ia0NPNitIaTYxM1MKMVNDYTdKb0RKMTdNYkIxY1FyRWwzZ05vTU5SZ3BkVG8yN2JDL05kaDlYZ1lzTWREL1prMGlvV1A1VVBKOFJJdwpHWjdXSWRDaCttZEk2SURhTlNBajNCSGdWVmhjdHg0NkFhWkwzN2dHdlBVS3h4NFVhZHVKRHBaUlhSQ2xVSS9pCjhYVlQ5dkRFN2c2YkVxK2VDTEFZMFhCUEp3bW1JTHVHeTMvd1FZdXZBblJKYnBJLzdBMjhaZUc3UUNUKytjQlkKN2tZZTZoMGNNYzJFK3ZNRm5lblcvbmE1S3dyVW52OCtvc2N5QWdWUjVPWS9xU3ZZWW5ZSG9zN1RWdVJLd1YxegpmYy9XMVhmUDBRSTk0MENSaktRT3hHamVCWHFDR2Y4K0ZYQlVKOE1Gd1QwT053WEppZG04b2I4SFZ2azJEdVRZCnlrL3BCZEM3a3pIcDVEUVhBWndOU0k4bWJLblRKbEVoc0RzRzlwQ1BaQkZRMGo3aGdmSkIvODZ6NzNuRHErVW0KSlVlR21QMWtTVUEzbk4wWkZZOGVVZWYxUUhGK2JXYk9IMDNMVERvbUJGVVMvM3RsNFVzYWtVenkrS0U2RW16WApCNTNrazE4NWd3UURlNStIeFExQ1NqbzJ4aUZBdVZWS0tUeFBzaCt5TWh5WnZWeVVrUUtDQVFFQTduVThsa2hLClhUalBzVGRWSXloR0RzWHJ2a1hQUWRuRyt1RDg0NUR0S0d3Z3lza2ZreGU0MkNYTWpRSUN6MGcxY0dnUlNDSkoKUEoyT1NQeEpxYnJWOVFEc1RWY284TFpOWlJrbEE2U1lSdnpYVU5XSjlHRlBZUmtRNGo1UmQ5d2N4aVh1TkRJQQpZKzlDZm9GN3ozcVQvUXQrL0VoRVM3Ymx4d3MwZmF1K29sYWlpcGsremNxMjlWdTFaWHB1Z3VmSlZEYVBVR3p0CkxvYk5FYmxNVjBpREwrRlNuUXRSM1RWaGtabWFnZW5VR2txZ0t3aEtDaWNLYTdHbGluU2ZsaHJBa2lVOFYwQ2sKNEhjYWlqTkx3ZUZQSm14MFZ1ZUhjUzR6Z21RK1ZPYmdFZjNHOXJESllFcFlYNmQ5bEtGcXBmU0YxQXI1ZklNaAo0ZU1lNE9yWUp1TDJId0tDQVFFQTRxdWF1anBPU3lZajNGVFdKR1grSCtobzhNR2VLb3FhZXpjZUN0OHZZWHh6CjhLcHhlRy9YWEppU3YxNTVoT1NiRG5LK2NKK2FobFNJS3l2N0NoS2hyaU9QVjlLOHpaUzR5Vzc3Tm14TWJuYnQKQmdkZWl1M0srZWRvWEZmTDdVcGVFaUNjV3IxeGF3NWl2eHVCaWNaNzZ5K0ErZlkxRFZiRGZ3Y0hZeEI1UEttaApveFhmdzRLUFhpd3l2a1ZZWlpVWkMybDR2aER1SlRqNGE2eTU1NjhVWmExN05Xc25JNCtneFNPbXBCUW8yRVZFClk2OUZGVm95NSsxSTN1TFR0SXdhcWt0QkR2TmFscjBOK3R1RFhTb3FodVR0akZ1NmdFYzVBazRnRWJ3YkMvNzgKUWs0Q3E3a0d0YXRTNW9sTWl0M05RcXNGM0JaWkVpMGE0YXE3SU1rVVpRS0NBUUIra09sc2xzZ3B2THE0UkRkRApKdUF3ZlNySVhrTkluMisydjI1YTF4U1pyUEttejZPYnJpNmxRMExUNFNwZW5PUUlXcVE1bGtFckZERnVXY0k3CmZYaU14MFdsTTByK29MUnBvYlA4d0FNM1FvS0NYQ1VSK2dobzhDWCsvN2E4R0srSkdKN2JRMkxqcUIyeUNjWU8KZFBCUmtpVi9nRmdIbS9kUDg0bVQzbkdidHNJbE1IdWVQU2RwQ1prNVdJZUpvYjlCbklmcTF6WDR5UUhWazNXSwpxbWsvSTZoMnhJaGFFamhNVUt3cW9sSzY5YnNYdkJtWVUrcDdDTnBscDhzQW9BaHdTYVZDWm9SY3c3cnBlWnFQCk9LaUxLMnVBcVBsQndKVUVjM0tHRzlqNGs2dGtTcWRJSFkzVWo1RGZMK0hzWGVJZWp3aW01dTgzOXhYdnFaYTYKNVNKZkFvSUJBQ0kzYjFydlZFUkoxSjM4L0hwd0h3Vm9DdmRVOHZCUERmVE5wQzVWOUl3TndsNnhEQUgzT0JaVgpQY20vbEM1NForT3RkSXdCdTh6TlUrVFlkY1BXZml1UVdLSVVRTVh6emxVeCtLQUZoeUFodWJQd1J0aEgveHpzClRyZXAxVEhUeVJHSmRMREo2aVlUL05vR1orNkpWTWx5MlZCaVZ5M1ZUQnVQenhDb092VHFVbWtROHo5TEpTTTkKSHNmVUpmem5uZWs0R2E3dlZWT3ZIdWo2SVBJVlhzbmVmenZZR2dkbk5naXNVZ3B3dEoyNUR4TFJNV2VBdnpCOQpoRU9KRUJZd0ZCSmkyOFpLL0FESE55WUlIdk5nV3gwVHo3d2hXS3ptazNlQ25acXZ2NUYzQTFOcS9VSTQ0d2RuCmZsTW9wTEpOdXg5Mk82TTJpR21TLzN6VFRmNHIvSFVDZ2dFQkFNTngxNnVtWUlLNVE0T3IyVXBDU3R5Nitsc2sKQ0RiMGhvTmJMT0svZFZWaW5wSWEzOUhveE9mWkFSSTNGR2MwRVVJZFBKTGgwL1FDQVdRaTM2MEFsYXAvOXltWApQcC9rU0pNalhtaElqcXk4Qy9XZDhkR1ptUlpyV3ZxODdlOTgySG9ZWGZxSzg3MXFrYnRGSkQ0WWI1aCtBR3I2CkM3eDJXQm0zT0IxaEl0cGhwNW9xZ3ozOGUxcTBOM0RPQkpMYTFFdEpqRmExUVVzRWpqckVqSWpnQWQvSlVIb1AKZHBrNHR0SmFzcndXQkROR1YyOWhONWhaT21JMEJxaHE5Tm9PZGZRZGtSTG9SQ3dtSWtSWkh3YXF2Q0F2a3NuLwpoclNoKzY2TG5qcThpMldIbS90a0JVeUE0Y0d1N2wrRzZFcEtDRWZ2THJxb3lZUlVia0FBaXQ2Q1VYaz0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K"
   description = "If use_certmanager is true this cert will be ignored, otherwise it will be used as tls private key"
-  sensitive = true
+  sensitive   = true
 }
 variable "SECRET_KEY" {
   # bash download_content.sh generate_secret_key
-  default = "yC1-o_%kBSDMYsTloYHf4JxUrU&TQuQXf(-XwIPh%MeHE%T5vM"
+  default     = "yC1-o_%kBSDMYsTloYHf4JxUrU&TQuQXf(-XwIPh%MeHE%T5vM"
   description = "Django secret key for password and etc"
-  sensitive = true
+  sensitive   = true
 }
 variable "RECAPTCHA_PRIVATE_KEY" {
   description = <<EOT
@@ -85,15 +85,15 @@ variable "RECAPTCHA_PRIVATE_KEY" {
 If you want recaptcha: Open https://www.google.com/recaptcha/admin#list and register new domain, type is web captcha
 If you set RECAPTCHA_PRIVATE_KEY you should set RECAPTCHA_PUBLIC_KEY in frontend/development.json and frontend/production.json
 EOT
-  sensitive = true
+  sensitive   = true
 }
 variable "GOOGLE_OAUTH_2_CLIENT_ID" {
   description = "[OPTIONAL] For Google Oauth. https://developers.google.com/identity/sign-in/web/devconsole-project select webrowser"
-  sensitive = true
+  sensitive   = true
 }
 variable "FACEBOOK_ACCESS_TOKEN" {
   description = "[OPTIONAL] For FB Oauth. https://developers.facebook.com/apps/ -> click on app -> settings -> basic 'App ID|App Secret' e.g. FACEBOOK_ACCESS_TOKEN = '91237|bf86sd3'"
-  sensitive = true
+  sensitive   = true
 }
 variable "FIREBASE_API_KEY" {
   description = <<EOT
@@ -114,13 +114,13 @@ variable "FIREBASE_API_KEY" {
   "gcm_sender_id": "<Your Sender ID from https://console.firebase.google.com>"
  }
 EOT
-  sensitive = true
+  sensitive   = true
 }
 variable "DEFAULT_PROFILE_ID" {
-  default = "1"
+  default     = "1"
   description = "Admin of main channel. First registered user"
   validation {
-    condition = can(regex("^\\d+$", var.DEFAULT_PROFILE_ID))
+    condition     = can(regex("^\\d+$", var.DEFAULT_PROFILE_ID))
     error_message = "Only numbers"
   }
 }

From 654bd143d91ab1456d36dd1e7004fa003716cf86 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 1 Jun 2023 01:51:32 +0300
Subject: [PATCH 216/221] Fixed cloudflare infitivie loop

---
 README.md                               | 6 +++++-
 kubernetes/terraform/cloudflare/main.tf | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index de688e407..e8dfc48dd 100644
--- a/README.md
+++ b/README.md
@@ -595,7 +595,7 @@ Apply terraform configuration with:
 ### Troubleshooting
 1. How to icrease maximum upload file:
  - Change nginx configuration  ``   client_max_body_size 75M;`
- - In addition to above, if you're using k8s + ingress, change `ingress.yaml` nginx.ingress.kubernetes.io/proxy-body-size: 75m 
+ - In addition to above, if you're using k8s + ingress, change `ingress.yaml` nginx.ingress.kubernetes.io/proxy-body-size: 75m
  
 1. Certmanager fails or services that depends on SSL won't start (e.g. Postfix or Coturn)
 Certmanager should create  pychat_tls sercret in namespace pychat. It creates a private key and puts it into letsencrypt-prod secret. Then it tries to issue it against letsencrypt server. 
@@ -606,6 +606,10 @@ Certmanager should create  pychat_tls sercret in namespace pychat. It creates a
  - Seems like your k8s providers API exceed limits and it cuts the k8s request. You can try it with  `terraform apply -parallelism=1`. Your cluster will deploy for a while, but it has less chance to get into this situation
  - You can also execute `terraform apply` a few times so it finishes creating resources that it failed to inspect. Note that if you got a certificate already, I recomend you to back it up from `pychat-tls` secret in order to avoid cetrification fails describe above
  
+1. Cloudflare returns too many redirect within the same time If turn it off (by setting Node's ip to /etc/hosts) it works fine. This result when using [flexible mode](https://developers.cloudflare.com/ssl/troubleshooting/too-many-redirects/#encryption-mode-misconfigurations). Since all request from http will be redirected to https, all http urls will return header location: https since result infinitive loop  
+ - Go to cloudlfare ssl/tls overview
+ - Set strict encryption mode
+ - Go to Caching Configuration. Click on Custom purge and select static.pychat.org (or static.yourmdain.com) or Purge EVerything if pychat is the only domain.
 # TODO
 * teleport smileys https://vuejsdevelopers.com/2020/03/16/vue-js-tutorial/#teleporting-content
 * user1 writes a message, user1 goes offline, user 2 opens a chat from 1st devices and goes offline, user 2 opens a chat from 2nd devices and responds in its thread and goes offline, user2 opens first deviecs and thread messages count = 0
diff --git a/kubernetes/terraform/cloudflare/main.tf b/kubernetes/terraform/cloudflare/main.tf
index c2d8177e1..2d0fec409 100644
--- a/kubernetes/terraform/cloudflare/main.tf
+++ b/kubernetes/terraform/cloudflare/main.tf
@@ -43,3 +43,12 @@ resource "cloudflare_record" "postfix_pychat" {
   value   = "v=spf1 ip4:${var.ip_address}"
   zone_id = var.cloud_flare_zone_id
 }
+
+
+resource "cloudflare_zone_settings_override" "example-com-settings" {
+  zone_id = var.cloud_flare_zone_id
+  settings {
+    // Otherwise it will result an infinitive loop
+    ssl = "strict"
+  }
+}

From 15bfec0cbb2264ef29a2b497c4bd66535928a2dc Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 1 Jun 2023 02:59:15 +0300
Subject: [PATCH 217/221] Fixed migration script

---
 kubernetes/docker/backend/Dockerfile          |  4 ++-
 .../terraform/helm/charts/backend/Chart.yaml  |  2 +-
 .../helm/charts/backend/templates/cm.yaml     |  1 +
 .../charts/backend/templates/deployment.yaml  | 29 ++++++++++++++++++-
 .../helm/charts/backend/templates/init.yaml   | 23 ---------------
 .../backend/templates/pv-migrations.yaml      | 13 +++++++++
 .../backend/templates/pvc-migrations.yaml     | 17 +++++++++++
 .../helm/charts/backend/templates/secret.yaml |  2 +-
 .../terraform/helm/charts/backend/values.yaml |  8 ++---
 .../certmanager/templates/certificate.yaml    |  4 +--
 .../helm/charts/certmanager/values.yaml       |  1 -
 .../charts/ingress/templates/ingress.yaml     |  6 ++--
 .../helm/charts/ingress/templates/tcp-cm.yaml |  2 +-
 .../terraform/helm/charts/ingress/values.yaml |  1 -
 kubernetes/terraform/helm/main.tf             | 18 +++++-------
 kubernetes/terraform/variables.tf             |  2 +-
 16 files changed, 83 insertions(+), 50 deletions(-)
 delete mode 100644 kubernetes/terraform/helm/charts/backend/templates/init.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backend/templates/pv-migrations.yaml
 create mode 100644 kubernetes/terraform/helm/charts/backend/templates/pvc-migrations.yaml

diff --git a/kubernetes/docker/backend/Dockerfile b/kubernetes/docker/backend/Dockerfile
index 4feb9b5f3..530b2ad2a 100644
--- a/kubernetes/docker/backend/Dockerfile
+++ b/kubernetes/docker/backend/Dockerfile
@@ -20,13 +20,15 @@ COPY ./backend/requirements.txt ./
 # create django tables within container init
 COPY ./download_content.sh ./download_content.sh
 
-RUN pip install -r requirements.txt && ln -s ../newback/photos ./photos
+RUN pip install -r requirements.txt
 
 COPY ./backend/chat ./chat
 COPY ./backend/templates ./templates
 COPY ./backend/manage.py ./
 COPY ./kubernetes/docker/backend/settings.py ./chat/settings.py
 
+RUN ln -s ../newback/photos ./photos && ln -s ../../backup/backend/chat/migrations ./chat/migrations
+
 CMD ["/usr/bin/python3", "manage.py", "start_tornado"]
 
 
diff --git a/kubernetes/terraform/helm/charts/backend/Chart.yaml b/kubernetes/terraform/helm/charts/backend/Chart.yaml
index 31106be13..155df7b39 100644
--- a/kubernetes/terraform/helm/charts/backend/Chart.yaml
+++ b/kubernetes/terraform/helm/charts/backend/Chart.yaml
@@ -3,4 +3,4 @@ name: backend
 description: python backend
 type: application
 version: 0.1.0
-appVersion: "1.16.0"
+appVersion: "1.17.0"
diff --git a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
index e7c17a1fa..8c4410fda 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/cm.yaml
@@ -17,3 +17,4 @@ data:
   DEFAULT_PROFILE_ID: "{{ .Values.DEFAULT_PROFILE_ID }}"
   SERVER_ADDRESS: "{{ .Values.SERVER_ADDRESS }}"
   SHOW_COUNTRY_CODE: "{{ .Values.SHOW_COUNTRY_CODE }}"
+  BE_DIRECTORY: "/usr/src/backend"
diff --git a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
index 06691a426..8c0061906 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/deployment.yaml
@@ -15,6 +15,24 @@ spec:
       labels:
         app: backend
     spec:
+      initContainers:
+      - name: migrate-backend
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
+        envFrom:
+        - secretRef:
+            name: backend-secret
+        - configMapRef:
+            name: cm-backend
+        volumeMounts:
+{{- if .Values.github }}
+          - mountPath: "/usr/src/backup"
+            name: backup
+{{- else }}
+          - mountPath: "/usr/src/backup/chat/migrations"
+            name: migrations
+{{- end }}
+        command: ["/bin/bash", "/usr/src/backend/download_content.sh", "create_django_tables"]
       containers:
       - name: backend
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -31,10 +49,19 @@ spec:
         - configMapRef:
             name: cm-backend
         volumeMounts:
-          - mountPath: "/usr/src/newback/photos"
+          - mountPath: "/usr/src/newback/photos" # for old backend there's a symlink in docker
             name: photo
       volumes:
         - name: photo
           persistentVolumeClaim:
             claimName: pvc-photo
+{{- if .Values.github }}
+        - name: backup
+          persistentVolumeClaim:
+            claimName: pvc-backup
+{{- else }}
+        - name: migrations
+          persistentVolumeClaim:
+            claimName: pvc-migrations
+{{- end }}
 
diff --git a/kubernetes/terraform/helm/charts/backend/templates/init.yaml b/kubernetes/terraform/helm/charts/backend/templates/init.yaml
deleted file mode 100644
index 1a42a3a15..000000000
--- a/kubernetes/terraform/helm/charts/backend/templates/init.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: create-database-job
-  namespace: pychat
-spec:
-  template:
-    spec:
-      containers:
-      - name: migrate-backend
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        image: "{{ .Values.image.repository_path }}:{{ .Values.image.tag }}"
-        command: ["/bin/bash", "/usr/src/backend/download_content.sh", "create_django_tables"]
-        env:
-        - name: BE_DIRECTORY
-          value: /usr/src/backend
-        envFrom:
-        - secretRef:
-            name: backend-secret
-        - configMapRef:
-            name: cm-backend
-      restartPolicy: Never
-  backoffLimit: 4
diff --git a/kubernetes/terraform/helm/charts/backend/templates/pv-migrations.yaml b/kubernetes/terraform/helm/charts/backend/templates/pv-migrations.yaml
new file mode 100644
index 000000000..9157eaa4d
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backend/templates/pv-migrations.yaml
@@ -0,0 +1,13 @@
+{{ if not (.Values.github) }}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pv-migrations
+spec:
+  accessModes:
+    - ReadWriteMany
+  capacity:
+    storage: {{ .Values.migrations_disk_size }}
+  hostPath:
+    path: /data/migrations
+{{ end }}
diff --git a/kubernetes/terraform/helm/charts/backend/templates/pvc-migrations.yaml b/kubernetes/terraform/helm/charts/backend/templates/pvc-migrations.yaml
new file mode 100644
index 000000000..55b8e805c
--- /dev/null
+++ b/kubernetes/terraform/helm/charts/backend/templates/pvc-migrations.yaml
@@ -0,0 +1,17 @@
+{{ if not (.Values.github) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pvc-migrations
+  namespace: pychat
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.migrations_disk_size }}
+  storageClassName: "" # Empty string must be explicitly set otherwise default StorageClass will be set
+  volumeName: pv-migrations
+{{ end }}
+
+
diff --git a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
index 1e36a9be5..f6c1fcdb4 100644
--- a/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
+++ b/kubernetes/terraform/helm/charts/backend/templates/secret.yaml
@@ -12,7 +12,7 @@ stringData:
 data:
   SECRET_KEY: {{ .Values.SECRET_KEY | b64enc }}
   MYSQL_PASSWORD: {{ .Values.mysql_password  | b64enc }}
-  MYSQL_USER: {{ .Values.mysql_database_name  | b64enc }}
+  MYSQL_USER: {{ .Values.mysql_user  | b64enc }}
   RECAPTCHA_PRIVATE_KEY: {{ .Values.RECAPTCHA_PRIVATE_KEY  | b64enc }}
   GOOGLE_OAUTH_2_CLIENT_ID: {{ .Values.GOOGLE_OAUTH_2_CLIENT_ID  | b64enc }}
   FACEBOOK_ACCESS_TOKEN: {{ .Values.FACEBOOK_ACCESS_TOKEN  | b64enc }}
diff --git a/kubernetes/terraform/helm/charts/backend/values.yaml b/kubernetes/terraform/helm/charts/backend/values.yaml
index e611a5af6..67890e38e 100644
--- a/kubernetes/terraform/helm/charts/backend/values.yaml
+++ b/kubernetes/terraform/helm/charts/backend/values.yaml
@@ -2,12 +2,12 @@ image:
   repository_path: deathangel908/pychat-backend
   pullPolicy: Always # change to IfNotPresent for minikube
   tag: "latest"
-mysql:
-  mysql_database_name: $mysql_database_name
-  mysql_user: $mysql_user
-  mysql_password: $mysql_password
+mysql_database_name: $mysql_database_name
+mysql_user: $mysql_user
+mysql_password: $mysql_password
 domain_name: $domain_name
 github: $github
+migrations_disk_size: 64Mi
 DEFAULT_PROFILE_ID: "${DEFAULT_PROFILE_ID}"
 FIREBASE_API_KEY: $FIREBASE_API_KEY
 FACEBOOK_ACCESS_TOKEN: $FACEBOOK_ACCESS_TOKEN
diff --git a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
index 9a3c2d092..03b3e1220 100644
--- a/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/templates/certificate.yaml
@@ -13,6 +13,6 @@ spec:
   dnsNames:
     - "{{ .Values.domain_name }}"
     - "{{ .Values.static_domain_name }}"
-{{ if .Values.htpasswd }}
+{{- if .Values.docker_domain_name }}
     - "{{ .Values.docker_domain_name }}"
-{{ end }}
+{{- end }}
diff --git a/kubernetes/terraform/helm/charts/certmanager/values.yaml b/kubernetes/terraform/helm/charts/certmanager/values.yaml
index 00d5bdfac..d3a9bc471 100644
--- a/kubernetes/terraform/helm/charts/certmanager/values.yaml
+++ b/kubernetes/terraform/helm/charts/certmanager/values.yaml
@@ -3,4 +3,3 @@ cloud_flare_api_token: $cloud_flare_api_token
 domain_name: $domain_name
 docker_domain_name: $docker_domain_name
 static_domain_name: $static_domain_name
-htpasswd: $htpasswd
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
index 34a05094c..4cf3bb000 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/ingress.yaml
@@ -13,8 +13,10 @@ spec:
   tls:
   - hosts:
     - "{{ .Values.domain_name }}"
-    - "{{ .Values.docker_domain_name }}"
     - "{{ .Values.static_domain_name }}"
+{{- if .Values.docker_domain_name }}
+    - "{{ .Values.docker_domain_name }}"
+{{- end }}
     secretName: pychat-tls
   defaultBackend:
     service:
@@ -56,7 +58,7 @@ spec:
             name: frontend-service
             port:
               number: 80
-{{ if .Values.htpasswd }}
+{{- if .Values.docker_domain_name }}
   - host: "{{ .Values.docker_domain_name }}"
     http:
       paths:
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/tcp-cm.yaml b/kubernetes/terraform/helm/charts/ingress/templates/tcp-cm.yaml
index e600731d7..8bc58fa8f 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/tcp-cm.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/tcp-cm.yaml
@@ -4,7 +4,7 @@ metadata:
   name: tcp-services
   namespace: ingress-nginx
 data:
-#  25: "pychat/postfix-service:25"
+  25: "pychat/postfix-service:25"
 #  587: "pychat/postfix-service:587"
 #  465: "pychat/postfix-service:465"
   3478: "pychat/coturn-service:3478"
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
index 22c730706..a3df4ff1a 100644
--- a/kubernetes/terraform/helm/charts/ingress/values.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -4,4 +4,3 @@ external_ip: $external_ip
 domain_name: $domain_name
 static_domain_name: $static_domain_name
 docker_domain_name: $docker_domain_name
-htpasswd: $htpasswd
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 74ffd3f39..9091122d8 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -5,6 +5,7 @@ resource "helm_release" "global" {
 
 resource "helm_release" "backend" {
   name  = "backend"
+  # force_update = true
   chart = "${path.module}/charts/backend"
   depends_on = [
     helm_release.global,
@@ -66,7 +67,10 @@ resource "helm_release" "backend" {
     name  = "SHOW_COUNTRY_CODE"
     value = var.SHOW_COUNTRY_CODE
   }
-
+  set {
+    name  = "github"
+    value = var.github == null ? "" : var.github
+  }
   timeout = 60
 }
 
@@ -98,10 +102,6 @@ resource "helm_release" "certmanager" {
     name  = "static_domain_name"
     value = var.static_domain_name
   }
-  set {
-    name  = "htpasswd"
-    value = var.htpasswd == null ? "" : var.htpasswd
-  }
   set {
     name  = "email"
     value = var.email
@@ -129,7 +129,7 @@ resource "helm_release" "self-signed" {
 }
 
 resource "helm_release" "docker-registry" {
-  count = var.htpasswd == null ? 0 : 1
+  count = var.docker_domain_name == "" ? 0 : 1
   name  = "docker-registry"
   chart = "${path.module}/charts/docker-registry"
   set {
@@ -138,7 +138,7 @@ resource "helm_release" "docker-registry" {
   }
   set {
     name  = "htpasswd"
-    value = var.htpasswd
+    value = var.htpasswd == null ? "" : var.htpasswd
   }
   depends_on = [helm_release.global]
 }
@@ -229,10 +229,6 @@ resource "helm_release" "ingress" {
     name  = "domain_name"
     value = var.domain_name
   }
-  set {
-    name  = "htpasswd"
-    value = var.htpasswd == null ? "" : var.htpasswd
-  }
   set {
     name  = "external_ip"
     value = var.ip_address
diff --git a/kubernetes/terraform/variables.tf b/kubernetes/terraform/variables.tf
index 2a49c387a..54bab6b22 100644
--- a/kubernetes/terraform/variables.tf
+++ b/kubernetes/terraform/variables.tf
@@ -125,6 +125,6 @@ variable "DEFAULT_PROFILE_ID" {
   }
 }
 locals {
-  docker_domain_name = "docker-registry.${var.domain_name}"
+  docker_domain_name = var.htpasswd == null ? "" : "docker-registry.${var.domain_name}"
   static_domain_name = "static.${var.domain_name}"
 }

From df32f9cfcc6b6e5cd7858e6f73d1c1efc0d64ed2 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 1 Jun 2023 03:24:39 +0300
Subject: [PATCH 218/221] removed exclude files

---
 .excludeMAIN => .gitignore        | 1 -
 README.md                         | 1 -
 kubernetes/terraform/helm/main.tf | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)
 rename .excludeMAIN => .gitignore (97%)

diff --git a/.excludeMAIN b/.gitignore
similarity index 97%
rename from .excludeMAIN
rename to .gitignore
index 76fe9db97..6941d26ee 100644
--- a/.excludeMAIN
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .gitBU
-.excludeBU
 .project
 .pydevproject
 .idea
diff --git a/README.md b/README.md
index e8dfc48dd..5f79d6689 100644
--- a/README.md
+++ b/README.md
@@ -262,7 +262,6 @@ Useful links:
 Remember that Service Worker will work only if certificate is trusted. So flags like ignore-ceritifcate-errors won't work. But installing certifcate to root system will.
 
 ## Bootstrap files:
- 1. I use 2 git repos in 2 project directory. So you probably need to rename `excludeMAIN`file to `.gitignore`or create link to exclude. `ln -rsf .excludeMAIN .git/info/exclude`
  1. Rename [backend/chat/settings_example.py](backend/chat/settings_example.py) to `backend/chat/settings.py`. **Modify file according to the comments in it.**
  1. Install python packages with `pip install -r requirements.txt`. (Remember you're still in `backend` dir)
  1. From **root** (sudo) user create the database (from shell environment): `echo "create database pychat CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci; CREATE USER 'pychat'@'localhost' identified by 'pypass'; GRANT ALL ON pychat.* TO 'pychat'@'localhost';" | mysql -u root`. You will need mysql running for that (e.g. `systemctl start mysql` on archlinux) If you also need remote access do the same with `'192.168.1.0/255.255.255.0';`
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index 9091122d8..a62d1bbde 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -5,7 +5,7 @@ resource "helm_release" "global" {
 
 resource "helm_release" "backend" {
   name  = "backend"
-  # force_update = true
+  # vim force_update = true
   chart = "${path.module}/charts/backend"
   depends_on = [
     helm_release.global,

From c0f5aad0a7efc5b494c83f245a384d62d93e3a06 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Thu, 1 Jun 2023 03:26:04 +0300
Subject: [PATCH 219/221] Fixed deps

---
 .gitignore | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6941d26ee..24324161e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,15 @@
-.gitBU
 .project
 .pydevproject
 .idea
-md5
-md5-wasm-example
 test/
-dump.rdb
-data.sql
-cron-bu
-trash
-README.txt
 rootfs/etc/nginx/ssl/*
+backend/data.sql
 rootfs/etc/nginx/ssl/server.key
 rootfs/etc/nginx/ssl/certificate.key
 backend/chat/migrations/*
 backend/chat/production.py
 backend/chat/settings.py
 backend/photos/*
-kubernetes/cf-secret.yaml
-kubernetes/oldbackend-secret.yaml
 !backend/photos/.gitkeep
 newback/photos/*
 !newback/photos/.gitkeep

From 883c4f8f1fb9f2437d687a29a63a9a202492cb82 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 26 Jun 2023 00:37:06 +0200
Subject: [PATCH 220/221] 12

---
 frontend/build/utils.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/build/utils.ts b/frontend/build/utils.ts
index 481efe7d7..456c647c7 100644
--- a/frontend/build/utils.ts
+++ b/frontend/build/utils.ts
@@ -14,6 +14,9 @@ function makeid(length) {
 }
 
 export function getSmileyUrls() {
+  // TODO
+  // https://www.youtube.com/watch?v=ff4fgQxPaO0&list=PLNYkxOF6rcIDA1uGhqy45bqlul0VcvKMr&index=34&t=328s&pp=iAQB&ab_channel=GoogleChromeDevelopers
+  // Either remove json and store images as smth else, either at least move json to a string, since JSON.parse is after than object literal
   const assets = [];
   Object.values(smileysData).forEach(tab => {
     Object.values(tab).forEach((v: any) => {

From 5841b8d28d3d5bd0d09a2ca59eeaf5bc026042a8 Mon Sep 17 00:00:00 2001
From: akoidan <deathangel908@gmail.com>
Date: Mon, 23 Dec 2024 15:16:42 +0100
Subject: [PATCH 221/221] Fix

---
 README.md                                     | 46 ++++++++++++++++++-
 kubernetes/terraform/.gitignore               |  1 +
 .../charts/ingress/templates/service.yaml     | 18 ++------
 .../terraform/helm/charts/ingress/values.yaml |  2 +-
 kubernetes/terraform/helm/main.tf             |  2 +-
 5 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 20c5fa55f..60aa15be9 100644
--- a/README.md
+++ b/README.md
@@ -589,7 +589,49 @@ Apply terraform configuration with:
  - `terraform init`
  - `terraform plan`
  - `terraform apply`
- 
+
+### Apply helm manually
+If you render helm manually, you need to specify `ip_address` of your Node cluster in [terraform.tfvars](kubernetes/terraform/terraform.tfvars) or in [values.yaml](kubernetes/terraform/helm/values.yaml)
+You can get it from 
+```bash
+kubectl get nodes -o wide
+```
+example of output:
+```text
+: kubectl get nodes -o wide
+Warning: Use tokens from the TokenRequest API or manually created secret-based tokens instead of auto-generated secret-based tokens.
+NAME                            STATUS   ROLES    AGE     VERSION   INTERNAL-IP      EXTERNAL-IP     OS-IMAGE                         KERNEL-VERSION         CONTAINER-RUNTIME
+lke111154-165479-6474ce21ad26   Ready    <none>   7d20h   v1.31.0   192.168.175.24   192.46.236.13   Debian GNU/Linux 12 (bookworm)   6.1.0-27-cloud-amd64   containerd://1.7.22
+```
+external IP address here should match with external ip address here
+```bash
+kubectl get svc -n ingress-nginx 
+```
+example of output:
+```text
+: kubectl get svc -n ingress-nginx 
+Warning: Use tokens from the TokenRequest API or manually created secret-based tokens instead of auto-generated secret-based tokens.
+NAME                       TYPE           CLUSTER-IP       EXTERNAL-IP                     PORT(S)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      AGE
+ingress-nginx-controller   LoadBalancer   10.128.229.237   192.46.236.13   80:30841/TCP,443:30671/TCP,
+```
+It's ok so it uses extra node ports
+
+Also node IP address should be specified in DNS as well as in SPF email protection settings
+
+```bash
+cd ./kubernetes/terraform/helm
+```
+create values.yaml in this directory based on **kubernetes/terraform/helm/variables.tf** and **kubernetes/terraform/terraform.tfvars**
+Render tempalte with 
+```bash
+helm template ingress charts/ingress -f values.yaml
+```
+If your kubectl is connected to the proper cluster, you can apply it with:
+apply with
+```bash
+helm template ingress charts/ingress -f values.yaml |kubectl apply -f -
+```
+
 ### Troubleshooting
 1. How to icrease maximum upload file:
  - Change nginx configuration  ``   client_max_body_size 75M;`
@@ -609,6 +651,8 @@ Certmanager should create  pychat_tls sercret in namespace pychat. It creates a
  - Set strict encryption mode
  - Go to Caching Configuration. Click on Custom purge and select static.pychat.org (or static.yourmdain.com) or Purge EVerything if pychat is the only domain.
 # TODO
+* Move flags to json probably and JSON.parse so it takes less compile time
+* Check chrome dev tools and Coverage (the tab is on the same spot as Console (for logs)). If not visible check 3 dots on the left to Console tab. https://www.youtube.com/watch?v=X9eRLElSW1c&t=1720&ab_channel=estellevw
 * teleport smileys https://vuejsdevelopers.com/2020/03/16/vue-js-tutorial/#teleporting-content
 * user1 writes a message, user1 goes offline, user 2 opens a chat from 1st devices and goes offline, user 2 opens a chat from 2nd devices and responds in its thread and goes offline, user2 opens first deviecs and thread messages count = 0
 * loading messages is too slow, when a lot of messages is printed to local database. It's better to load 20 last messages to chat instead of 100000, probably vuex getter but it's better to think what we should do on scroll.
diff --git a/kubernetes/terraform/.gitignore b/kubernetes/terraform/.gitignore
index aa209aa36..644199ad4 100644
--- a/kubernetes/terraform/.gitignore
+++ b/kubernetes/terraform/.gitignore
@@ -5,3 +5,4 @@ terraform.tfstate.backup
 .terraform.tfstate.lock.info
 helm/.kubeconfig
 helm/.terraform.lock.hcl
+helm/values.yaml
\ No newline at end of file
diff --git a/kubernetes/terraform/helm/charts/ingress/templates/service.yaml b/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
index f8ca27365..6039d6b6f 100644
--- a/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/templates/service.yaml
@@ -10,6 +10,8 @@ metadata:
   name: ingress-nginx-controller
   namespace: ingress-nginx
 spec:
+  externalIPs:
+    - "{{ .Values.ip_address }}"
   externalTrafficPolicy: Cluster
   ipFamilies:
   - IPv4
@@ -19,20 +21,12 @@ spec:
     name: http
     port: 80
     protocol: TCP
-    targetPort: http
+    targetPort: 80
   - appProtocol: https
     name: https
     port: 443
     protocol: TCP
-    targetPort: https
-  - name: proxied-tcp-5349
-    port: 5349
-    targetPort: 5349
-    protocol: TCP
-  - name: proxied-tcp-3478
-    port: 3478
-    targetPort: 3478
-    protocol: TCP
+    targetPort: 443
   - name: proxied-udp-5349
     port: 5349
     targetPort: 5349
@@ -51,6 +45,4 @@ spec:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: ingress-nginx
     app.kubernetes.io/name: ingress-nginx
-  type: NodePort
-  externalIPs:
-    - "{{ .Values.external_ip }}"
+  type: LoadBalancer
\ No newline at end of file
diff --git a/kubernetes/terraform/helm/charts/ingress/values.yaml b/kubernetes/terraform/helm/charts/ingress/values.yaml
index a3df4ff1a..05e9e51d0 100644
--- a/kubernetes/terraform/helm/charts/ingress/values.yaml
+++ b/kubernetes/terraform/helm/charts/ingress/values.yaml
@@ -1,6 +1,6 @@
 udp_port_range_start: $udp_port_range_start
 udp_port_range_end: $udp_port_range_end
-external_ip: $external_ip
+ip_address: $ip_address
 domain_name: $domain_name
 static_domain_name: $static_domain_name
 docker_domain_name: $docker_domain_name
diff --git a/kubernetes/terraform/helm/main.tf b/kubernetes/terraform/helm/main.tf
index a62d1bbde..2292a5457 100644
--- a/kubernetes/terraform/helm/main.tf
+++ b/kubernetes/terraform/helm/main.tf
@@ -230,7 +230,7 @@ resource "helm_release" "ingress" {
     value = var.domain_name
   }
   set {
-    name  = "external_ip"
+    name  = "ip_address"
     value = var.ip_address
   }
   set {